1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Commit Graph

2258 Commits

Author SHA1 Message Date
536015f1c2 Quest Log: move slider to start when blocked
Partially fixes problem mentioned in issue 2093
2015-02-18 00:07:03 +03:00
200bcd7da6 Merge pull request #88 from ArseniyShestakov/improvedQuestLog
Awesome, thanks!
2015-02-17 06:44:38 +01:00
c0b78de6b4 Quest Log: block hide complete button when it useless
We only want to to be checkable when there is actually any complete quests in list.
2015-02-17 06:08:35 +03:00
ae20499854 Quest Log: implement option to hide complete quests 2015-02-17 05:47:49 +03:00
Fay
116e1d62a1 Makes player interface recreate advmap instead of reusing existing instance; 2015-02-16 21:45:16 +01:00
007f95fa44 Fix valgrind warning about uninitialised value 2015-02-16 13:28:10 +03:00
c865055803 Hero Exchange: fix quest log button 2015-02-16 01:33:05 +03:00
df2894b798 Quest Log: implement support Seer names 2015-02-16 00:44:48 +03:00
37a5930f84 CSoundHandler: fix memory leak and implement cache
This one fix issue 2091 and add caching that actually works.
2015-02-15 22:51:33 +03:00
c46999bcb8 Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect 2015-02-15 04:53:01 +03:00
b71d985d49 cleanup 2015-02-15 01:46:47 +03:00
aa5e9fc959 get rid of global debug macros. 2015-02-14 22:43:16 +03:00
9665c50f3f Quest Log: clanup code that is not needed anymore
As far as I understand once object capturing used it's no longer needed to manually call Show.
Currently CIntObject::show and CIntObject::showAll automatically call it for all children.
2015-02-14 21:35:11 +03:00
8beed60815 Quest Log: cleanup minimap code
Usage of shared_ptr suggested by @alexwins
2015-02-14 21:31:56 +03:00
5a5c126f0e Quest Log: fix background resource name
Currently it's not PCX, but PNG
2015-02-14 20:39:53 +03:00
a5ebcd0f60 fix #2080. No more articaft exchange between heroes in kingdom overview. 2015-02-14 20:24:18 +03:00
420e5f055c Fix warnings 2015-02-14 19:24:21 +03:00
0b546a9b9f Correct placement for hero misc artifacts in kingdom overview 2015-02-14 18:59:33 +03:00
c135591f81 Add comments about getArtPlace - it is a bit dangerouse 2015-02-14 16:00:57 +03:00
7086fdc730 Crash fixed, but bug still present 2015-02-14 16:00:56 +03:00
a6c8dcbc36 Cleanup 2015-02-14 16:00:56 +03:00
d06bba422a Quest Log: display components under quest description
This commit add CComponentBox under text. If quest have components description height will be changed to avoid conflicts.
Though it's would be much better if VCMI had something like QScrollArea in Qt so both text and components was using shared slider.
2015-02-14 04:21:31 +03:00
c978bc862d Quest Log: fix position of selection box on labels 2015-02-14 03:47:31 +03:00
c046f8ddc6 Quest Log: update code for new graphics and fix bugs
This one should fix issues 1988 and 2022
2015-02-14 03:38:28 +03:00
8648081f0a Quest Log: change minimap level when quest selected
There also no need in own setLevel as one from CMinimap works fine.
2015-02-14 02:13:17 +03:00
fd99f0b9f3 Quest Log: decrease number of displayed quests
New graphics only have 6 slots
2015-02-14 01:34:53 +03:00
0704e38697 Fix Quest Log button in hero window 2015-02-14 01:10:32 +03:00
ded4c18df9 CComponent: add option to choose image size
This option is used to choose small resource icons in Quest Log when there more than 4 of them.
2015-02-14 00:53:24 +03:00
dae03fdf92 Blick Quest Log button if map have no quests 2015-02-14 00:52:00 +03:00
Fay
f30cb0fa5b Fixes crash when loading game (if path was visible previously); 2015-02-13 11:20:13 +01:00
Fay
1c6a7a923d Fixes color-keying after scaling bitmaps for world view display; 2015-02-09 20:16:42 +01:00
71bcacaa60 Partial fix for #2053 2015-02-09 16:23:29 +01:00
Fay
cbd3a19987 Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading
Conflicts:
	client/CPlayerInterface.cpp
2015-02-09 16:09:27 +01:00
Fay
cbb75d1c7a Support for fading heroes/boats (+flags);
Disabled map movement requests during fade;
2015-02-09 16:03:24 +01:00
Fay
485a8b5c9a Fixed updating camera position after teleportation (gate/teleport/spells); 2015-02-06 19:11:04 +01:00
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
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
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
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
ba51de8b5f Merge remote-tracking branch 'remotes/Fayth/mantis-2011' into develop 2015-01-28 09:41:09 +03:00