AlexVinS
aa5e9fc959
get rid of global debug macros.
2015-02-14 22:43:16 +03:00
DjWarmonger
7f12802407
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2015-02-14 19:48:07 +01:00
DjWarmonger
a8ff08a562
Fixed #2012
2015-02-14 19:44:04 +01:00
AlexVinS
a5ebcd0f60
fix #2080 . No more articaft exchange between heroes in kingdom overview.
2015-02-14 20:24:18 +03:00
AlexVinS
420e5f055c
Fix warnings
2015-02-14 19:24:21 +03:00
ArseniyShestakov
a5998353c6
Update year to 2015 in readme
2015-02-14 19:15:34 +03:00
AlexVinS
0b546a9b9f
Correct placement for hero misc artifacts in kingdom overview
2015-02-14 18:59:33 +03:00
AlexVinS
c8a16bb324
Partial fix (no crash anymore) for #2075
2015-02-14 16:02:15 +03:00
AlexVinS
c135591f81
Add comments about getArtPlace - it is a bit dangerouse
2015-02-14 16:00:57 +03:00
AlexVinS
7086fdc730
Crash fixed, but bug still present
2015-02-14 16:00:56 +03:00
AlexVinS
a6c8dcbc36
Cleanup
2015-02-14 16:00:56 +03:00
DjWarmonger
58b96cdd0a
Merge pull request #87 from Fayth/mantis-2048
...
I didn't even notice this issue, thanks!
2015-02-13 11:56:24 +01:00
Fay
f30cb0fa5b
Fixes crash when loading game (if path was visible previously);
2015-02-13 11:20:13 +01:00
AlexVinS
ac3e48f4b9
Move JsonNode operator<< to right plase
2015-02-10 14:43:26 +03:00
DjWarmonger
33947d7c38
Merge pull request #85 from Fayth/mantis-2053
...
Let's see, thanks :)
2015-02-09 22:09:30 +01:00
Fay
1c6a7a923d
Fixes color-keying after scaling bitmaps for world view display;
2015-02-09 20:16:42 +01:00
DjWarmonger
71bcacaa60
Partial fix for #2053
2015-02-09 16:23:29 +01:00
AlexVinS
febd4595dc
[ERM] Less heavy includes in header
2015-02-08 15:15:31 +03:00
ArseniyShestakov
1396476869
Merge pull request #79 from ArseniyShestakov/fixIssue1557
...
Only remove extension if it belongs to specified file type
2015-02-07 18:17:22 +03:00
ArseniyShestakov
4eed1716d5
Fix tiny memory leak on opening/closing new game window
...
Find this one when tested huge pack of 5000+ maps. Each time I opened/closed Single Scenario window memory usage was growing for ~1MB.
It's happen because inflateEnd is freed related structures, but not freed inflateState that created outside of zlib code.
2015-02-07 17:30:57 +03:00
ArseniyShestakov
96d57fc954
War Machines: replace immunity with absoluteImmunity
...
This commit replace SIEGE_WEAPON immunity with absoluteImmunity for following spells: Haste, Slow, Death Ripple, Clone, Teleport
2015-02-07 16:02:15 +03:00
ArseniyShestakov
fbb84624f9
War Machines: add absoluteImmunity to Implosion spell
2015-02-07 16:00:06 +03:00
ArseniyShestakov
20387bd2da
War Machines: add absoluteImmunity to some timed spells
...
This commit add SIEGE_WEAPON to absoluteImmunity of following timed spells: Curse, Bloodlust, Mirth, Sorrow, Frenzy, Counterstrike, Berserk, Hypnotize, Forgetfulness, Blind
2015-02-07 15:57:46 +03:00
AlexVinS
91cc6a04eb
possible fix for mantiss 2055
2015-02-07 00:06:24 +03:00
DjWarmonger
0abc50dc4b
Merge pull request #82 from Fayth/mantis-1913
...
If it works, then it's good :)
2015-02-06 20:33:15 +01:00
Fay
485a8b5c9a
Fixed updating camera position after teleportation (gate/teleport/spells);
2015-02-06 19:11:04 +01:00
ArseniyShestakov
8f08effe93
Check that resource type set before setName used
2015-02-06 10:51:32 +03:00
DjWarmonger
1d34d15983
Compilation fixes.
2015-02-01 19:25:42 +01:00
AlexVinS
860c61def1
Update changelog
2015-02-01 20:52:56 +03:00
AlexVinS
594295da32
Merge branch 'feature/worldView' into develop
2015-02-01 20:49:14 +03:00
Fay
b59189ae6f
Minor fix to resolve clipping rect issue from previous commit;
2015-01-31 19:05:25 +01:00
Fay
dbedf245a0
Fixed some calculation to resolve edge tiles being partially cut-off in advmap world view mode;
2015-01-31 19:00:41 +01:00
Fay
e56488d700
Fixed gems redrawing after world view scale change;
...
Fixed hotkeys to start world view mode;
2015-01-31 10:57:13 +01:00
Fay
df419e23c0
Fixed recoloring filler background to correct player color after game reload;
2015-01-29 20:34:53 +01:00
Fay
794c03792a
Added empty background below world view panel for better compat with higher resolutions;
2015-01-29 18:39:46 +01:00
Alexander Shishkin
4bd298f218
Merge pull request #81 from Mixaill/develop
...
Fix Travis build
2015-01-29 02:51:48 +03:00
Mikhail Paulyshka
275c35491b
Update FFmpeg ppa
2015-01-28 23:07:40 +03:00
Mikhail Paulyshka
201f1e6f2a
Update FFmpeg ppa
2015-01-28 23:06:03 +03:00
Mikhail Paulyshka
9b76ca0b27
Fix compilation with some versions of libavutil
2015-01-28 22:46:28 +03:00
AlexVinS
ba51de8b5f
Merge remote-tracking branch 'remotes/Fayth/mantis-2011' into develop
2015-01-28 09:41:09 +03:00
Fay
4b5b6edd44
Added space between both text entries;
2015-01-26 17:16:39 +01:00
ArseniyShestakov
19d1de3142
Only remove extension if it belongs to specified file type
...
This one fixes issue 1557
Now it's possible to load maps with dots in filename.
2015-01-26 16:40:49 +03:00
Alexander Shishkin
cb348a266a
Merge pull request #78 from Fayth/mantis-1964
...
Mantis#1964: video looping fix.
2015-01-26 01:34:21 +03:00
Fay
413523956f
Fixed missing info about dealt damage in combat log when there were casualties;
...
Fixed blank row in combat log in the same case;
2015-01-25 18:03:34 +01:00
Fay
b03eb56706
Possibly fixes looping videos;
2015-01-25 14:28:11 +01:00
DjWarmonger
86fde2ba54
Merge pull request #76 from Fayth/mantis-2016
...
Looks much better now :)
2015-01-25 07:49:46 +01:00
Fay
551925b6d7
Added comments;
2015-01-24 23:12:17 +01:00
DjWarmonger
6120b2e72c
Merge pull request #77 from Fayth/mantis-1993
...
Good catch, thanks!
2015-01-24 22:31:19 +01:00
DjWarmonger
60932d9ed0
AI won't ignore owned objects taken by enemies.
2015-01-24 21:38:22 +01:00
Fay
ad8a6c55d7
Fixes #2016 (heroes not possible to be chosen in pregame after switching town selection);
...
Fixes skipping first hero selection when switching them with left arrow;
Fixes redrawing random hero portrait correctly after switching that player to AI;
2015-01-24 21:24:23 +01:00
