1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Commit Graph

12269 Commits

Author SHA1 Message Date
Dydzio
cab6fb76aa Draft version of backpack button + new setting for original H3 UI mode 2023-08-20 17:45:43 +02:00
Dydzio
f24910e5d2 Artifacts backpack window GUI improvements 2023-08-20 00:52:03 +02:00
Ivan Savenko
5da1a6c412 Merge branch 'android_api_version_bump' into beta 2023-08-18 15:24:59 +03:00
Ivan Savenko
70ddc1f3e5
Merge pull request #2577 from wb180/secondarySkillSerialization
Preserve order of secondary skills during hero json serialization/deserialization
2023-08-18 15:24:02 +03:00
Ivan Savenko
83b00bb7c3
Merge pull request #2610 from vcmi/master
Merge master -> beta
2023-08-18 12:56:05 +03:00
DjWarmonger
f9564dc8e4
Merge pull request #2563 from vcmi/fix_resources_near_mines
Fix resources placed behind mines
2023-08-18 09:12:56 +02:00
Ivan Savenko
daa8a494fc Merge branch 'release_131' into master 2023-08-17 16:19:20 +03:00
Ivan Savenko
ec0a51bd5c Fixed border scrolling when game window is maximized 2023-08-17 12:25:02 +03:00
Ivan Savenko
8b8d2b8810 Updated changelog 2023-08-17 10:26:01 +03:00
Ivan Savenko
6e7b7932a0 Fixed recruitment of hero from towns located on map border 2023-08-17 10:26:01 +03:00
Ivan Savenko
bfa12080ac Added downloads counter for 1.3.1 2023-08-17 10:26:01 +03:00
Ivan Savenko
074fd42d84 Added missing includes 2023-08-17 10:26:01 +03:00
Ivan Savenko
9509974a5d Updated changelog 2023-08-17 10:26:01 +03:00
Ivan Savenko
db81d75f75 Compile against SDK version 33 2023-08-15 18:47:42 +03:00
Ivan Savenko
198556409c
Merge pull request #2593 from IvanSavenko/hotfix
Final crashfixes for 1.3.1
2023-08-15 16:17:50 +03:00
Ivan Savenko
3aead5f32f Android build ID bump 2023-08-15 15:06:33 +03:00
Ivan Savenko
8b628221ec Fix possible thread race on accessing GuiHandler from server handler
thread without acquiring lock
2023-08-15 00:38:03 +03:00
Ivan Savenko
00ac8eb306 Attempt to fix crash on quitApplication on Android 2023-08-15 00:17:59 +03:00
Ivan Savenko
ef0cd0ba6e Fixed mod dependencies check on save loading to prevent crashes:
- mods that don't affect game objects can be ignored when loading save
- gameplay-affecting mods that were present in save must be active
- gameplay-affecting mods that were not in save must not be active
2023-08-14 23:55:04 +03:00
Andrii Danylchenko
6c025fd768
Merge pull request #2572 from vcmi/nkai-fix-heroes-not-recruiting
Nkai fix heroes not recruiting
2023-08-14 21:40:53 +03:00
Evgeniy Meshcheryakov
2a83f06905 Preserve order of secondary skills during hero serialization/deserialization 2023-08-14 00:06:22 +03:00
Andrii Danylchenko
a7859dae39 Battle AI: archangels cast again 2023-08-13 09:08:30 +03:00
Andrii Danylchenko
1eabb738dc NKAI: fix heroes not recruited 2023-08-13 09:08:30 +03:00
Ivan Savenko
abf7c48593
Merge pull request #2566 from IvanSavenko/fix_lobby_thread_race
Fix crash on video playback (and who knows how many more)
2023-08-13 00:45:24 +03:00
Ivan Savenko
92ce97bbc7 Merge remote-tracking branch 'vcmi/master' into beta 2023-08-12 16:20:06 +03:00
Ivan Savenko
626664b8f6 Fix possible thread race on accessing GuiHandler from server handler
thread without acquiring lock
2023-08-12 14:16:47 +03:00
Ivan Savenko
5dc735494c
Merge pull request #2554 from IvanSavenko/crashfixes
Fixes for crashes from Android crash reporter
2023-08-12 11:55:50 +03:00
Tomasz Zieliński
abacb5f0ea Fix resources placed behind mines 2023-08-12 10:53:25 +02:00
Ivan Savenko
8cbc52364a
Merge pull request #2496 from IvanSavenko/saves_in_mods
Allowed loading saves from inside mods
2023-08-12 11:27:15 +03:00
Ivan Savenko
aef8ef1d55
Merge pull request #2559 from IvanSavenko/campaign_bonus_fix
Preserve chosen campaign bonus on scenario restart request
2023-08-12 11:24:30 +03:00
Ivan Savenko
ccf31d19f8
Merge pull request #2558 from IvanSavenko/localization_fix
Do not ignore translations for maps & campaigns
2023-08-12 11:24:19 +03:00
Ivan Savenko
f5bb8f5d52
Merge pull request #2557 from IvanSavenko/configure_reserved_width
Configure reserved width on mobile platforms
2023-08-12 11:23:53 +03:00
Ivan Savenko
e386309fbc
Merge pull request #2547 from IvanSavenko/instant_fadeout
Make object fade-out / fade-in instant on instant movement speed
2023-08-12 11:23:26 +03:00
DjWarmonger
654489d5d3
Merge pull request #2525 from vcmi/battle-fast-targets
Battle fast targets
2023-08-12 09:22:25 +02:00
DjWarmonger
917f846a3a
Merge pull request #2562 from vcmi/fix_artifact_replacement
Fix regression with replacing quest artifact
2023-08-12 09:14:21 +02:00
DjWarmonger
4d4eaed808
Merge pull request #2555 from vcmi/fix_rmg_object_pos
Fix hota offset + 2 possible crashes
2023-08-12 09:14:02 +02:00
Tomasz Zieliński
4741bd546f Fix regression 2023-08-11 20:13:25 +02:00
Tomasz Zieliński
8f450cf253 Fix for monsters spawning at left side of the map 2023-08-11 18:43:22 +02:00
Ivan Savenko
4ebb490740 Android build version bump for hotfix 2023-08-11 18:54:24 +03:00
Ivan Savenko
20e10cd5ab Fix potential access to empty std function on hero vs hero combat 2023-08-11 18:52:22 +03:00
SoundSSGood
119d51d1ef altar sacrifice all fix 2023-08-11 18:51:59 +03:00
Ivan Savenko
4b307dc0e4 More locks to avoid data races on server 2023-08-11 18:50:39 +03:00
Ivan Savenko
ad2bd897d0 Replace boost::format with MetaString
Looks like some of H3 localizations don't have string replacements for
building / war machine name, resulting in exceptions on formatting
attempt. MetaString handles this case silently.
2023-08-11 18:50:39 +03:00
Ivan Savenko
9d7f46f985 Fix crash on right-clicking player flags in RMG UI 2023-08-11 18:50:39 +03:00
Ivan Savenko
631e93e846 Fix missing lock of player interface 2023-08-11 18:50:39 +03:00
Ivan Savenko
942f8bbf05 Fix possible access to non-existing building 2023-08-11 18:50:39 +03:00
Ivan Savenko
67b7c39761 Fix possible nullptr dereference 2023-08-11 18:50:39 +03:00
Ivan Savenko
b002c015cf
Merge pull request #2556 from SoundSSGood/altar-fix
altar "sacrifice all" fix
2023-08-11 17:06:17 +03:00
Ivan Savenko
775e5948ec Preserve chosen campaign bonus on scenario restart request 2023-08-11 16:55:20 +03:00
Ivan Savenko
474045194a Do not ignore translations for maps & campaigns 2023-08-11 16:12:02 +03:00