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
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
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
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
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
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
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
Alexander Shishkin
8be660aae8
Merge pull request #153 from vmarkovtsev/develop
...
Revert 5cd4e852d4
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
Vadim Markovtsev
7c7bb39904
Enable right mouse button click emulation on MacOSX
2016-01-18 16:07:17 +03:00
Vadim Markovtsev
4a05402c2f
Revert 5cd4e852d4 "Use portable cast in CTeleportDialogQuery also"
...
Actually, this leads to crash on MacOSX, I specially left that intact.
2016-01-18 10:45:09 +03:00
Arseniy Shestakov
575a68d78b
CRewardableObject: fix onVisited message duplication for Idol of Fortune
2016-01-17 15:16:35 +03:00
Arseniy Shestakov
cacc811ed8
CAdvMapInt: keep old path if non-accessible tile clicked. Fix issue 2380
2016-01-17 07:48:21 +03:00
Arseniy Shestakov
18b2f866c9
CGPickable: add missing break for flotsam. Fix issue 1956
2016-01-16 09:45:30 +03:00
Arseniy Shestakov
725cce368f
CGameState::initStartingBonus: fix amounts for wood and ore bonus
...
In original game when wood and ore bonus is choosen you always get same amount of both resources.
2016-01-15 20:36:16 +03:00
AlexVinS
a638d0cd51
Creature set serialization
2016-01-15 20:24:17 +03:00
Arseniy Shestakov
530fe04c75
CAdvMapInt::updateMoveHero: proper indeterminate check. Fix issue 2074
2016-01-15 19:30:43 +03:00
Arseniy Shestakov
b84d7bd288
CGCreature: add reward granting. Fix issue 2372
2016-01-15 04:29:46 +03:00
DjWarmonger
ac730a591c
Fixed large treasure piles sometimes being uncovered.
2016-01-13 20:03:25 +01:00
DjWarmonger
8c5f93dd8f
Little refactoring for object placement.
2016-01-13 19:17:12 +01:00
Arseniy Shestakov
a39e61373c
Deactivate CAdvMapInt while quick combat is going. Fix issue 2354
...
If quick combat calculation take a while it's possible to give hero movement command before battle is finished. This will lead to client freeze or crash. To avoid this we must lock adventure interface until battle calculation is finished.
2016-01-10 18:00:24 +03:00
Arseniy Shestakov
46e3d849af
Avoid crashes caused by mouse events. Fix issue 1955
...
Mouse handling code need refactoring, but for now we at least shouldn't crash.
2016-01-09 15:32:42 +03:00
DjWarmonger
676f078b2e
RMG will now multiply Monolith defs to ensure there are at least 100 pairs avaiable for connections.
2016-01-09 09:03:40 +01:00
DjWarmonger
dd1fc47c93
Workaround for Seer Hut offset. They seem to work fine now.
2016-01-08 21:51:55 +01:00
DjWarmonger
d840fb40eb
Fixed crashes with RMG Seer Huts. Now they are functional.
2016-01-08 21:14:57 +01:00
Arseniy Shestakov
383f754ed1
Starting gold bonuses must be always multiples of 100
2016-01-07 20:51:37 +03:00
DjWarmonger
cdd50b1603
Version bump.
2016-01-01 20:06:38 +01:00
AlexVinS
37d0dad70a
Merge branch 'develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CArtHandler.cpp
2016-01-01 20:28:52 +03:00
Arseniy Shestakov
9fd1cff090
Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
...
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.
This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
Arseniy Shestakov
29a7934a99
Refactoring: avoid using namespace when it's not absolutely needed
2015-12-29 02:14:08 +03:00
