88bc21952b
Make stables message appear if hero has cavaliers but visited stables before
2016-02-01 09:41:15 +03:00
c30a6f2ff3
Fix 1989 cavaliers -> champions in stables
2016-01-31 21:09:11 +03:00
7f68124b97
Merge pull request #136 from vcmi/issue/1372-2
...
issue/1372
2016-01-31 20:28:54 +03:00
3926920103
Rename radious -> radius
...
There is no such English word, "radious"
Some files get new lines in the end - BSD sed bug + best practices
2016-01-31 18:01:58 +03:00
e18b21b78e
Fix 2264 learning stone & Learning skill
2016-01-31 10:12:01 +03:00
eb4331baf6
Fix 1916 water wheel reward
2016-01-30 19:11:22 +03:00
918fbd8530
Refactor hero's mana regain
2016-01-30 13:51:07 +03:00
22fc4fd3e9
Fix 2406 reset potentially available heroes
2016-01-30 10:02:33 +03:00
16e0d18880
Added special slots for war machines and arrow towers
2016-01-30 00:53:53 +03:00
57328bdc83
Battles: implement basic drawbridge mechanics
...
Movement to blocking hex 94 not yet properly handled as stack movement code need to be rewritten first.
Also gate destruction not immidiately affect drawbridge state.
2016-01-29 22:43:35 +03:00
1e008b9756
SiegeInfo: add foundation for drawbridge mechanics support
...
EDrawbridgeState enum represent current state of drawbridge.
BattleDrawbridgeStateChanged netpack to pass bridge state changes to client.
2016-01-29 22:35:11 +03:00
ba017c443d
Start from diff of pull request #124 from vcmi/issue/1372
2016-01-29 21:05:17 +03:00
ca4e13b2dc
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-01-29 18:21:56 +01:00
9ce6f874f0
Local fixes.
2016-01-29 18:21:19 +01:00
a534fe1cfe
Merge pull request #152 from vcmi/feature/moatHexesConfig
...
Configurable moat hexes positions
2016-01-29 20:07:22 +03:00
75f278b913
moatHexes: use initializer list and update comment
2016-01-29 19:25:25 +03:00
7fbd5479e2
alignment & makefile fix
2016-01-29 16:08:44 +01:00
2b88de8e24
added new files
2016-01-29 15:39:44 +01:00
29faa9ce06
...and project updated
2016-01-29 15:33:07 +01:00
523bc22a30
removed old files
2016-01-29 15:32:37 +01:00
8aefdb0b7b
small project file fix
2016-01-29 15:30:22 +01:00
3a1a8e3d47
further refactoring-related changes
2016-01-29 15:16:14 +01:00
94fa25d56d
Merge pull request #179 from vmarkovtsev/issue/2405
...
Fix 2405 quest timeout mechanics
2016-01-29 12:19:31 +03:00
30d64e3e3c
Fix 2405 quest timeout mechanics
2016-01-29 09:28:37 +03:00
0011507e42
wipe constexpr on @DjWarmonger request
2016-01-29 00:34:54 +03:00
8c39ecf538
moatHexes: add saves and mods compatability
2016-01-28 01:35:01 +03:00
48aedaef47
Merge branch 'develop' into feature/moatHexesConfig
2016-01-28 01:15:08 +03:00
b7fbbfdebe
CQuest: add missing completedOption initialization for CGQuestGuard
2016-01-27 23:24:17 +03:00
fdfe7b6b06
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-01-27 21:08:18 +01:00
327e95407e
- Compile fixes part 1
...
- Project settings for MSVS
2016-01-27 21:08:08 +01:00
c3e8c8bc1c
Merge branch 'develop' into FileInfo
2016-01-27 19:21:43 +01:00
4e8486da7b
Merge pull request #160 from vmarkovtsev/issue/2388
...
Fix 2388 obelisks puzzle revealing
2016-01-27 20:49:03 +03:00
0ac833cca4
Fix 2377 "Seer Empty Text"
2016-01-27 19:52:45 +03:00
048e22dbe6
Fix build.
2016-01-27 19:32:59 +03:00
d7c0c3759a
Merge branch 'Zyx-develop' into develop
...
Conflicts:
lib/filesystem/AdapterLoaders.h
2016-01-27 18:53:41 +03:00
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
1472ed970d
Merge pull request #176 from vmarkovtsev/issue/2160
...
Fix 2160 dismissing a VIP hero.
2016-01-27 18:28:57 +03:00
9f3313524e
Fix 2160 dismissing a VIP hero
2016-01-27 17:10:19 +03:00
36eaa399e7
Add hardcodedFeature to switch winner's retreating with no troops
2016-01-27 16:42:17 +03:00
bffdc2813d
revert some project changes
2016-01-27 15:21:29 +03:00
94ecc3f520
Compilation fix. MVS 2013 doesn't support constexpr and it's not needed either.
2016-01-27 10:13:33 +01:00
fc62cabb68
Merge pull request #174 from vmarkovtsev/issue/981
...
Fix CGHeroInstance::isInitialized implementation
2016-01-27 09:43:53 +01:00
f6679bba50
Fix CGHeroInstance::isInitialized implementation
2016-01-27 09:44:23 +03:00
92dd194c97
logger now supports unicode file paths
2016-01-26 22:42:15 +01:00
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
7772b6de74
Fix 981 reset hero on hiring after retreat/surrender
2016-01-26 22:48:31 +03:00
70e3c81b9f
Replaced CFileInfo with more correct and efficient alternative
2016-01-26 14:51:38 +01:00
40cb48d65e
Replace std::remove_if with vstd::erase_if
2016-01-26 10:19:58 +03:00
6a7b1a1737
Merge pull request #161 from vmarkovtsev/issue/2076
...
Fix 2076 Grail removal
2016-01-26 09:01:43 +03:00
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
