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
AlexVinS
0ec07b38ac
fix build
2016-01-24 16:58:24 +03:00
AlexVinS
89d986fc6a
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CArtHandler.h
lib/mapObjects/MiscObjects.cpp
2016-01-24 15:39:41 +03:00
AlexVinS
408f346541
Drafts for hero serialization
2016-01-24 15:35:08 +03:00
AlexVinS
3eb9de0c0b
Grail options serialization
2016-01-24 02:26:32 +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
AlexVinS
f9d0b20234
CGMine, CGArtifact, CGGarrison serialization
2016-01-23 19:53:02 +03:00
Vadim Markovtsev
2a6a8cd433
Fix segfault when non-hero forces win
2016-01-23 19:42:56 +03:00
AlexVinS
b0c4ea5947
Fix.
2016-01-23 17:43:20 +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
Vadim Markovtsev
10f888a483
Fix obelisks puzzle revealing
...
Teams and players were messed up in lib; hardcoded constants were refactored.
2016-01-20 10:44:13 +03:00
Zyx-2000
c385c8757b
TAB instead of spaces
2016-01-19 20:53:29 +01:00
Alexander Shishkin
e4b73180bd
Merge pull request #159 from vmarkovtsev/issue/2390
...
Check against nullptr in VisitHero::fulfillsMe()
2016-01-19 22:49:54 +03:00
Vadim Markovtsev
6eefce23fe
Check against nullptr in VisitHero::fulfillsMe()
2016-01-19 21:15:07 +03:00
Alexander Shishkin
02c3c226e6
Merge pull request #155 from vmarkovtsev/feature/fix_unknown_objects
...
Fix crash on unknown map objects
2016-01-19 20:39:23 +03:00
Zyx-2000
2a55d5f85e
added copyright info
2016-01-19 14:26:18 +01:00
Zyx-2000
64365fa294
additional polishing
2016-01-19 11:56:03 +01:00
Vadim Markovtsev
2bfc8ec8cb
Fix AI hero infinite move on the same tile
2016-01-19 13:14:05 +03:00
DjWarmonger
e187dd7b78
Merge pull request #158 from vmarkovtsev/issue/2389
...
Merging, very good solution.
2016-01-19 09:22:31 +01:00
Vadim Markovtsev
74111b7689
Return missing building name instead of crashing in CComponent::getSubtitleInternal
2016-01-19 10:35:10 +03:00
Zyx-2000
170e4283ae
Small improvements to FileStream
2016-01-18 21:30:06 +01:00
Vadim Markovtsev
92e011429f
Fix crash on unknown map objects
...
If getHandlerFor() fails to find the handler, it returns a nullptr
shared pointer, which is later dereferenced unconditionally.
How to reproduce:
Download map "Happy time Dragons!!!" from http://heroesportal.net/maps.php?type=H3AB-XL&sort=r
=>
Failed to find object of type 5:144
SIGSEGV
2016-01-18 21:16:55 +03:00
Zyx-2000
7166efef15
added code::blocks project file for launcher. note that it is far from perfect at the moment
2016-01-18 17:50:14 +01:00
Zyx-2000
a50a702073
switched to -std=gnu++11
2016-01-18 17:49:07 +01:00
Alexander Shishkin
8be660aae8
Merge pull request #153 from vmarkovtsev/develop
...
Revert 5cd4e852d49a988157d04349db6350322de59342 "Use portable cast in…
2016-01-18 17:00:39 +03:00
Alexander Shishkin
698df110d8
Merge pull request #154 from vmarkovtsev/feature/macosx_right_click
...
Enable right mouse button click emulation on MacOSX
2016-01-18 16:44:07 +03:00
