1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

6795 Commits

Author SHA1 Message Date
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
AlexVinS
536f36ede8 use CAnimation fro world view icons 2016-10-27 16:34:12 +03:00
AlexVinS
365c64a345 use CAnimImage for world view legend 2016-10-27 16:34:10 +03:00
AlexVinS
36ac9ac86c CAdvMapInt tweak 2016-10-27 16:34:07 +03:00
AlexVinS
1ccb0d98be Disabled git version of C::B projects 2016-10-27 16:27:10 +03:00
Vadim Markovtsev
da1c9cf249 Fix rebuilding everything on HEAD change 2016-10-23 16:56:53 +02:00
Vadim Markovtsev
d0beb27197 Add git commit hash into the version string 2016-10-23 15:45:47 +02:00
Vadim Markovtsev
4bcc43d3d0 Fix Mantis #2234
CPlayerInterface instances were removed from CClient::playerint with
clear() and finish() was not called on each. Added multiple insurance.
2016-10-22 16:22:00 +02:00
Vadim Markovtsev
d51c9a1ff0 Fix uninitialized scrolling state 2016-10-22 10:18:57 +02:00
Vadim Markovtsev
baa7a84db3 Fix memory corruption during loading artifacts from mods 2016-10-22 10:00:55 +02:00
AlexVinS
feaccead36 fixed missed initialization 2016-10-18 02:37:02 +03:00
AlexVinS
28dd12089b CSpellWindow fixes. 2016-10-18 02:15:43 +03:00
AlexVinS
a223793405 Get rid of CDefHandler in CPreGame.
* also fixes difficulty icon in campaign screen
2016-10-18 01:43:42 +03:00
Vadim Markovtsev
e0303f791a Add Travis build status badge 2016-10-17 22:33:52 +02:00
ArseniyShestakov
eec14028fe Merge pull request #242 from dydzio0614/MapScrollCursor
Implement adventure map scroll cursor change
2016-10-17 16:09:01 +03:00
dydzio
22564dde4b Implement adventure map scroll cursor change 2016-10-17 14:55:55 +02:00
Alexander Shishkin
ffbad42b8f Merge pull request #239 from vcmi/issue/2555
Improved creature casting GUI.
2016-10-17 09:31:52 +03:00
AlexVinS
b256c4c36d Improved creature casting GUI.
* "F" is new hotkey for creature spells
* creature spells now have lowest priority unless F pressed
* creatures can cast NO_LOCATION spells (only with hotkey)
2016-10-17 08:09:09 +03:00
Alexander Shishkin
4876cc178d Merge pull request #240 from vcmi/spellWindowRewrite
Spell window rewrite
2016-10-17 07:58:56 +03:00
AlexVinS
5346ecb6df tweak 2016-10-17 05:42:29 +03:00
AlexVinS
3bd8cde8e0 fix 2016-10-17 05:21:43 +03:00
AlexVinS
345dd913f6 use CLabel in SpellArea 2016-10-17 05:05:48 +03:00
AlexVinS
e3ee51a28f Use label object for mana 2016-10-17 04:05:33 +03:00
AlexVinS
bc2f0ba6f1 fixed spell school ordering http://bugs.vcmi.eu/view.php?id=91 2016-10-17 03:33:29 +03:00
Alexander Shishkin
9f9e1cea17 Merge pull request #241 from vmarkovtsev/develop
Fix issue #2068 - maps list update
2016-10-17 02:52:11 +03:00