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
Alexander Shishkin
bdbbc22c66
Merge pull request #235 from vcmi/issue/2545
...
Fixes: http://bugs.vcmi.eu/view.php?id=2545 , http://bugs.vcmi.eu/view.php?id=2520
2016-10-11 22:39:02 +03:00
AlexVinS
552f28c10b
fix
2016-10-11 21:25:22 +03:00
AlexVinS
ef9bff9006
fixes related to http://bugs.vcmi.eu/view.php?id=2520
2016-10-11 20:04:30 +03:00
AlexVinS
9834db1b7d
simplified CGScholar::onHeroVisit
2016-10-11 20:04:28 +03:00
AlexVinS
4173a5064c
Fixed http://bugs.vcmi.eu/view.php?id=2545
2016-10-11 20:04:27 +03:00
Alexander Shishkin
0857197ff9
Merge pull request #236 from vcmi/issue/2527
...
Fixes: http://bugs.vcmi.eu/view.php?id=2527 , http://bugs.vcmi.eu/view.php?id=2507
2016-10-11 20:02:29 +03:00
AlexVinS
24585cde87
complete fix for http://bugs.vcmi.eu/view.php?id=2507
2016-10-11 18:19:42 +03:00
AlexVinS
5c3f84138b
fixed random reward generation in CGVisitableOPW
2016-10-11 18:00:54 +03:00
AlexVinS
7db7ece143
Do not send netpack inside netpack handler.
2016-10-09 19:38:13 +03:00
Piotr Wójcik
bb890098df
Fix regression for week-visitable objects
2016-10-09 18:51:41 +03:00
AlexVinS
6664731886
Fixed http://bugs.vcmi.eu/view.php?id=2551
2016-10-09 11:38:02 +03:00
ArseniyShestakov
3cf000572a
Merge pull request #234 from dreamer10/develop
...
Bug fix for berserk:
2016-10-08 17:43:22 +03:00
Hao Hu
9ec9cffe9b
Bug fix for berserk: fixed the issue that the berserk affected stack
...
won't attack the nearest live stack.
2016-10-07 23:50:34 -04:00
ArseniyShestakov
8af4d97664
Merge pull request #233 from vmarkovtsev/develop
...
Bunch of random stuff
2016-10-03 22:25:39 +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
a4e550e3cf
Add log levels report
2016-10-02 22:45:00 +02:00
ArseniyShestakov
6f82dc3e15
Merge pull request #230 from dydzio0614/CommanderExperience
...
Some repair for WoG commanders
2016-10-02 19:29:55 +03:00
Vadim Markovtsev
6e9431a0fb
Merge pull request #231 from vmarkovtsev/fix-cmake-warnings
...
Fix cmake warnings
2016-10-02 18:17:50 +02:00
ArseniyShestakov
5593eb5769
Merge pull request #232 from vmarkovtsev/develop
...
Add the option to forcefully use bundled fuzzylite
2016-10-02 19:05:47 +03:00
Vadim Markovtsev
63383502c3
Add the option to forcefully use bundled fuzzylite
...
cmake -DFORCE_BUNDLED_FL=TRUE ...
As requested in #231
2016-10-02 17:47:27 +02:00
ArseniyShestakov
1c2a40592a
Merge pull request #229 from vmarkovtsev/develop
...
Fix freshly recruited hero phantom in castle entrance
2016-10-02 18:26:40 +03:00
Vadim Markovtsev
8546f510d1
Update cotire
2016-10-02 17:12:08 +02:00
Vadim Markovtsev
6d89a2f15c
Fix whitespace dev warnings
...
They are bogus, but still
2016-10-02 17:12:08 +02:00
Dydzio
b84e680f57
Revert changing class structure
2016-10-02 16:57:26 +02:00
Vadim Markovtsev
7ac4e6ed18
Fix freshly recruited hero phantom in castle entrance
2016-10-02 16:29:24 +02:00
