games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
5,042 Commits 19 Branches 62 Tags 110 MiB
904a66764c
Commit Graph

5042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ArseniyShestakov
43f1e37546 Quest Log: fix text for quests with minimal level requirement 
This is needed because m13478val is ui32 while translation expect %s string.
 2015-02-16 00:53:44 +03:00
ArseniyShestakov
df2894b798 Quest Log: implement support Seer names 2015-02-16 00:44:48 +03:00
DjWarmonger
aef22002ad Merge pull request #89 from ArseniyShestakov/improveSoundHandler 
Nobody touched sounds in years. Code looks good and if it fixes the error, there is no reason not to pull it.
 2015-02-15 22:37:54 +01:00
ArseniyShestakov
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
ArseniyShestakov
789da96a81 Stables: give 400 movement points bonus instead of 600 
Tested it and now VCMI work exactly as original game.
This one fix issues 2077 / 2082
 2015-02-15 07:55:59 +03:00
AlexVinS
c46999bcb8 Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect 2015-02-15 04:53:01 +03:00
AlexVinS
b71d985d49 cleanup 2015-02-15 01:46:47 +03:00
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
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
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
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
ArseniyShestakov
7c5af02b78 Fix saving of player's quests 
This commit break saves compatibility
 2015-02-12 13:19:22 +03: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