games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity
6,500 Commits 21 Branches 65 Tags 121 MiB
48702a26a4
Commit Graph

2472 Commits

Author SHA1 Message Date
AlexVinS
ac8b618a42 Fixed CID 1366373 2016-11-25 19:17:37 +03:00
AlexVinS
5dd5a0d4a8 Fixed CID 1197445, CID 1197446 2016-11-25 17:54:01 +03:00
AlexVinS
b908c70468 Fixed CID 1197487 2016-11-25 17:29:49 +03:00
AlexVinS
4e28efb8b4 Fixed CID 1288860 2016-11-25 16:09:14 +03:00
AlexVinS
f50fd6d8db Fixed CID 1366281, CID 1366282, CID 1366283, CID 1366284 2016-11-25 15:45:09 +03:00
AlexVinS
20de754141 def2bmp CLI command converted to CAnimation 2016-11-25 15:23:28 +03:00
AlexVinS
3c9695abcc Fixed CID 1366310 2016-11-25 13:58:20 +03:00
AlexVinS
db40e125eb Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359 2016-11-24 21:56:30 +03:00
AlexVinS
04d22644e5 fixed http://bugs.vcmi.eu/view.php?id=2617 2016-11-23 14:47:57 +03:00
AlexVinS
dc39fb2d14 Removed useless CPack::type field. 
* it was an ancient network protocol artifact
 2016-11-18 17:45:59 +03:00
AlexVinS
33c0bc49f6 Merge branch 'CommanderArtifacts3' into develop 2016-11-13 15:31:16 +03:00
AlexVinS
4338fc4ffb CMessage converted to CAnimation 2016-11-13 08:11:01 +03:00
Alexander Shishkin
a73ca79ed1 Merge pull request #257 from vcmi/mapHandlerRefactoring2 
Map handler refactoring, part 2.
 2016-11-12 09:20:45 +03:00
AlexVinS
9e6bd48038 fix 2016-11-10 14:38:33 +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 37f68713a7, reversing
changes made to 4477b7c35d.
 2016-11-08 00:17:20 +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
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
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
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
Vadim Markovtsev
79c85be93f Fix large obstacles drawing in front of the stacks 2016-10-30 04:51:35 +01:00
Ivan Savenko
256f43f467 Fixes zero-initialized fileVersion member in deserializer 2016-10-29 19:52:19 +03:00
Vadim Markovtsev
ab7a0d64eb Fix formatting 2016-10-28 23:37:20 +02:00
Alexander Shishkin
0cf5a10bd1 Merge pull request #243 from vcmi/guiCleanup 
Gui cleanup
 2016-10-28 08:53:03 +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
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
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
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
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
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
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
Vadim Markovtsev
89f506658e Fix issue #2068 - maps list update 2016-10-16 22:15:37 +02:00
AlexVinS
ba5b65ff93 get rid of CDefHandler in CSpellWindow 2016-10-16 15:27:35 +03:00
AlexVinS
2a6bab119b Use CAnimImage for SpellArea 2016-10-16 13:22:07 +03:00
AlexVinS
3a52a3c663 Allow CAnimImage to share animation object. 2016-10-16 12:58:18 +03:00
AlexVinS
e6829bf271 Removed unused debug data in CAnimation. 2016-10-16 12:02:50 +03:00
AlexVinS
a0300b0447 CSpellWindow widgets capturing 2016-10-16 12:01:18 +03:00
AlexVinS
e1f9b2c74a SpellArea tweak 2016-10-16 10:43:49 +03:00
AlexVinS
2eb61533fa use only CSpell in CSpellWindow 2016-10-16 10:32:12 +03:00
AlexVinS
63cbf960df cleaned up spell window creation 2016-10-16 09:27:22 +03:00
AlexVinS
415bd8247a Moved SpellbookInteractiveArea into CSpellWindow class 2016-10-16 09:17:23 +03:00
AlexVinS
c4b72342de CSpellWindow: improved constructor readability 2016-10-16 09:03:13 +03:00
AlexVinS
5506ae036a Reworked CHillFortWindow 
* fixed displaying free upgrades
* do not try to print 3rd or more resource in slot cost (in theory possible with mods)
** we need dynamic gui for that
* CDefEssential--
 2016-10-16 08:03:52 +03:00
AlexVinS
7ca9ab665a cleanup 2016-10-16 04:36:03 +03:00
AlexVinS
055c84bc7a cleanup 2016-10-16 04:23:38 +03:00
AlexVinS
abb875b400 cleanup 2016-10-16 03:52:11 +03:00
AlexVinS
523e33a5e5 cleanup 2016-10-16 03:41:43 +03:00
AlexVinS
e4816c0639 cleanup 2016-10-16 03:14:59 +03:00
AlexVinS
41a5cc1b69 get rid of CCastleInterface::bicons 2016-10-16 03:00:57 +03:00
AlexVinS
153af6e07b cleanup 2016-10-16 02:47:03 +03:00
Vadim Markovtsev
34cf92cb9b Change logging style 2016-10-03 20:32:01 +02:00
Vadim Markovtsev
eac5aab396 Survive client<->server ABI mismatch 2016-10-02 22:45:00 +02:00
Vadim Markovtsev
a15b8f4c99 Fix IntObject re-activated with mismatching used and active at game start 2016-10-02 22:45:00 +02:00
Vadim Markovtsev
d5327f3daf Fix loading "" bitmap at game start 2016-10-02 22:45:00 +02:00
Vadim Markovtsev
6e9431a0fb Merge pull request #231 from vmarkovtsev/fix-cmake-warnings 
Fix cmake warnings
 2016-10-02 18:17:50 +02:00
Vadim Markovtsev
6d89a2f15c Fix whitespace dev warnings 
They are bogus, but still
 2016-10-02 17:12:08 +02:00
Vadim Markovtsev
7ac4e6ed18 Fix freshly recruited hero phantom in castle entrance 2016-10-02 16:29:24 +02:00
AlexVinS
85863dbed6 Fix build 2016-10-02 17:25:55 +03:00
AlexVinS
c5440a1c6c Fixed http://bugs.vcmi.eu/view.php?id=2541 2016-10-02 01:32:28 +03:00
Piotr Wójcik
ea6545b1d3 Prevent flipping empty spellbook 
When hero has no travel spells he can no longer flip spell book opened from right panel button
 2016-10-01 21:39:40 +02:00
AlexVinS
23b7a803b6 cleanup 2016-10-01 20:07:36 +03:00
AlexVinS
7c91d378c8 Display specific message if cast blocked by CURSED_GROUND 2016-10-01 18:35:56 +03:00