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

12314 Commits

Author SHA1 Message Date
Ivan Savenko
8ba3f771be
Merge pull request #2529 from IvanSavenko/hero_defeat_fix
Fix potential access to empty std function on hero vs hero combat
2023-08-11 11:37:12 +03:00
Ivan Savenko
78bb7230a4
Merge pull request #2512 from IvanSavenko/obstacles_priority_fix
Fixed rendering priority of battlefield background obstacles
2023-08-11 11:36:44 +03:00
Ivan Savenko
88b23cdce1
Merge pull request #2511 from IvanSavenko/fix_starting_army
Fix starting army
2023-08-11 11:36:30 +03:00
Tomasz Zieliński
0252d0f986 Fix hota offset + 2 possible crashes 2023-08-11 07:45:24 +02:00
DjWarmonger
f5926c4023
Merge pull request #2498 from vcmi/fix_roads_in_rock
Fix placing road inside underground rock
2023-08-11 07:22:36 +02:00
Tomasz Zieliński
84436f7f18 Throw runtime error explicitely 2023-08-10 18:29:49 +02:00
Ivan Savenko
e9fb0c9b8c Make object fade-out / fade-in instant on instant movement speed 2023-08-10 13:02:34 +03:00
Tomasz Zieliński
f483f7bb53 Fix crash at battle end 2023-08-10 11:52:31 +02:00
Ivan Savenko
1f9ee6aa38
Merge pull request #2524 from Nordsoft91/reward_canrefuse
[1.3.1] Reward can refuse fix
2023-08-09 20:06:26 +03:00
Ivan Savenko
dc2135da7f Fix potential access to empty std function on hero vs hero combat 2023-08-09 00:46:55 +03:00
Ivan Savenko
45215f12f3 Merged master into beta 2023-08-08 20:43:47 +03:00
Andrii Danylchenko
ba9998ac66 BattleAI: fast targets optimization 2023-08-08 20:10:29 +03:00
Andrii Danylchenko
e7394ad20c BattleAI: log time to make a decission 2023-08-08 18:54:49 +03:00
nordsoft
be6f6da397 Fix for canRefuse flag in rewardable building 2023-08-08 19:27:00 +04:00
Ivan Savenko
858f8b7c7c
Merge pull request #2505 from IvanSavenko/hotfix_3
Hotfix 3
2023-08-08 15:26:00 +03:00
Ivan Savenko
2e7e8bb52b Better error message on missing object constructor 2023-08-08 12:50:39 +03:00
Ivan Savenko
d947c14495 Few more H3 data validation checks 2023-08-08 12:50:16 +03:00
Ivan Savenko
ed066cb7ba Fixed possible multithreading races in sound/music callbacks 2023-08-08 00:27:03 +03:00
Ivan Savenko
62a5eeebbc Fixed rendering priority of battlefield background obstacles 2023-08-07 21:18:43 +03:00
Ivan Savenko
e57f8742cd Rename ambiguos 'clear' to 'clearSlots'
A lot of map objects inherit from CCreatureSet and as result - get
clean() method that resets object army
2023-08-07 19:13:02 +03:00
Ivan Savenko
f0ede46186 Clear spell list, not hero army 2023-08-07 19:12:04 +03:00
Andrii Danylchenko
1eb58bcc32 NKAI: fix potential concurrency and town treat calculation 2023-08-07 17:29:27 +03:00
Andrii Danylchenko
04fe78d31c NKAI: fix freeze on army gathering 2023-08-07 17:29:17 +03:00
Ivan Savenko
d7cbe4ecde Attempt to fix data raced in battle on server 2023-08-07 17:28:21 +03:00
Ivan Savenko
b167aeafd8 Build ID bump for Android 2023-08-07 17:03:19 +03:00
Ivan Savenko
b5fc0f19f2 Proper fix for Android launcher nullptr dereference 2023-08-07 16:53:51 +03:00
Ivan Savenko
3f6cbc6312
Merge pull request #2484 from vcmi/nkai-fix-freeze
NKAI: fix freeze on army gathering
2023-08-07 16:52:59 +03:00
Ivan Savenko
8f4b9ee61b
Merge pull request #2490 from vcmi/fix-potential-concurrency
NKAI: fix potential concurrency and town treat calculation
2023-08-07 16:52:46 +03:00
Tomasz Zieliński
c089e55893 Fix placing road inside underground rock 2023-08-06 21:14:16 +02:00
Ivan Savenko
9bd27c50a0 Allowed loading saves from inside mods 2023-08-06 19:39:55 +03:00
Ivan Savenko
1826e990d1
Merge pull request #2494 from IvanSavenko/hotfix_2
Hotfix 2
2023-08-06 18:47:32 +03:00
Ivan Savenko
0b99fc0ccb Show message box when H3 data is missing 2023-08-06 18:16:32 +03:00
Ivan Savenko
6ddac8376d Fixed possible crash on attempt to load missing font(?) 2023-08-06 17:47:12 +03:00
Ivan Savenko
c524caee5c Fixed possible uncaught exception on starting map 2023-08-06 17:46:49 +03:00
Ivan Savenko
9e4a42b25d Android build ID bump 2023-08-06 14:33:20 +03:00
Ivan Savenko
0c9e2d6fdd Workaround for crash on map rendering 2023-08-06 14:11:31 +03:00
Ivan Savenko
48f130cd76 Fix crash on haptic feedback on Android 2023-08-06 14:11:14 +03:00
Ivan Savenko
702f57d5cc Avoid another crash in Android launcher 2023-08-06 13:43:08 +03:00
Ivan Savenko
5faaf175f9 Added debug information to SDL-related crashes 2023-08-06 13:31:10 +03:00
Ivan Savenko
8b0f9c86f8 Fixed possible crash on invalid town building name 2023-08-06 13:30:20 +03:00
Ivan Savenko
a4ff408c9d Removed unused code 2023-08-06 13:29:57 +03:00
Ivan Savenko
0dca5c45bd Workaround for potential crash on opening town dwelling with no valid
creatures
2023-08-06 12:46:29 +03:00
Ivan Savenko
a81f18765c Another workaround for another crash on Android launcher 2023-08-06 12:45:20 +03:00
Andrii Danylchenko
60f0a4553a NKAI: fix freeze on army gathering 2023-08-06 09:03:29 +03:00
Andrii Danylchenko
a4297ebdf6 NKAI: fix potential concurrency and town treat calculation 2023-08-06 08:57:14 +03:00
Ivan Savenko
b9e804954d
Merge pull request #2462 from IvanSavenko/fix_assertion_failure
(1.3.1) Fix assertion failure on screen resize
2023-08-05 23:50:27 +03:00
Ivan Savenko
c3d8607c8b
Merge pull request #2466 from IvanSavenko/battle_assertions_fix
(1.3.1) Fix assertion failures in battle
2023-08-05 23:50:18 +03:00
Ivan Savenko
c437a1123e
Merge pull request #2470 from IvanSavenko/version_bump_131
Version bump to 1.3.1
2023-08-05 23:49:58 +03:00
Ivan Savenko
d459b3b52d Updated changelog 2023-08-05 23:49:15 +03:00
Ivan Savenko
4fdc022cdf Version bump to 1.3.1 2023-08-05 23:45:28 +03:00