1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Commit Graph

96 Commits

Author SHA1 Message Date
ArseniyShestakov
00de870f17 Check input destination position when moving using arrow keys
This one fix crash I reported in 2085
2015-02-22 10:05:24 +03:00
ArseniyShestakov
a6ce45e867 Cursor: show battle cursor for garrison if there creature behind
This one fixed issue 1563
2015-02-22 09:34:02 +03:00
AlexVinS
c4cbda88ac Fix "reorder" warnings 2015-02-21 12:39:10 +03:00
DjWarmonger
2a082e6c21 Merge pull request #84 from Fayth/test/advMapFading
If no one objects, I will try to merge this.
2015-02-18 09:52:09 +01:00
DjWarmonger
5d1fbedf85 Merge pull request #91 from Fayth/fix-advmap-restoring
Short and clear code is always welcome.
2015-02-18 07:59:00 +01:00
ArseniyShestakov
536015f1c2 Quest Log: move slider to start when blocked
Partially fixes problem mentioned in issue 2093
2015-02-18 00:07:03 +03:00
DjWarmonger
200bcd7da6 Merge pull request #88 from ArseniyShestakov/improvedQuestLog
Awesome, thanks!
2015-02-17 06:44:38 +01:00
ArseniyShestakov
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
ArseniyShestakov
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
ArseniyShestakov
c865055803 Hero Exchange: fix quest log button 2015-02-16 01:33:05 +03:00
ArseniyShestakov
df2894b798 Quest Log: implement support Seer names 2015-02-16 00:44:48 +03:00
ArseniyShestakov
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
ArseniyShestakov
8beed60815 Quest Log: cleanup minimap code
Usage of shared_ptr suggested by @alexwins
2015-02-14 21:31:56 +03:00
ArseniyShestakov
5a5c126f0e Quest Log: fix background resource name
Currently it's not PCX, but PNG
2015-02-14 20:39:53 +03:00
AlexVinS
a5ebcd0f60 fix #2080. No more articaft exchange between heroes in kingdom overview. 2015-02-14 20:24:18 +03:00
AlexVinS
0b546a9b9f Correct placement for hero misc artifacts in kingdom overview 2015-02-14 18:59:33 +03:00
ArseniyShestakov
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
ArseniyShestakov
c978bc862d Quest Log: fix position of selection box on labels 2015-02-14 03:47:31 +03:00
ArseniyShestakov
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
ArseniyShestakov
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
ArseniyShestakov
fd99f0b9f3 Quest Log: decrease number of displayed quests
New graphics only have 6 slots
2015-02-14 01:34:53 +03:00
ArseniyShestakov
0704e38697 Fix Quest Log button in hero window 2015-02-14 01:10:32 +03:00
ArseniyShestakov
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
cbb75d1c7a Support for fading heroes/boats (+flags);
Disabled map movement requests during fade;
2015-02-09 16:03:24 +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
Fay
4c636c15e9 Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading 2015-02-01 19:12:03 +01:00
AlexVinS
594295da32 Merge branch 'feature/worldView' into develop 2015-02-01 20:49:14 +03: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
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
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
ArseniyShestakov
af8b030810 Fix skills learning in Universities
This one fixes 1945 and 1991
2015-01-07 18:33:09 +03:00
ArseniyShestakov
3466457d69 Fix crash on opening of Hill Fort window and attempt to upgrade one stack
This one fixes issue 1899
2015-01-07 13:10:48 +03:00
ArseniyShestakov
ceb5da44d1 This fixes crash in battle I introduced in 8a697f2
dismissInfo do not present when createButtonPanel used inside the battle.
2014-12-27 06:29:09 +03:00
DjWarmonger
9962623220 Merge pull request #72 from ArseniyShestakov/fixTradeWindow
Small fixes for CTradeWindow
2014-12-26 09:57:40 +01:00
ArseniyShestakov
6ab807f694 Put artifact in different slot if selected is used
This one fixes issue 2002.
2014-12-26 01:42:50 +03:00