Fay
3c3fb0e21d
Added advmap config options to enable/disable fading;
2015-02-02 19:38:30 +01:00
Fay
5a7a208617
Minor fixes (possible surface leak);
2015-02-02 17:42:42 +01:00
DjWarmonger
1d34d15983
Compilation fixes.
2015-02-01 19:25:42 +01:00
Fay
4c636c15e9
Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading
2015-02-01 19:12:03 +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
447c4603a2
Fade-in fixes;
...
Added more map object fading cases (teleports/(dis)embarking)
2015-01-31 18:36:57 +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
5e78a3147a
Abstracted fading into separate class;
...
Smoother fade animations;
Added fading when recentering hero after switching levels;
2015-01-30 23:37:28 +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
Fay
e64c08df27
Initial;
2015-01-28 20:07:57 +01: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
Fay
72f34a7799
Fixes crash on dropping an artifact on an empty garrison slot;
2015-01-24 00:21:18 +01:00
Fay
77908dcf76
Added missing deletes in map handler dtor;
2015-01-20 20:51:09 +01:00
Fay
8adc209366
Fixed setting adventure map underground button state after game load;
2015-01-19 21:48:52 +01:00
Fay
beaf1a62c5
Added puzzle view button to world view gui;
2015-01-19 20:46:03 +01:00
Fay
01029779d7
World view mode drawing: refactoring, part 2 (further merging of common functionalities; abstracted puzzle view to separate blitter);
2015-01-19 20:08:19 +01:00
Fay
97d89d1d6c
World view mode drawing: refactoring, part 1 (merged main drawing method);
2015-01-18 18:53:40 +01:00
Fay
103f2ed627
(auto whitespace fix)
2015-01-18 18:23:23 +01:00
AlexVinS
a90d603c16
fix modded spell effect not showing
2015-01-18 19:38:35 +03:00
Fay
e3dc37fece
Fixed hotkeys in world view mode (added missing hotkeys + disabled non-world-view hotkeys);
...
Fixed minimap radar calculation for world view mode;
2015-01-17 13:41:59 +01:00
Fay
447119e2f5
Changed zoom factors to resemble OH3 as closely as possible;
...
Minor refactoring;
2015-01-17 11:56:12 +01:00
Fay
9b3b69b108
Fixed incorrect display of scaled+rotated map images in world view mode;
...
Fixed miscalculated viewport sizes in somee cases;
2015-01-16 23:49:15 +01:00
DjWarmonger
0acae7a708
Additional adjustment of zone positions to ensure balanced zone sizes.
2015-01-16 19:28:27 +01:00
DjWarmonger
ba604f4e43
Implemented "junction" zone type.
2015-01-16 17:39:16 +01:00
DjWarmonger
b7386250e9
Fixed fractalized paths inside zones.
2015-01-16 09:40:11 +01:00
Fay
8e840d2c30
Changed map surface-cache key from int to intptr_t;
2015-01-15 17:17:26 +01:00
DjWarmonger
fe180335de
Important fix that prevents treasures from sealing off, adding too many blocked tiles.
2015-01-15 11:21:29 +01:00
Fay
3823631a57
Fixed recoloring world view panel info icons after current player change;
...
Refactored ui objects handling in CAdvMapInt to slightly reduce clutter;
Minor other improvements;
2015-01-15 00:22:20 +01:00
Fay
4b248c2762
World view impl -- initial;
2015-01-13 20:57:41 +01:00
DjWarmonger
9f05f53e65
Corrected monster agressiveness #2034
2015-01-10 10:23:58 +01:00
DjWarmonger
c22c3cdd80
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2015-01-08 07:15:26 +01:00
ArseniyShestakov
af8b030810
Fix skills learning in Universities
...
This one fixes 1945 and 1991
2015-01-07 18:33:09 +03:00
