AlexVinS
9e6bd48038
fix
2016-11-10 14:38:33 +03:00
ArseniyShestakov
06437aa202
Merge pull request #258 from dydzio0614/spellingfix
...
Minor typo fixes. Fix issue #2596
2016-11-10 13:58:25 +03:00
dydzio
5c07e1c432
Minor typo fixes
2016-11-10 11:51:47 +01:00
AlexVinS
b248642468
fixes and cleanup
2016-11-09 09:32:44 +03:00
dydzio
b626f9a134
Fix CCommanderArtPlace localization + minor fixes
2016-11-08 17:26:24 +01:00
AlexVinS
a8a661b159
Map handler refactoring, part 2.
2016-11-08 00:19:53 +03:00
AlexVinS
aad675a7c4
Revert "Merge branch 'p254_4' into develop"
...
This reverts commit 37f68713a74477b7c35d
2016-11-08 00:17:20 +03:00
Arseniy Shestakov
37f68713a7
Merge branch 'p254_4' into develop
2016-11-08 00:12:01 +03:00
AlexVinS
4d510c172d
Terrain drawing converted to CAnimation.
2016-11-07 23:48:30 +03:00
AlexVinS
c9a3d92ff3
cleanup
2016-11-06 17:36:46 +03:00
dydzio
96fa0fb6d4
Implement giving commander artifacts back to hero
2016-11-06 13:02:00 +01:00
ArseniyShestakov
4477b7c35d
Merge pull request #255 from vcmi/travisMXE
...
Travis: add Windows build via MXE
2016-11-06 06:36:18 +03:00
Arseniy Shestakov
c7056c0302
Travis: add Windows build via MXE
...
Tests are disabled for MXE since they fail to build. Problem is lack of proper main, but fix might break them on other platforms.
Since we don't have many automated tests anyway better to disable it for now when it's built using MXE.
2016-11-06 05:36:50 +03:00
AlexVinS
6782136e3e
Map edge drawing converted to CAnimation
2016-11-06 05:27:58 +03:00
AlexVinS
46196daa07
cleanup
2016-11-06 05:27:56 +03:00
AlexVinS
6a272d8f0c
FoW drawing converted to CAnimation
2016-11-06 05:27:45 +03:00
AlexVinS
c11a660d21
Fixed and cleanup
2016-11-06 05:27:44 +03:00
AlexVinS
186cd7a163
Mao object drawing converted to CAnimation
2016-11-06 05:27:26 +03:00
dydzio
baeb3c9e55
Refactor CArtPlace + use it for commanders
2016-11-04 17:54:09 +01:00
AlexVinS
08252a1282
Merge remote-tracking branch 'remotes/dydzio/CommanderArtifacts2' into develop
2016-11-03 22:27:08 +03:00
dydzio
03620b3cbe
Remove artifact assembly check for commanders
2016-11-03 19:49:55 +01:00
AlexVinS
329a537eec
Plug assertion (report warning instead) on some maps start.
2016-11-03 19:15:16 +03:00
AlexVinS
9e366df70f
Merge branch 'PregameCache' into develop
2016-11-03 17:10:54 +03:00
dydzio
47a72d4441
Make artifacts worn by commander visible
2016-11-03 14:25:17 +01:00
dydzio
9de5b9f02b
New/load game last selection storing. Fixes #716
2016-11-02 20:10:34 +01:00
AlexVinS
aea281a9de
Fixed Stronghold hero specialties
2016-11-02 18:52:35 +03:00
AlexVinS
f538aae95e
Partial fix for http://bugs.vcmi.eu/view.php?id=2590
2016-11-02 14:52:02 +03:00
AlexVinS
b7b488b445
[c::b] BattleAI project updated, fixed paths
2016-11-01 21:53:46 +03:00
ArseniyShestakov
43ebfe2aa8
Merge pull request #244 from FeniksFire/develop
...
0.99 released so we can now merge this one.
2016-11-01 21:43:36 +03:00
Arseniy Shestakov
99d593172d
RPM: Fix date for 0.99 release
2016-11-01 21:26:09 +03:00
Arseniy Shestakov
6c8aa6e938
Linux version bump for 0.99
2016-11-01 20:45:50 +03:00
DjWarmonger
db13d7a708
Version 0.99 updates.
2016-11-01 18:25:09 +01:00
DjWarmonger
9db3bfcbf2
Merge pull request #212 from vcmi/refactoring/serialization2
...
Apparently it works - both new and old saves load at least.
2016-11-01 17:25:39 +01:00
DjWarmonger
aa0c745202
Compile fixes for MSVS.
2016-11-01 16:48:34 +01:00
ArseniyShestakov
b0e78444ec
Merge pull request #247 from vcmi/issue/2585
...
Relaxed cast requirements for Quicksand
2016-10-31 17:28:08 +03:00
Michał Kalinowski
18f8ca3cd0
Refactoring Battle AI.
...
Divide BattleAI on the smaller files.
2016-10-31 14:59:56 +01:00
AlexVinS
dad0569bc7
Relaxed cast requirements for Quicksand
2016-10-31 15:38:53 +03:00
Vadim Markovtsev
8d40a4aa95
Fix GUI disposal in creature info window
2016-10-30 22:21:26 +01:00
Vadim Markovtsev
34005228e0
Fix bugs with giving commander's badge to stacks
...
1. SEGFAULT
2. Memory leaks
3. Invalid drawing
4. Fix returning artifacts
2016-10-30 16:32:28 +01:00
Vadim Markovtsev
220e4d2030
Survive giving Commander's badge to stacks
...
Used to SEGFAULT
2016-10-30 14:27:53 +01:00
Arseniy Shestakov
e79c522c4b
Serializer refactoring: fix FileStream usage for game loading
...
Miss this one rebase. Without this one non-English characters in paths to saves cause issues.
2016-10-30 15:46:44 +03:00
Ivan Savenko
a1cca251ec
Possible fix for selection of incorrect method for serialization of vector<bool>
2016-10-30 11:42:53 +02:00
Vadim Markovtsev
79c85be93f
Fix large obstacles drawing in front of the stacks
2016-10-30 04:51:35 +01:00
Vadim Markovtsev
9651676452
Merge pull request #245 from vmarkovtsev/develop
...
Add commander resurrection info window upon entering town
2016-10-29 21:55:34 +02:00
Vadim Markovtsev
99a3a58cbb
Add commander resurrection info window upon entering town
2016-10-29 21:55:00 +02:00
Arseniy Shestakov
e13f98e38e
Compilation fix for VS2015 suggested by Ivan and tested by @dydzio0614
...
It's compiled without it by Clang / GCC, but not MSVC++
2016-10-29 21:29:25 +03:00
Ivan Savenko
256f43f467
Fixes zero-initialized fileVersion member in deserializer
2016-10-29 19:52:19 +03:00
Vadim Markovtsev
9f967b4d7a
Fix formatting
2016-10-29 17:00:12 +02:00
Vadim Markovtsev
24793e115c
Fix formatting
2016-10-29 13:45:08 +02:00
Vadim Markovtsev
dccc25268c
Fix the initial creature spells at battle start
...
Before: built-in spells appear on first move of the creature
After: all built-in spells appear before the first move but after tactics
Example: Air Shield for experienced skeletons
2016-10-28 23:37:45 +02:00
