ArseniyShestakov
890ae43f55
Merge pull request #180 from Zyx-2000/FileInfo
...
Refactored CFileInfo & ResourceID
2016-02-08 04:55:39 +03:00
Arseniy Shestakov
a13aec4fd7
Aplly some fix for merge and explicitly specify type for std::max
2016-02-08 04:09:02 +03:00
ArseniyShestakov
5f23091770
Merge pull request #184 from Zyx-2000/musicstreaming
...
support for music streaming
2016-02-08 03:07:32 +03:00
ArseniyShestakov
54eb9bf81a
Merge pull request #192 from vmarkovtsev/feature/petrified_damage
...
Implement half damage to petrified units
2016-02-08 02:33:44 +03:00
DjWarmonger
441c94d56c
Remove log for Seer Huts.
2016-02-06 15:11:56 +01:00
DjWarmonger
6f5706352d
Possible fix for #2371
2016-02-06 12:36:56 +01:00
AlexVinS
081a20d047
Fix a crash.
2016-02-05 09:40:20 +03:00
AlexVinS
a3f0d1a94e
More post-merge fixes
2016-02-05 09:28:36 +03:00
DjWarmonger
b98a83f743
Added string identifiers for terrain types.
2016-02-04 17:57:51 +01:00
AlexVinS
483276b128
Merge fixes
2016-02-04 12:28:12 +03:00
AlexVinS
6e205a58b4
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/VCMI_lib.cbp
lib/filesystem/CZipLoader.cpp
lib/filesystem/CZipLoader.h
lib/mapObjects/CGTownInstance.cpp
2016-02-04 10:27:51 +03:00
AlexVinS
97f19b5176
CGResource serialization
2016-02-04 09:22:14 +03:00
AlexVinS
d8d574ed84
CGSignBottle serialization
2016-02-04 08:50:46 +03:00
AlexVinS
a6c719ee11
CGCreature serialization. Added rewardResources.
2016-02-04 08:44:46 +03:00
Vadim Markovtsev
4a326e163b
Implement blinded units attack penalties
2016-02-03 18:00:28 +03:00
DjWarmonger
e7b639898e
Final compilation fix suggested by AVS.
2016-02-03 14:26:25 +01:00
AlexVinS
1bc41b3ba3
Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1
...
Conflicts:
lib/mapObjects/CGHeroInstance.cpp
2016-02-03 05:04:44 +03:00
AlexVinS
b176734418
CGCreature serialization
2016-02-03 04:18:03 +03:00
DjWarmonger
0c82419fb0
Final compile fix, unfortunatelly game fails to launch now due to missing fill_fopen64_filefunc in minizip.dll :(
2016-02-02 19:16:12 +01:00
DjWarmonger
51183228f2
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-02-02 18:48:42 +01:00
DjWarmonger
7cf2d79584
Final compile fix.
2016-02-02 18:48:20 +01:00
Alexander Shishkin
20fd7cf916
Merge pull request #190 from vmarkovtsev/feature/fix_uf_warning
...
Fix unused function warning in release mode
2016-02-02 15:23:37 +03:00
DjWarmonger
97117491ae
Merge pull request #191 from vmarkovtsev/feature/psychic_elementals
...
I think we could implement general bonus that reduces damage depending on arbitrary immunity (or other bonus), but it's beyond the scope of this PR.
2016-02-02 13:02:13 +01:00
ArseniyShestakov
da4818eeb8
Merge pull request #187 from vmarkovtsev/issue/2362
...
Fix 2362 cast spells in town garrison
2016-02-02 14:49:54 +03:00
DjWarmonger
afd5b8807d
Compile fix #2
2016-02-02 12:46:58 +01:00
Vadim Markovtsev
eb10433535
Implement psychic elementals vs mind immune units
2016-02-02 14:30:37 +03:00
DjWarmonger
6865f70ab8
Compile fix #1
2016-02-02 12:19:33 +01:00
DjWarmonger
c78d2469c5
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-02-02 12:03:16 +01:00
Vadim Markovtsev
bdd87be10d
Try to fix http://bugs.vcmi.eu/view.php?id=2362
2016-02-02 11:46:33 +03:00
Vadim Markovtsev
8d7629bdab
Fix unused function warning in release mode
2016-02-02 11:12:28 +03:00
ArseniyShestakov
35c243c30a
Merge pull request #188 from vmarkovtsev/issue/1376
...
Fix 1376 turrets damage can decrease
2016-02-02 05:26:45 +03:00
ArseniyShestakov
eabdc0f861
Merge pull request #183 from vmarkovtsev/issue/1989
...
Fix 1989 cavaliers -> champions in stables
2016-02-02 03:56:11 +03:00
Vadim Markovtsev
97bae518fc
Fix 1376 turrets damage can decrease
2016-02-01 20:39:51 +03:00
Vadim Markovtsev
88bc21952b
Make stables message appear if hero has cavaliers but visited stables before
2016-02-01 09:41:15 +03:00
Vadim Markovtsev
c30a6f2ff3
Fix 1989 cavaliers -> champions in stables
2016-01-31 21:09:11 +03:00
ArseniyShestakov
7f68124b97
Merge pull request #136 from vcmi/issue/1372-2
...
issue/1372
2016-01-31 20:28:54 +03:00
ArseniyShestakov
ff1d56d4e7
Merge pull request #186 from vmarkovtsev/feature/rename_radious
...
Rename radious -> radius
2016-01-31 20:07:58 +03:00
Vadim Markovtsev
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
Zyx-2000
b0bb7f1f25
copyright stuff
2016-01-31 11:13:56 +01:00
DjWarmonger
4352f49a1d
Merge pull request #185 from vmarkovtsev/issue/2264
...
Fix 2264 learning stone & Learning skill
2016-01-31 09:17:11 +01:00
Vadim Markovtsev
e18b21b78e
Fix 2264 learning stone & Learning skill
2016-01-31 10:12:01 +03:00
Zyx-2000
33d0738859
support for music streaming
2016-01-30 22:34:46 +01:00
DjWarmonger
ab27464541
Merge pull request #182 from vmarkovtsev/issue/1916
...
Fix 1916 water wheel reward
2016-01-30 18:00:37 +01:00
Vadim Markovtsev
eb4331baf6
Fix 1916 water wheel reward
2016-01-30 19:11:22 +03:00
ArseniyShestakov
b0d9b8bf63
Merge pull request #178 from vmarkovtsev/issue/2406
...
Fix 2406 reset potentially available heroes
2016-01-30 14:51:54 +03:00
Vadim Markovtsev
918fbd8530
Refactor hero's mana regain
2016-01-30 13:51:07 +03:00
Vadim Markovtsev
22fc4fd3e9
Fix 2406 reset potentially available heroes
2016-01-30 10:02:33 +03:00
AlexVinS
16e0d18880
Added special slots for war machines and arrow towers
2016-01-30 00:53:53 +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
