games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity
5,586 Commits 22 Branches 70 Tags
b946c5224259cfe253eaa901845e1fa69e32ec2a
Commit Graph

5586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arseniy Shestakov
b946c52242 CBattleInterface: introduce EWallVisual instead of ids with comments 2016-02-13 17:10:14 +03:00
Arseniy Shestakov
422d5cabdf CBattleInterface: first pass on client drawbridge visualization 2016-02-10 07:10:32 +03:00
Arseniy Shestakov
11dc428b1e Battles: move hexes enum to GameConstants and fix wall position 
Before we had hex 62 marked as destructible wall while actually it's must be 78.
 2016-02-09 17:38:59 +03:00
Arseniy Shestakov
01b4d0ae01 Battles: better handling for walking double-wide creatures 
Request opening of gate even if only second half of double-wide stack going to stop on it.
 2016-02-09 15:41:37 +03:00
Arseniy Shestakov
a07761b608 Battles: readable identifiers enum for drawbridge and gate hexes 
Dont like to locate them in BattleHex, but it's best place I can see so far.
 2016-02-09 12:25:13 +03:00
Arseniy Shestakov
731de439eb Battles: drawbridge support for double-hex flying creatures 2016-02-09 11:59:20 +03:00
Arseniy Shestakov
28aff78f2c Battles: implement drawbridge support for flying creatures 2016-02-09 11:30:09 +03:00
Arseniy Shestakov
fbb34b8d04 Battles: always update drawbridge state after battle state changed 
Now gate tower destruction will immidiately affect drawbridge state.
 2016-02-09 10:59:33 +03:00
Arseniy Shestakov
47433919ab Battles: handle drawbridge lowering from stack start position 2016-02-09 10:45:59 +03:00
Arseniy Shestakov
6e5f5a6800 Battles: add information about drawbridge mechanics into changelog 2016-02-08 12:29:09 +03:00
Arseniy Shestakov
015a57f81c Battles: more advanced drawbridge mechanics on server-side 
Everything work as intended except starting point not included in path.
So we send BattleDrawbridgeStateChanged package when already standing on bridge hex.
 2016-02-08 12:16:47 +03:00
Arseniy Shestakov
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
Arseniy Shestakov
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
Arseniy Shestakov
a7059fe681 Remove Ore primaryResource from towns that must get both Wood and Ore 
Currently default behaviour is to give both wood and ore for resource bonus when primaryResource not specified.
Though for some reason towns currently have ore specified so you only get 5-10 Ore.
 2016-01-29 20:25:57 +03:00
ArseniyShestakov
a534fe1cfe Merge pull request #152 from vcmi/feature/moatHexesConfig 
Configurable moat hexes positions
 2016-01-29 20:07:22 +03:00
Arseniy Shestakov
75f278b913 moatHexes: use initializer list and update comment 2016-01-29 19:25:25 +03:00
ArseniyShestakov
94fa25d56d Merge pull request #179 from vmarkovtsev/issue/2405 
Fix 2405 quest timeout mechanics
 2016-01-29 12:19:31 +03:00
Vadim Markovtsev
30d64e3e3c Fix 2405 quest timeout mechanics 2016-01-29 09:28:37 +03:00
AlexVinS
0011507e42 wipe constexpr on @DjWarmonger request 2016-01-29 00:34:54 +03:00
ArseniyShestakov
7429403d80 Merge pull request #177 from vmarkovtsev/issue/2331 
Fix 2331 save menu keyboard event leak
 2016-01-28 14:16:52 +03:00
Vadim Markovtsev
32ece9513d Fix 2331 save menu keyboard event leak 
The control flows the following way:
- we receive SDL_KEYDOWN with letter 's' in the adventure map interface
- save dialog opens
- text input receives focus
- text input enables receiving SDL_KeyboardEvent-s which go between DOWN and UP
- the button on keyboard becomes UP (the menu opens very fast)
- text input receives SDL_KeyboardEvent and inserts 's'
- text input receives SDL_KEYUP

So the apparent fix is to open the save dialog on SDL_KEYUP event
 2016-01-28 10:26:40 +03:00
Arseniy Shestakov
8c39ecf538 moatHexes: add saves and mods compatability 2016-01-28 01:35:01 +03:00
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