1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Commit Graph

2569 Commits

Author SHA1 Message Date
4e28efb8b4 Fixed CID 1288860 2016-11-25 16:09:14 +03:00
f50fd6d8db Fixed CID 1366281, CID 1366282, CID 1366283, CID 1366284 2016-11-25 15:45:09 +03:00
20de754141 def2bmp CLI command converted to CAnimation 2016-11-25 15:23:28 +03:00
3c9695abcc Fixed CID 1366310 2016-11-25 13:58:20 +03:00
db40e125eb Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359 2016-11-24 21:56:30 +03:00
04d22644e5 fixed http://bugs.vcmi.eu/view.php?id=2617 2016-11-23 14:47:57 +03:00
dc39fb2d14 Removed useless CPack::type field.
* it was an ancient network protocol artifact
2016-11-18 17:45:59 +03:00
33c0bc49f6 Merge branch 'CommanderArtifacts3' into develop 2016-11-13 15:31:16 +03:00
4338fc4ffb CMessage converted to CAnimation 2016-11-13 08:11:01 +03:00
a73ca79ed1 Merge pull request #257 from vcmi/mapHandlerRefactoring2
Map handler refactoring, part 2.
2016-11-12 09:20:45 +03:00
9e6bd48038 fix 2016-11-10 14:38:33 +03:00
5c07e1c432 Minor typo fixes 2016-11-10 11:51:47 +01:00
b248642468 fixes and cleanup 2016-11-09 09:32:44 +03:00
b626f9a134 Fix CCommanderArtPlace localization + minor fixes 2016-11-08 17:26:24 +01:00
a8a661b159 Map handler refactoring, part 2. 2016-11-08 00:19:53 +03:00
aad675a7c4 Revert "Merge branch 'p254_4' into develop"
This reverts commit 37f68713a7, reversing
changes made to 4477b7c35d.
2016-11-08 00:17:20 +03:00
4d510c172d Terrain drawing converted to CAnimation. 2016-11-07 23:48:30 +03:00
c9a3d92ff3 cleanup 2016-11-06 17:36:46 +03:00
96fa0fb6d4 Implement giving commander artifacts back to hero 2016-11-06 13:02:00 +01:00
6782136e3e Map edge drawing converted to CAnimation 2016-11-06 05:27:58 +03:00
46196daa07 cleanup 2016-11-06 05:27:56 +03:00
6a272d8f0c FoW drawing converted to CAnimation 2016-11-06 05:27:45 +03:00
c11a660d21 Fixed and cleanup 2016-11-06 05:27:44 +03:00
186cd7a163 Mao object drawing converted to CAnimation 2016-11-06 05:27:26 +03:00
baeb3c9e55 Refactor CArtPlace + use it for commanders 2016-11-04 17:54:09 +01:00
08252a1282 Merge remote-tracking branch 'remotes/dydzio/CommanderArtifacts2' into develop 2016-11-03 22:27:08 +03:00
03620b3cbe Remove artifact assembly check for commanders 2016-11-03 19:49:55 +01:00
329a537eec Plug assertion (report warning instead) on some maps start. 2016-11-03 19:15:16 +03:00
9e366df70f Merge branch 'PregameCache' into develop 2016-11-03 17:10:54 +03:00
47a72d4441 Make artifacts worn by commander visible 2016-11-03 14:25:17 +01:00
9de5b9f02b New/load game last selection storing. Fixes #716 2016-11-02 20:10:34 +01:00
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
8d40a4aa95 Fix GUI disposal in creature info window 2016-10-30 22:21:26 +01:00
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
220e4d2030 Survive giving Commander's badge to stacks
Used to SEGFAULT
2016-10-30 14:27:53 +01:00
79c85be93f Fix large obstacles drawing in front of the stacks 2016-10-30 04:51:35 +01:00
256f43f467 Fixes zero-initialized fileVersion member in deserializer 2016-10-29 19:52:19 +03:00
ab7a0d64eb Fix formatting 2016-10-28 23:37:20 +02:00
0cf5a10bd1 Merge pull request #243 from vcmi/guiCleanup
Gui cleanup
2016-10-28 08:53:03 +03:00
f304c9b2e0 removed unused field 2016-10-27 18:35:53 +03:00
ffeaef2bda fixes 2016-10-27 18:19:45 +03:00
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
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
15b4774076 Logging: always print version of client and server in the begining 2016-10-27 17:14:20 +03:00
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
3dddbcf2e8 try to use CAnimation for Hero path 2016-10-27 16:34:15 +03:00
8505a909e1 free Graphics object on quit. 2016-10-27 16:34:13 +03:00
536f36ede8 use CAnimation fro world view icons 2016-10-27 16:34:12 +03:00
365c64a345 use CAnimImage for world view legend 2016-10-27 16:34:10 +03:00
36ac9ac86c CAdvMapInt tweak 2016-10-27 16:34:07 +03:00