Mike
|
90397a9604
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2023-07-11 19:06:21 -07:00 |
|
Ivan Savenko
|
b74d608709
|
Merge pull request #2320 from IvanSavenko/debug_build_fix
Fix building in debug mode
|
2023-07-11 18:45:54 +03:00 |
|
Ivan Savenko
|
8576591f6f
|
Add preset that builds in debug mode
|
2023-07-11 16:12:07 +03:00 |
|
Ivan Savenko
|
37f3560b9c
|
Fix build in debug mode
|
2023-07-11 15:21:31 +03:00 |
|
Ivan Savenko
|
9acab48bc3
|
Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework
CArtifact CArtifactInstance refactoring
|
2023-07-11 14:36:08 +03:00 |
|
Ivan Savenko
|
695cae30de
|
Merge pull request #2300 from dydzio0614/update-translations-2
Launcher & map editor polish translations
|
2023-07-11 14:35:55 +03:00 |
|
Ivan Savenko
|
cc089c1717
|
Merge pull request #2303 from Fabrice-TIERCELIN/missing_validation_translations
Missing validation translations
|
2023-07-11 14:35:34 +03:00 |
|
Ivan Savenko
|
78415c573b
|
Merge pull request #2289 from IvanSavenko/resolution_fixes
Fix issues with changing game resolution
|
2023-07-11 14:35:07 +03:00 |
|
DjWarmonger
|
f6cc61e0be
|
Merge pull request #2297 from vcmi/rmg_roads
Rmg roads
|
2023-07-11 09:25:24 +02:00 |
|
Andrii Danylchenko
|
b1ef0f6301
|
#1912 Some logging and fix for allied garrison
|
2023-07-09 10:21:58 +03:00 |
|
Mike
|
b327f890f2
|
Partially fixed initial loading of save file
Brought back the missing save file info in the info card. Still need to fix the input text box and selection highlight.
|
2023-07-08 23:00:48 -07:00 |
|
Fabrice Tiercelin
|
2c7ee12c7f
|
Missing validation translations
|
2023-07-08 20:01:44 +02:00 |
|
Dydzio
|
871f59b12f
|
Launcher & map editor translations
|
2023-07-08 16:15:24 +02:00 |
|
Ivan Savenko
|
0c9e23edfa
|
Merge pull request #2295 from dydzio0614/update-translations
Update polish translation
|
2023-07-08 14:48:30 +03:00 |
|
Ivan Savenko
|
ff46882cc6
|
Merge pull request #2298 from heroesiiifan/patch-3
Update german
|
2023-07-08 13:34:25 +03:00 |
|
Tomasz Zieliński
|
b4fcf20b19
|
Fix
|
2023-07-08 10:26:10 +02:00 |
|
Tomasz Zieliński
|
fabad20aa1
|
Compile fixes, cleanup
|
2023-07-08 10:21:36 +02:00 |
|
Tomasz Zieliński
|
3711ce846e
|
Check road settings for connections
|
2023-07-08 09:11:20 +02:00 |
|
Tomasz Zieliński
|
730b36612c
|
Respect GUI settings for roads. By default, all road types are enabled.
|
2023-07-08 08:44:10 +02:00 |
|
heroesiiifan
|
108e768ae2
|
fix language syntax error
|
2023-07-07 22:59:40 +00:00 |
|
heroesiiifan
|
ab8da5bcae
|
Update german.json
|
2023-07-07 22:56:11 +00:00 |
|
heroesiiifan
|
b00953fd46
|
Update german.ts
|
2023-07-07 22:53:43 +00:00 |
|
heroesiiifan
|
54775462d4
|
Update german.json
|
2023-07-07 22:38:50 +00:00 |
|
heroesiiifan
|
6af81bfe89
|
Update german.json
|
2023-07-07 22:37:08 +00:00 |
|
Tomasz Zieliński
|
27c4882237
|
Compile fix
|
2023-07-07 21:40:55 +02:00 |
|
Tomasz Zieliński
|
7e07ed65c8
|
- Check road connection for Shipyards
|
2023-07-07 21:27:24 +02:00 |
|
Tomasz Zieliński
|
1cad64c470
|
Move road flag to placeObject() method
|
2023-07-07 20:17:20 +02:00 |
|
Tomasz Zieliński
|
3889193a48
|
Reorganize namespaces
|
2023-07-07 16:32:17 +02:00 |
|
Ivan Savenko
|
2a634b2ec0
|
Fixed UI updates on switching to/from fullscreen
|
2023-07-07 15:26:42 +03:00 |
|
Ivan Savenko
|
7e00a702c1
|
Fix switching to exclusive fullscreen to borderless windowed
|
2023-07-07 14:29:03 +03:00 |
|
Ivan Savenko
|
0c83e34093
|
Implemented reserved area for iOS notch / cutout
|
2023-07-07 14:29:03 +03:00 |
|
Ivan Savenko
|
5143ca266d
|
Moved SDL renderer access to ScreenHandler class
|
2023-07-07 14:29:03 +03:00 |
|
Ivan Savenko
|
fa4a0004b2
|
Merge pull request #2291 from IvanSavenko/terrain_animations_config
Moved hardcoded terrain palette-cycling animations to config
|
2023-07-07 14:28:39 +03:00 |
|
Ivan Savenko
|
ae8579558d
|
Merge pull request #2282 from IvanSavenko/adventure_map_fixes
Adventure map fixes for 1.3
|
2023-07-07 14:27:58 +03:00 |
|
Ivan Savenko
|
aeb8fac83b
|
Merge pull request #2290 from Fabrice-TIERCELIN/french_in_game_captions
French in-game captions
|
2023-07-07 12:24:48 +03:00 |
|
Tomasz Zieliński
|
8463fe200c
|
Merge remote-tracking branch 'origin/develop' into rmg_roads
|
2023-07-07 08:19:52 +02:00 |
|
Fabrice Tiercelin
|
8b96f8bab4
|
French in-game captions
|
2023-07-07 07:36:44 +02:00 |
|
Ivan Savenko
|
a9d25b0109
|
Fix map grid visibility on game load
|
2023-07-07 01:27:57 +03:00 |
|
Ivan Savenko
|
41755c9d87
|
Fix slider scroll via UI buttons
|
2023-07-07 01:23:17 +03:00 |
|
DjWarmonger
|
f9e1a70ab8
|
Merge pull request #2278 from vcmi/rmg_factions
Rmg factions
|
2023-07-06 22:15:36 +02:00 |
|
Tomasz Zieliński
|
0d3ac4a502
|
- Add new option for connection
- Store info about objects and roads in RequiredObjectInfo
|
2023-07-06 22:15:00 +02:00 |
|
Dydzio
|
c055a6aaa4
|
Update polish translation
|
2023-07-06 20:52:15 +02:00 |
|
Tomasz Zieliński
|
fcf7a29f45
|
Update schemat for RMG template
|
2023-07-06 17:39:09 +02:00 |
|
Tomasz Zieliński
|
a592f5604b
|
Add "bannedTerrains", "bannedMonsters" options for templates.
|
2023-07-06 17:30:23 +02:00 |
|
Ivan Savenko
|
16cd01271e
|
Merge pull request #2293 from mikeiit/bug-fix-resource-cost
Changed resource cost value label position
|
2023-07-06 13:08:27 +03:00 |
|
Mike
|
6414e3b3fc
|
Changed resource cost value label position
|
2023-07-05 18:43:52 -07:00 |
|
Tomasz Zieliński
|
06449ce7b0
|
Another compile fix
|
2023-07-05 21:18:30 +02:00 |
|
Tomasz Zieliński
|
506a0cdda0
|
- Better name as suggested in PR
- Compile fix
|
2023-07-05 21:08:32 +02:00 |
|
Ivan Savenko
|
3bce245780
|
Moved hardcoded terrain palette-cycling animations to config
|
2023-07-05 22:07:20 +03:00 |
|
Tomasz Zieliński
|
9f2bfbc1d8
|
Improve serialization of IDs from mods, so they are resolved correctly after all mods are loaded.
|
2023-07-05 20:53:00 +02:00 |
|