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
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
AlexVinS
f760e22707
Fixed two recursive infinite loops in case of alternate buildings.
...
* introduced in https://github.com/vcmi/vcmi/pull/211
2016-10-15 04:19:47 +03:00
AlexVinS
cf143cd257
Hack-fix crash in CGTownInstance::genBuildingRequirements related to alternate town buildings
...
* this disables features of #211 , but actual problem may be deeper inside logical expressions
2016-10-14 23:46:24 +03:00
Vadim Markovtsev
a146d1c887
Merge pull request #238 from vmarkovtsev/develop
...
Fix segfault/assertion failure during battle
2016-10-12 21:04:18 +02:00
Vadim Markovtsev
6fe5f2a7f6
Fix segfault / assertion failure during battle
...
The cause of the assertion failure at BattleStackAttacked::applyGs "at"
was shooting and casting some spell in handleAttackBeforeCasting() and
eventually killing the whole stack. Fix: filter dead stacks in the end of
handleAttackBeforeCasting().
2016-10-12 19:11:12 +02:00
Vadim Markovtsev
76ac9991ed
Format code
2016-10-12 17:22:35 +02:00
Vadim Markovtsev
516d938f7a
Merge pull request #237 from vmarkovtsev/develop
...
macOS Travis / #2553
2016-10-12 12:05:27 +02:00
Vadim Markovtsev
0e9e93e14e
[WIP] macOS Travis / #2553
2016-10-12 11:35:40 +02:00
