Nordsoft91
96e820ddac
Merge pull request #2517 from Laserlicht/folders
2023-08-17 10:09:37 +04:00
Michael
71bcc611f5
review
2023-08-15 20:19:13 +02:00
Michael
0452dbd80d
remove copy of cropped asset
2023-08-14 23:08:20 +02:00
Michael
92159e57ef
Update SelectionTab.cpp
...
fix possible -1
2023-08-12 19:51:18 +02: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
Michael
52f00ec308
extra function: getFormattedDateTime
2023-08-12 01:13:03 +02:00
Michael
4d507f3d8a
format fix
2023-08-12 00:00:35 +02:00
Michael
f0b60cf166
suggestions; use internally uppercase; fix; fullname
2023-08-11 23:56:20 +02:00
Tomasz Zieliński
4741bd546f
Fix regression
2023-08-11 20:13:25 +02:00
Michael
6ca5518ff1
Buxfix
2023-08-11 20:09:41 +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
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
Michael
2d9bb34825
format
2023-08-11 01:49:10 +02:00
Michael
2b093b8850
case handling
2023-08-11 01:46:22 +02:00
Michael
092a0d72a1
whitespace format
2023-08-11 00:19:24 +02:00
Michael
c260ce5814
current folder in first line
2023-08-10 23:52:16 +02:00
Michael
48747eea9d
bigger line for folder
2023-08-10 23:37:19 +02:00
Michael
f24c636d17
code review suggestions
2023-08-10 22:15:32 +02:00
Tomasz Zieliński
84436f7f18
Throw runtime error explicitely
2023-08-10 18:29:49 +02:00
