dydzio
96fa0fb6d4
Implement giving commander artifacts back to hero
2016-11-06 13:02:00 +01: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
Vadim Markovtsev
ab7a0d64eb
Fix formatting
2016-10-28 23:37:20 +02:00
Arseniy Shestakov
ba5ad286cd
Serializer refactoring: fix paths to work in Visual Studio
2016-10-28 13:52:42 +03:00
Vadim Markovtsev
c696746017
Fix some compilation warnings
2016-10-28 08:07:05 +02:00
Alexander Shishkin
0cf5a10bd1
Merge pull request #243 from vcmi/guiCleanup
...
Gui cleanup
2016-10-28 08:53:03 +03:00
AlexVinS
3a040c1730
Updated project files
2016-10-27 19:18:52 +03:00
Arseniy Shestakov
ba1929728a
Drop old now unused serializer files
2016-10-27 18:44:00 +03:00
Arseniy Shestakov
5f1254a29e
Apply some of Vadim's changes
...
I intentionally didn't transfer changes in CLoadIntegrityValidator since not really agree with them.
2016-10-27 18:39:17 +03:00
AlexVinS
f304c9b2e0
removed unused field
2016-10-27 18:35:53 +03:00
AlexVinS
ffeaef2bda
fixes
2016-10-27 18:19:45 +03:00
AlexVinS
8f349b5105
CTypeList: Apply changes from a50a32405d
...
Use weak_ptr for TypeDescriptor cross-links. Fixed total TypeDescriptor memory leak.
2016-10-27 18:12:30 +03:00
Ivan Savenko
5b76c3f4eb
Rebase of codebase changes for refactored serializer
...
Some of newer fixes not yet merged there and save compatibility a bit off.
2016-10-27 18:12:20 +03:00
AlexVinS
f32097339c
Use CSDL_Ext blit for paletted sprites, use SDL blit otherwise.
...
* No solution found to blit paletted images with alpha channel with SDL
2016-10-27 17:32:31 +03:00
Ivan Savenko
3d1b1f4ba8
Add files for rebased serializer refactoring done by Ivan
2016-10-27 17:26:22 +03:00
Arseniy Shestakov
15b4774076
Logging: always print version of client and server in the begining
2016-10-27 17:14:20 +03:00
Arseniy Shestakov
cb3d6a24e7
Cmake: cleanup for commit hash in build version
...
Since it's available in lib we don't need to include it everywhere.
2016-10-27 17:01:29 +03:00
AlexVinS
3dddbcf2e8
try to use CAnimation for Hero path
2016-10-27 16:34:15 +03:00
AlexVinS
8505a909e1
free Graphics object on quit.
2016-10-27 16:34:13 +03:00
