1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-18 03:21:27 +02:00
Commit Graph

11759 Commits

Author SHA1 Message Date
Tomasz Zieliński
8463fe200c Merge remote-tracking branch 'origin/develop' into rmg_roads 2023-07-07 08:19:52 +02: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
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
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
Ivan Savenko
e5f14204b6
Merge pull request #2288 from NikolayIT/patch-1
Small fix in characters encodings in Languages.h
2023-07-05 14:21:10 +03:00
Nikolay Kostov
fa3568dca1
Small fix in characters encodings in Languages.h 2023-07-05 13:12:49 +03:00
Ivan Savenko
ea22e53ab8
Merge pull request #2262 from IvanSavenko/launcher_improvements
Launcher improvements for 1.3
2023-07-04 21:10:04 +03:00
Ivan Savenko
78607c9e1e Updated translations 2023-07-03 14:36:53 +03:00
Ivan Savenko
02f23086b6 Updated according to review 2023-07-03 14:34:53 +03:00
Ivan Savenko
5f8a125a98 Updated translations 2023-07-03 14:34:53 +03:00
Ivan Savenko
8ac56f06b0 Added Hungarian 2023-07-03 14:34:53 +03:00
Ivan Savenko
317573cd65 Updated translations 2023-07-03 14:34:53 +03:00
Ivan Savenko
eb06c5fa3f Added slightly better layout for "About" screen 2023-07-03 14:34:53 +03:00
Ivan Savenko
d90fb7eb3f Initial version of "About Project" tab 2023-07-03 14:34:53 +03:00
Ivan Savenko
26ee9c8ece Fix ios build 2023-07-03 14:34:53 +03:00
Ivan Savenko
bcc335e0a8 Added Finnish, Portuguese, Swedish, Turkish languages 2023-07-03 14:34:53 +03:00
Ivan Savenko
ca17145575 Update translation 2023-07-03 14:34:53 +03:00
Ivan Savenko
e2d41c33ba Regenerated translations 2023-07-03 14:34:53 +03:00
Ivan Savenko
ca467ea5ec Disable fullscreen selector when borderless fullscreen is in use 2023-07-03 14:34:53 +03:00
Ivan Savenko
4b366e1fe8 Added new languages: Czech, Italian, Korean 2023-07-03 14:34:53 +03:00
Ivan Savenko
aa5a32f9c4 Implemented UI scaling option in Launcher 2023-07-03 14:34:53 +03:00
Ivan Savenko
8efa7911b7 Implemented "Allied Adventure Map AI" option 2023-07-03 14:34:53 +03:00
Ivan Savenko
21c45bd84f Added new settings to Launcher:
- UI Scaling selection
- Allied AI selection
- Separate main/secondary mod repo
2023-07-03 14:34:53 +03:00
Ivan Savenko
814a4b9455 Partial fix for displaying download progress of mods 2023-07-03 14:34:53 +03:00
Ivan Savenko
fc696fa0b3 Added detection of OS language on first run 2023-07-03 14:34:53 +03:00
Ivan Savenko
1f525c59c3 Remove no longer used code 2023-07-03 14:34:53 +03:00
Ivan Savenko
4911cf0bd4
Merge pull request #2270 from Fabrice-TIERCELIN/french_map_editor
French map editor
2023-07-03 13:11:57 +03:00
Tomasz Zieliński
50bed178ca Unban conflux & necro on many templates, suggested by PvP community. 2023-07-02 17:40:12 +02:00
Tomasz Zieliński
851b90f9c1 Missing file. 2023-07-02 12:32:56 +02:00
Tomasz Zieliński
b94eb20ddf Update templates to allow new town types and factions wherever possible. 2023-07-02 12:18:46 +02:00
Tomasz Zieliński
73b78dd75e Handle "bannedTowns" (alredy used on Jebus). 2023-07-02 11:41:47 +02:00
Tomasz Zieliński
cb4d818241 Inherit terrain types only after all terrain Ids are resolved. 2023-07-02 09:28:51 +02:00
Tomasz Zieliński
04e2cf728e Allow all terrains from mods by default (including Wasteland). 2023-07-02 08:13:06 +02:00
Tomasz Zieliński
dc3dda7676 Fix new factions not appearing in random maps 2023-07-01 15:25:20 +02:00
Fabrice Tiercelin
a0ee0116f7 French map editor 2023-07-01 11:28:49 +02:00
Ivan Savenko
7aef0f404b
Merge pull request #2263 from Fabrice-TIERCELIN/french_launcher
French translation of the launcher
2023-06-30 18:27:53 +03:00
Ivan Savenko
9cd246ab8b
Merge pull request #2259 from IvanSavenko/campaign_refactoring
Fix accumulated issues with campaigns
2023-06-30 12:59:48 +03:00
Fabrice Tiercelin
7c2b9732b5 No character encoding 2023-06-30 08:30:42 +02:00
Ivan Savenko
0a24ca29f6 Add french translation to CMake 2023-06-30 08:22:06 +02:00
Fabrice Tiercelin
3c3961bd4e French translation of the launcher 2023-06-30 08:22:05 +02:00
Ivan Savenko
313b827d25
Merge pull request #2266 from mikeiit/bug-fix-missing-fort-level
Brought back missing fort level in info box
2023-06-29 15:27:32 +03:00
Mike
c35d9d66a6 Brought back missing fort level in info box
This is to fix #2158
2023-06-28 22:21:34 -07:00
Ivan Savenko
cdc27d1fcf Play correct music file in campaign menu 2023-06-27 20:09:11 +03:00
Ivan Savenko
0fdbf54937 Use HeroTypeID instead of int 2023-06-27 19:32:27 +03:00