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

12279 Commits

Author SHA1 Message Date
nordsoft
314a17cdd9 Paint timer color into player color 2023-08-19 19:45:25 +04:00
nordsoft
d4ab3087cb Disable timer for AI players 2023-08-19 19:00:08 +04:00
nordsoft
2fff74deea Remove uninitialized variable 2023-08-19 18:59:31 +04:00
nordsoft
647c7c15a3 Add sound notification for timer 2023-08-17 01:10:03 +04:00
nordsoft
d26fdaefe4 Battle timer 2023-08-14 23:31:44 +04:00
nordsoft
0c76ae89f8 Revert "Auxiliary commit to revert individual files from e426924930c761b5f10e4fd8e777b55f8db329e2"
This reverts commit c1d6b2836fca30f99d49012c5ae989cdc5ad0e4f.
2023-08-14 16:33:41 +04:00
nordsoft
e426924930 Close window at time expiring 2023-08-14 15:37:21 +04:00
nordsoft
23aaa72dfe No error on hero move when timer is expired 2023-08-14 05:21:57 +04:00
nordsoft
2ce50915e1 Fix ios compilation 2023-08-14 05:03:50 +04:00
nordsoft
a8e5b32b6a Fix compiling 2023-08-14 04:55:45 +04:00
nordsoft
380ee41fba Fix finishing turn while flying over object 2023-08-14 04:33:41 +04:00
nordsoft
0c38187916 Fix freezes while turn ends at hero move 2023-08-14 04:06:26 +04:00
nordsoft
e414af221b Move turn timer logic from GameHandler class 2023-08-14 03:20:27 +04:00
nordsoft
3c9c302fd2 TurnTimerInfo 2023-08-14 02:16:25 +04:00
nordsoft
f01973a4f0 Configurable turn timer 2023-08-14 01:13:37 +04:00
nordsoft
093e226bff Fix compilation 2023-08-13 23:50:40 +04:00
nordsoft
4b1224ec8c Implement turn timer feature 2023-08-13 14:07:48 +04:00
Ivan Savenko
f13a53c1d9 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-12 17:28:47 +03:00
Ivan Savenko
92ce97bbc7 Merge remote-tracking branch 'vcmi/master' into beta 2023-08-12 16:20:06 +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
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
Ivan Savenko
c0e51fc13e Update translations 2023-08-11 15:08:22 +03:00
Ivan Savenko
1b531c67f5 Added option to configure reserved screen area on mobile platforms 2023-08-11 15:06:02 +03:00
SoundSSGood
213eda5e1e altar sacrifice all fix 2023-08-11 14:19:06 +03:00
Tomasz Zieliński
83d97626fe Merge remote-tracking branch 'origin/beta' into fix_rmg_object_pos 2023-08-11 10:58:26 +02:00
Ivan Savenko
b2de5d32d1
Merge pull request #2546 from vcmi/fix_crash_after_battle
Fix crash at battle end
2023-08-11 11:37:30 +03:00
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