games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
5,579 Commits 30 Branches 75 Tags
e18b21b78ed6df99304339b990a7fd9dd3ac2097
Commit Graph
50 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vadim Markovtsev e18b21b78e Fix 2264 learning stone & Learning skill 2016-01-31 10:12:01 +03:00
Vadim Markovtsev eb4331baf6 Fix 1916 water wheel reward 2016-01-30 19:11:22 +03:00
Vadim Markovtsev 918fbd8530 Refactor hero's mana regain 2016-01-30 13:51:07 +03:00
Vadim Markovtsev 22fc4fd3e9 Fix 2406 reset potentially available heroes 2016-01-30 10:02:33 +03:00
Vadim Markovtsev 30d64e3e3c Fix 2405 quest timeout mechanics 2016-01-29 09:28:37 +03:00
Vadim Markovtsev 32ece9513d Fix 2331 save menu keyboard event leak 
The control flows the following way:
- we receive SDL_KEYDOWN with letter 's' in the adventure map interface
- save dialog opens
- text input receives focus
- text input enables receiving SDL_KeyboardEvent-s which go between DOWN and UP
- the button on keyboard becomes UP (the menu opens very fast)
- text input receives SDL_KeyboardEvent and inserts 's'
- text input receives SDL_KEYUP

So the apparent fix is to open the save dialog on SDL_KEYUP event
 2016-01-28 10:26:40 +03:00
Vadim Markovtsev 0ac833cca4 Fix 2377 "Seer Empty Text" 2016-01-27 19:52:45 +03:00
Vadim Markovtsev 9f3313524e Fix 2160 dismissing a VIP hero 2016-01-27 17:10:19 +03:00
Vadim Markovtsev 36eaa399e7 Add hardcodedFeature to switch winner's retreating with no troops 2016-01-27 16:42:17 +03:00
Vadim Markovtsev f6679bba50 Fix CGHeroInstance::isInitialized implementation 2016-01-27 09:44:23 +03:00
Vadim Markovtsev 7772b6de74 Fix 981 reset hero on hiring after retreat/surrender 2016-01-26 22:48:31 +03:00
Vadim Markovtsev 40cb48d65e Replace std::remove_if with vstd::erase_if 2016-01-26 10:19:58 +03:00
Vadim Markovtsev 6849ff846c Fix memory corruption with a draw; race in setBattleResult() 2016-01-25 15:55:32 +03:00
Vadim Markovtsev 22eb71de03 Remove this-> occurrences in new code 2016-01-25 14:14:32 +03:00
Vadim Markovtsev a74fbff34f Fix 2076 Grail removal 2016-01-25 12:38:11 +03:00
Vadim Markovtsev afa95312ba Fix 2139 captured spell scroll descriptions 2016-01-25 08:49:26 +03:00
Vadim Markovtsev 7185890723 Fix double free in battleAfterLevelUp() in case of a draw 2016-01-24 01:31:39 +03:00
Vadim Markovtsev 2a6a8cd433 Fix segfault when non-hero forces win 2016-01-23 19:42:56 +03:00
Vadim Markovtsev 9ffd0155e6 Fix 1810 suggest artifact assembly 2016-01-23 16:24:43 +03:00
Vadim Markovtsev a266154b26 Fix 2014 cursor must disappear during movement and Magi's Eye 2016-01-23 00:35:41 +03:00
Vadim Markovtsev f2376485e3 Fix 1799 not updated hero info box on artifact pickup 2016-01-22 23:30:24 +03:00
Vadim Markovtsev 99992599db Partially fix 1416 tavern hero rotation 2016-01-22 22:37:46 +03:00
Vadim Markovtsev 9dfef2186d Fix 1569 winning hero with no troops shall retreat 2016-01-22 22:29:53 +03:00
Vadim Markovtsev 11bce2908d Fix 1723 quest crash on combined arts 2016-01-22 12:56:25 +03:00
Vadim Markovtsev b1f3480c68 Fix 1821 artifact assembly statusbar text 2016-01-21 10:50:53 +03:00
Vadim Markovtsev 419bde8997 Fix 2358 swapped garrison <-> visiting status text 2016-01-21 09:59:39 +03:00
Vadim Markovtsev e8db456beb Reset obelisks upon game end 
Otherwise, the static variables are preserved and lead to wrong values in next new game.
 2016-01-20 13:02:52 +03:00
Vadim Markovtsev 1a2cd36df8 Initialize obelisks count to 0 
Otherwise every time player starts with a random number.
 2016-01-20 12:43:07 +03:00
Vadim Markovtsev bb3a31f3ff Mark obelisk visited for all players in the team 2016-01-20 11:14:03 +03:00
Vadim Markovtsev 10f888a483 Fix obelisks puzzle revealing 
Teams and players were messed up in lib; hardcoded constants were refactored.
 2016-01-20 10:44:13 +03:00
Vadim Markovtsev 6eefce23fe Check against nullptr in VisitHero::fulfillsMe() 2016-01-19 21:15:07 +03:00
Vadim Markovtsev 2bfc8ec8cb Fix AI hero infinite move on the same tile 2016-01-19 13:14:05 +03:00
Vadim Markovtsev 74111b7689 Return missing building name instead of crashing in CComponent::getSubtitleInternal 2016-01-19 10:35:10 +03:00
Vadim Markovtsev 92e011429f Fix crash on unknown map objects 
If getHandlerFor() fails to find the handler, it returns a nullptr
shared pointer, which is later dereferenced unconditionally.

How to reproduce:
Download map "Happy time Dragons!!!" from http://heroesportal.net/maps.php?type=H3AB-XL&sort=r

=>

Failed to find object of type 5:144
SIGSEGV
 2016-01-18 21:16:55 +03:00
Vadim Markovtsev 7c7bb39904 Enable right mouse button click emulation on MacOSX 2016-01-18 16:07:17 +03:00
Vadim Markovtsev 4a05402c2f Revert 5cd4e852d4 "Use portable cast in CTeleportDialogQuery also" 
Actually, this leads to crash on MacOSX, I specially left that intact.
 2016-01-18 10:45:09 +03:00
Vadim Markovtsev 0661aa0e6e Remove undefined behavior in requestActionASAP 2015-12-13 11:04:42 +03:00
Vadim Markovtsev 5c623868bf Fix invalid dynamic_cast replacement 2015-10-31 23:01:22 +03:00
Vadim Markovtsev e6e975e9ef Fix adventure map movement segfault in some scenarios 2015-10-31 20:23:13 +03:00
Vadim Markovtsev fa8a282696 Fix pthread_mutex_lock abort() in requestActionASAP impl 2015-10-31 18:04:06 +03:00
Vadim Markovtsev 68cc860133 Fix dynamic_cast on MacOSX in CQuery.cpp 2015-10-31 15:05:52 +03:00
Vadim Markovtsev c5ebec0d1f Fix the second crash (dynamic_cast failure) 2015-10-27 09:09:42 +03:00
Vadim Markovtsev 79fb5b0c7b Fix typeid ordering bug on MacOSX 2015-10-25 13:08:59 +03:00
Vadim Markovtsev 0e14abd609 Fix vcmiclient CMakeLists.txt 
In my case, Frameworks was pointed to root/../Frameworks, which is wrong;
WoG mod is not checked out by default, so we should give a hint from where to download it;
besides, WoG is optional to run vcmi.
 2015-10-17 09:23:40 +03:00
Vadim Markovtsev 337276604d Fix detection of VCMI_APPLE 2015-10-17 09:23:29 +03:00
Vadim Markovtsev 74e9f23e36 Fix build with recent Boost 
It has static_assert complaining on missing include
 2015-10-17 09:23:28 +03:00
Vadim Markovtsev c54dc4c847 Fix portability issues on MacOSX 
Removed trailing whitespaces. there is no readlink -f on MacOSX,
so we have to get the absolute path the other way.
 2015-10-17 09:23:28 +03:00
Vadim Markovtsev b701835de0 Fix wrong comparison 2015-10-13 21:05:46 +03:00
Vadim Markovtsev d24fd10e21 Fix std::abs warning 
Recent clang wants std::abs instead of plain abs
 2015-10-13 21:05:46 +03:00
Vadim Markovtsev e4b1ef1405 Add "override" to virtual overriden methods 2015-10-13 21:05:36 +03:00