games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity
4,721 Commits 19 Branches 62 Tags 112 MiB
e4f591ba84
Commit Graph

4721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexVinS
a6c8dcbc36 Cleanup 2015-02-14 16:00:56 +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
746914d219 Added missionType check to CQuest::getRolloverText 
This function shouldn't be called if quest type is MISSION_NONE as this type used for quest that don't have text yet.
For example Keymaster`s border guards in H3 didn't add any entries to Quest Log so there is no text for them or at least it's not defined how to use it in VCMI.
 2015-02-14 00:57:33 +03:00
ArseniyShestakov
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
ArseniyShestakov
dae03fdf92 Blick Quest Log button if map have no quests 2015-02-14 00:52:00 +03:00
ArseniyShestakov
7dc0fbcca7 Improved Quest Log window graphics 
Source can be found in vcmi-assets repository
 2015-02-14 00:47:22 +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
aaec94ea87 Changed fading to be enabled by default (when entries are not present in config); 2015-02-09 20:41:03 +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
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
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
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