Arseniy Shestakov
|
48aedaef47
|
Merge branch 'develop' into feature/moatHexesConfig
|
2016-01-28 01:15:08 +03:00 |
|
Arseniy Shestakov
|
b7fbbfdebe
|
CQuest: add missing completedOption initialization for CGQuestGuard
|
2016-01-27 23:24:17 +03:00 |
|
ArseniyShestakov
|
4e8486da7b
|
Merge pull request #160 from vmarkovtsev/issue/2388
Fix 2388 obelisks puzzle revealing
|
2016-01-27 20:49:03 +03:00 |
|
ArseniyShestakov
|
ac0187d3ed
|
Merge pull request #162 from vmarkovtsev/issue/2377
Fix 2377 "Seer Empty Text"
|
2016-01-27 20:47:00 +03:00 |
|
Vadim Markovtsev
|
0ac833cca4
|
Fix 2377 "Seer Empty Text"
|
2016-01-27 19:52:45 +03:00 |
|
AlexVinS
|
048e22dbe6
|
Fix build.
|
2016-01-27 19:32:59 +03:00 |
|
AlexVinS
|
d7c0c3759a
|
Merge branch 'Zyx-develop' into develop
Conflicts:
lib/filesystem/AdapterLoaders.h
|
2016-01-27 18:53:41 +03:00 |
|
ArseniyShestakov
|
3c84400262
|
Merge pull request #175 from vmarkovtsev/feature/switch_retreat_no_troops
Feature/switch retreat no troops
|
2016-01-27 18:49:29 +03:00 |
|
Alexander Shishkin
|
1472ed970d
|
Merge pull request #176 from vmarkovtsev/issue/2160
Fix 2160 dismissing a VIP hero.
|
2016-01-27 18:28:57 +03:00 |
|
Vadim Markovtsev
|
9f3313524e
|
Fix 2160 dismissing a VIP hero
|
2016-01-27 17:10:19 +03:00 |
|
Vadim Markovtsev
|
36eaa399e7
|
Add hardcodedFeature to switch winner's retreating with no troops
|
2016-01-27 16:42:17 +03:00 |
|
AlexVinS
|
bffdc2813d
|
revert some project changes
|
2016-01-27 15:21:29 +03:00 |
|
DjWarmonger
|
94ecc3f520
|
Compilation fix. MVS 2013 doesn't support constexpr and it's not needed either.
|
2016-01-27 10:13:33 +01:00 |
|
ArseniyShestakov
|
4483c45905
|
Merge pull request #167 from vmarkovtsev/issue/1569
Fix 1569 winning hero with no troops shall retreat
|
2016-01-27 11:48:22 +03:00 |
|
DjWarmonger
|
fc62cabb68
|
Merge pull request #174 from vmarkovtsev/issue/981
Fix CGHeroInstance::isInitialized implementation
|
2016-01-27 09:43:53 +01:00 |
|
Vadim Markovtsev
|
f6679bba50
|
Fix CGHeroInstance::isInitialized implementation
|
2016-01-27 09:44:23 +03:00 |
|
Zyx-2000
|
92dd194c97
|
logger now supports unicode file paths
|
2016-01-26 22:42:15 +01:00 |
|
DjWarmonger
|
f626c0f9ed
|
Merge pull request #173 from vmarkovtsev/issue/981
Fix 981 reset hero on hiring after retreat/surrender
|
2016-01-26 21:24:22 +01:00 |
|
Vadim Markovtsev
|
7772b6de74
|
Fix 981 reset hero on hiring after retreat/surrender
|
2016-01-26 22:48:31 +03:00 |
|
ArseniyShestakov
|
51910cbca3
|
Merge pull request #171 from vmarkovtsev/feature/remove_if_to_erase_if
Replace std::remove_if with vstd::erase_if
|
2016-01-26 10:45:16 +03:00 |
|
Vadim Markovtsev
|
40cb48d65e
|
Replace std::remove_if with vstd::erase_if
|
2016-01-26 10:19:58 +03:00 |
|
ArseniyShestakov
|
6a7b1a1737
|
Merge pull request #161 from vmarkovtsev/issue/2076
Fix 2076 Grail removal
|
2016-01-26 09:01:43 +03:00 |
|
Arseniy Shestakov
|
97a8874ed7
|
CGCreature: fix crash on draw
Also according to H3 behaviour if there artifact monster guarded it's will be lost on draw.
|
2016-01-26 08:41:09 +03:00 |
|
ArseniyShestakov
|
10f5029fff
|
Merge pull request #165 from vmarkovtsev/issue/2139
Fix 2139 captured spell scroll descriptions
|
2016-01-26 01:12:56 +03:00 |
|
Vadim Markovtsev
|
6849ff846c
|
Fix memory corruption with a draw; race in setBattleResult()
|
2016-01-25 15:55:32 +03:00 |
|
Vadim Markovtsev
|
22eb71de03
|
Remove this-> occurrences in new code
|
2016-01-25 14:14:32 +03:00 |
|
Vadim Markovtsev
|
a74fbff34f
|
Fix 2076 Grail removal
|
2016-01-25 12:38:11 +03:00 |
|
Vadim Markovtsev
|
afa95312ba
|
Fix 2139 captured spell scroll descriptions
|
2016-01-25 08:49:26 +03:00 |
|
Vadim Markovtsev
|
7185890723
|
Fix double free in battleAfterLevelUp() in case of a draw
|
2016-01-24 01:31:39 +03:00 |
|
ArseniyShestakov
|
b19e082f37
|
Merge pull request #166 from vmarkovtsev/issue/1723
Fix 1723 quest crash on combined arts
|
2016-01-23 23:23:07 +03:00 |
|
ArseniyShestakov
|
090e946985
|
Merge pull request #170 from vmarkovtsev/issue/1810
Fix 1810 suggest artifact assembly
|
2016-01-23 22:53:06 +03:00 |
|
ArseniyShestakov
|
c7ca88f84b
|
Merge pull request #157 from vmarkovtsev/issue/2383
Issue/2383 fix invalid AI path detection
|
2016-01-23 22:02:10 +03:00 |
|
Vadim Markovtsev
|
2a6a8cd433
|
Fix segfault when non-hero forces win
|
2016-01-23 19:42:56 +03:00 |
|
Vadim Markovtsev
|
9ffd0155e6
|
Fix 1810 suggest artifact assembly
|
2016-01-23 16:24:43 +03:00 |
|
Alexander Shishkin
|
17d0e9c66e
|
Merge pull request #169 from vmarkovtsev/issue/2014
Fix 2014 cursor must disappear during movement and Magi's Eye
|
2016-01-23 01:54:15 +03:00 |
|
Alexander Shishkin
|
47a4d74e79
|
Merge pull request #168 from vmarkovtsev/issue/1799
Fix 1799 not updated hero info box on artifact pickup
|
2016-01-23 01:52:41 +03:00 |
|
Vadim Markovtsev
|
a266154b26
|
Fix 2014 cursor must disappear during movement and Magi's Eye
|
2016-01-23 00:35:41 +03:00 |
|
Vadim Markovtsev
|
f2376485e3
|
Fix 1799 not updated hero info box on artifact pickup
|
2016-01-22 23:30:24 +03:00 |
|
Vadim Markovtsev
|
99992599db
|
Partially fix 1416 tavern hero rotation
|
2016-01-22 22:37:46 +03:00 |
|
Vadim Markovtsev
|
9dfef2186d
|
Fix 1569 winning hero with no troops shall retreat
|
2016-01-22 22:29:53 +03:00 |
|
Vadim Markovtsev
|
11bce2908d
|
Fix 1723 quest crash on combined arts
|
2016-01-22 12:56:25 +03:00 |
|
DjWarmonger
|
b02bd61c83
|
Merge pull request #164 from vmarkovtsev/issue/1821
Fix 1821 artifact assembly statusbar text
|
2016-01-21 09:37:43 +01:00 |
|
Arseniy Shestakov
|
6ce645b28f
|
Added new cheat into changelog
|
2016-01-21 10:58:43 +03:00 |
|
Vadim Markovtsev
|
b1f3480c68
|
Fix 1821 artifact assembly statusbar text
|
2016-01-21 10:50:53 +03:00 |
|
Arseniy Shestakov
|
d25372a397
|
Added vcmiglaurung cheat that add 5000 crystal dragons into each slot
|
2016-01-21 10:49:09 +03:00 |
|
ArseniyShestakov
|
b351c0816f
|
Merge pull request #163 from vmarkovtsev/issue/2358
Fix 2358 swapped garrison <-> visiting status text
|
2016-01-21 10:37:51 +03:00 |
|
Vadim Markovtsev
|
419bde8997
|
Fix 2358 swapped garrison <-> visiting status text
|
2016-01-21 09:59:39 +03:00 |
|
Vadim Markovtsev
|
e8db456beb
|
Reset obelisks upon game end
Otherwise, the static variables are preserved and lead to wrong values in next new game.
|
2016-01-20 13:02:52 +03:00 |
|
Vadim Markovtsev
|
1a2cd36df8
|
Initialize obelisks count to 0
Otherwise every time player starts with a random number.
|
2016-01-20 12:43:07 +03:00 |
|
Vadim Markovtsev
|
bb3a31f3ff
|
Mark obelisk visited for all players in the team
|
2016-01-20 11:14:03 +03:00 |
|