1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Commit Graph

1486 Commits

Author SHA1 Message Date
db917ae435 Fix #1140 2023-06-07 17:29:07 +02:00
1e9eea30e1 Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop 2023-06-05 18:53:17 +03:00
70bdec41a3 case-insensitive cheats 2023-05-20 01:14:06 +02:00
021f94a579 artifact utils 2023-05-17 17:00:31 +03:00
a10279e1cc Grail fix 2023-05-16 16:51:45 +03:00
79982c4ad4 Fix broken bonuses due to calling PutArtifact before NewArtifact 2023-05-09 16:48:52 +03:00
ce80c83ca2 Merge remote-tracking branch 'upstream/develop' into town-buildings
# Conflicts:
#	lib/CTownHandler.cpp
#	lib/rewardable/Interface.cpp
2023-05-04 22:23:44 +04:00
05eccbc2bb vcmi: split bonus to enumerator and HeroBonus.h 2023-05-03 18:01:06 +03:00
92dcfd1f68 Fix garrisons hero 2023-05-02 15:09:02 +04:00
96420bfc05 Fix configurable reward for non-query scenrio 2023-05-02 14:45:42 +04:00
fbc05c70ac vcmi: camelCase methods of new classes
Also use EGameSettings for clamping morale and luck
2023-05-02 12:09:13 +03:00
a6de9097be vcmi: rename HeroBonus.h to Bonus.h 2023-05-02 11:20:58 +03:00
c4cf2a100b Fix behavior for hero bought in town tavern 2023-05-02 04:44:09 +04:00
916b41d9a7 Merge pull request #2078 from IvanSavenko/shortcuts
Basic shortcuts system
2023-05-01 21:45:52 +03:00
59bc9326e9 Remove excess pointer from market interface 2023-05-01 21:49:37 +04:00
a654cc2391 Removed vstd::advance. Added vstd::next to handle similar cases. 2023-05-01 17:58:18 +03:00
4aa232a60a Merge pull request #2055 from SoundSSGood/cartifactholder-rework
Artifact related code refactoring part2 (client CArtifactHolder)
2023-05-01 02:33:08 +03:00
d985ac90d3 Merge master -> develop 2023-04-28 22:57:25 +03:00
c55f52e84f Fixed disabled special weeks 2023-04-28 16:54:00 +03:00
b472c89276 vcmi: make some CStack properties private
There is a getters for this properties already available
2023-04-27 20:58:49 +03:00
fb739e7186 Merge beta -> develop 2023-04-26 22:48:08 +03:00
9296306fa3 Merge pull request #2041 from IvanSavenko/bugfixing_for_hotfix
Fixes for 1.2.1
2023-04-24 18:13:00 +03:00
48abf46824 Merge pull request #2005 from IvanSavenko/advmap_refactor
Refactoring of adventure map interface
2023-04-24 17:19:22 +03:00
eff158a9a8 Fix killing hero with grail 2023-04-23 16:17:27 +03:00
c86af54ce1 arts move condition fix 2023-04-23 14:18:55 +03:00
a553a4aa66 Merge pull request #2030 from Nordsoft91/boats 2023-04-22 03:27:00 +04:00
7db67a3101 int3 now has proper hasher function 2023-04-20 22:04:24 +03:00
de159df481 Rename boats 2023-04-20 21:20:51 +04:00
9882c37ce3 Good morale can no longer happen after battle is over 2023-04-20 13:10:03 +03:00
d9939f0918 Bad morale can no longer happen after waiting 2023-04-20 13:08:55 +03:00
4bb4d7e7a5 Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
Artifact related code refactoring part1 (initial)
2023-04-19 15:31:11 +03:00
0a28262c15 Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
#	AI/VCAI/Pathfinding/AINodeStorage.cpp
2023-04-19 02:22:19 +04:00
008db447e7 Minor changes 2023-04-19 02:11:24 +04:00
22da7a931d Boat as bonus system node 2023-04-19 01:11:51 +04:00
1c66cd221d Polish transport mechanics 2023-04-18 19:18:44 +04:00
3ff99a1a15 Mechanic for air and land transport 2023-04-18 18:33:28 +04:00
ddcdfb643a Try to enable air/land movement 2023-04-18 17:36:42 +04:00
ed798b06da Prepare transport enum 2023-04-18 13:04:49 +04:00
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
0d35606a44 vcmi: use std::variant 2023-04-17 00:43:13 +03:00
e3ed728193 Merge pull request #1932 from rilian-la-te/proper-teleport
VCMI: teleport redesign
2023-04-16 22:52:01 +03:00
9a838598a6 arts refactoring part1 2023-04-15 00:10:39 +03:00
f11fa8f0c8 Teleport: can trigger obstacles now 2023-04-13 11:24:19 +03:00
bc1aad3b26 vcmi: remove deprecated CStack::getCreature()
Function battle::Unit::unitType() does the same.
2023-04-13 11:24:19 +03:00
63b197b78a Converted attributes to use c++17 functionality 2023-04-12 01:03:14 +03:00
3951bbb395 Merge pull request #1108 from Nordsoft91/battle-dialog
[HDMod features] Quick combat
2023-04-11 21:18:04 +04:00
dfa2e2a349 Merge beta into develop 2023-04-11 19:37:35 +03:00
8e77b833d9 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 15:54:08 +04:00
ff66592fad Merge pull request #1882 from rilian-la-te/native-terrain-refactor
Native terrain refactor
2023-04-11 02:14:37 +03:00
bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04:00