bb3a31f3ff
Mark obelisk visited for all players in the team
2016-01-20 11:14:03 +03:00
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
c385c8757b
TAB instead of spaces
2016-01-19 20:53:29 +01:00
e4b73180bd
Merge pull request #159 from vmarkovtsev/issue/2390
...
Check against nullptr in VisitHero::fulfillsMe()
2016-01-19 22:49:54 +03:00
6eefce23fe
Check against nullptr in VisitHero::fulfillsMe()
2016-01-19 21:15:07 +03:00
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
2a55d5f85e
added copyright info
2016-01-19 14:26:18 +01:00
64365fa294
additional polishing
2016-01-19 11:56:03 +01:00
2bfc8ec8cb
Fix AI hero infinite move on the same tile
2016-01-19 13:14:05 +03:00
e187dd7b78
Merge pull request #158 from vmarkovtsev/issue/2389
...
Merging, very good solution.
2016-01-19 09:22:31 +01:00
74111b7689
Return missing building name instead of crashing in CComponent::getSubtitleInternal
2016-01-19 10:35:10 +03:00
170e4283ae
Small improvements to FileStream
2016-01-18 21:30:06 +01:00
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
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
a50a702073
switched to -std=gnu++11
2016-01-18 17:49:07 +01:00
8be660aae8
Merge pull request #153 from vmarkovtsev/develop
...
Revert 5cd4e852d4
2016-01-18 17:00:39 +03:00
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
7c7bb39904
Enable right mouse button click emulation on MacOSX
2016-01-18 16:07:17 +03:00
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
575a68d78b
CRewardableObject: fix onVisited message duplication for Idol of Fortune
2016-01-17 15:16:35 +03:00
cacc811ed8
CAdvMapInt: keep old path if non-accessible tile clicked. Fix issue 2380
2016-01-17 07:48:21 +03:00
00d1fd3aec
some fixes for launcher
2016-01-16 19:44:15 +01:00
43b364bcd4
compilation fixes...
2016-01-16 19:00:53 +01:00
cf61837ced
replaced std::string with boost::filesystem::path in several places
2016-01-16 16:36:16 +01:00
18b2f866c9
CGPickable: add missing break for flotsam. Fix issue 1956
2016-01-16 09:45:30 +03:00
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
a638d0cd51
Creature set serialization
2016-01-15 20:24:17 +03:00
530fe04c75
CAdvMapInt::updateMoveHero: proper indeterminate check. Fix issue 2074
2016-01-15 19:30:43 +03:00
b84d7bd288
CGCreature: add reward granting. Fix issue 2372
2016-01-15 04:29:46 +03:00
ac730a591c
Fixed large treasure piles sometimes being uncovered.
2016-01-13 20:03:25 +01:00
8c5f93dd8f
Little refactoring for object placement.
2016-01-13 19:17:12 +01:00
933b7c1f5e
some modernization of CFileInputStream implementation code
2016-01-12 23:40:24 +01:00
f9b255c896
Cleaner code & MSVC compatibility
2016-01-12 22:40:05 +01:00
1f4bc0f2e4
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-01-11 22:38:47 +01:00
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
99cf8069d7
FileStream files
2016-01-09 21:24:20 +01:00
203b2dccc3
hopefully fixed things
2016-01-09 21:23:55 +01:00
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
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
dd1fc47c93
Workaround for Seer Hut offset. They seem to work fine now.
2016-01-08 21:51:55 +01:00
d840fb40eb
Fixed crashes with RMG Seer Huts. Now they are functional.
2016-01-08 21:14:57 +01:00
383f754ed1
Starting gold bonuses must be always multiples of 100
2016-01-07 20:51:37 +03:00
c93f8fea48
moatHexes: implement reading moat hexes from configuration files
...
This also fix Fortess moat that previously used wrong hexes
2016-01-06 12:53:40 +03:00
ffeb7f253b
moatHexes: update faction schema and configuration files
2016-01-06 12:52:52 +03:00
cdd50b1603
Version bump.
2016-01-01 20:06:38 +01:00
37d0dad70a
Merge branch 'develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CArtHandler.cpp
2016-01-01 20:28:52 +03:00
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
29a7934a99
Refactoring: avoid using namespace when it's not absolutely needed
2015-12-29 02:14:08 +03:00
6985e96f0d
CGameHandler::newTurn: use next day TurnInfo to set correct hero MP
...
This hotfix actually fix issue 2083, but in future we need to rework new turn code anyway. See issue 2356.
2015-12-25 11:09:06 +03:00
66e6f15e67
NewTurn::applyGs: update bonuses in beginning. Fix issue 2083
...
Before bonuses was removed after hero get movement points and mana so affected hero one day more than intended.
2015-12-25 01:48:53 +03:00
