games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Code Issues Releases Activity
4,865 Commits 19 Branches 61 Tags 109 MiB
27c46c83d6
Commit Graph

4865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger
c5e772eb78 Fixed issue which created large empty areas on two-level maps. 2015-02-25 19:34:02 +01:00
DjWarmonger
ef4e199f15 Implemented "Quantity does not grow" for monsters (#2094) 2015-02-22 20:54:09 +01:00
DjWarmonger
8d1f884d94 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-02-22 20:53:29 +01:00
ArseniyShestakov
ea46be03f3 AI: check if hero killed while visiting object he stayed on 
This is need to avoid crashes like one happen in 2084, but then game bahaviour incorrect.
I'm not exactly sure if this possible currently, but I can imaging this would happen if hero decide to attack bank while staying on it.
 2015-02-22 20:56:50 +03:00
DjWarmonger
a736a863da Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-02-22 18:36:23 +01:00
DjWarmonger
6797c374ed Additional check 2015-02-22 18:36:13 +01:00
ArseniyShestakov
445ded71a7 Movement: now hero will always ignore guards if visiting object that he staying on 
This one is replicating original game behaviour and fixes issue 1990 and related to issue 2084.
Currently this is mainly caused problem with teleporters which lead to crash in AI due to unexcepted hero loss.
 2015-02-22 20:12:49 +03:00
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
9427dacc5d Merge pull request #92 from Fayth/mantis-2104 
Thanks!
 2015-02-21 07:13:51 +01:00
Fay
9034a9d873 Fixed crashes due to invalid ptrs during advmap objects fadeout; 2015-02-20 23:19:16 +01:00
Ivan Savenko
8139eaf961 Merge pull request #71 from Kedrigern/patch-1 
Update F21 dependency
 2015-02-20 22:32:11 +02:00
DjWarmonger
6ac00873b9 Compilation fixes - allow SDL1. 
Please do not define class-specific constants that are static at same time.
 2015-02-18 15:31:55 +01: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
007f95fa44 Fix valgrind warning about uninitialised value 2015-02-16 13:28:10 +03:00
ArseniyShestakov
c865055803 Hero Exchange: fix quest log button 2015-02-16 01:33:05 +03:00
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