1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-04 00:15:53 +02:00
Commit Graph

13636 Commits

Author SHA1 Message Date
Alexander Wilms
941181b8b9 Convert XML files in android/ from CRLF to LF, exclude .bat files from CI check 2023-10-23 13:33:09 +00:00
Ivan Savenko
ae92bdfb51 Fix Lua and test building 2023-10-23 16:05:38 +03:00
Alexander Wilms
f63c2ac5db
CI step "Ensure LF line endings": No need to ignore Android files
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-10-23 14:55:09 +02:00
Ivan Savenko
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03:00
Ivan Savenko
d1d4db26e0 Moved existing files to new directory 2023-10-22 22:20:36 +03:00
Andrii Danylchenko
f74daa2e1f BattleAI: fix health bounty calculation 2023-10-22 22:06:42 +03:00
Andrii Danylchenko
870fbd50e3 BattleAI: bigger reachability map 2023-10-22 21:37:55 +03:00
Andrii Danylchenko
9eb9404f28 BattleAI: divide only positive part of score onto turns count 2023-10-22 21:37:54 +03:00
Alexander Wilms
7e9a3ea042 CI step "Ensure LF line endings": Don't create subshell for grouped commands 2023-10-22 17:50:16 +00:00
Alexander Wilms
0ff423ff0e Change remaining CRLF line endings to LF
find . -type f -name "*.JSON" -exec dos2unix {} \+;
2023-10-22 16:41:09 +00:00
Alexander Wilms
9e84ddc0aa Add CI stage to ensure LF line endings
Based on @josch's command:
https://github.com/vcmi/vcmi/pull/3078#issuecomment-1772150744
2023-10-22 16:12:16 +00:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Ivan Savenko
3867e512f7
Merge pull request #3064 from IvanSavenko/bonus_metaidentifier
Type-safe bonus system
2023-10-22 18:34:12 +03:00
Ivan Savenko
b0a67a66e4
Merge pull request #3092 from IvanSavenko/compatibility_mods
Better support for compatibility mods
2023-10-22 18:02:45 +03:00
Ivan Savenko
85f902fa26 Update docs 2023-10-22 17:12:34 +03:00
Ivan Savenko
8df39c43a0 Fix game loading 2023-10-22 17:04:14 +03:00
Ivan Savenko
a5f0429691
Merge pull request #3083 from Nordsoft91/editor-improvements-1.4
Redesign map editor rendering
2023-10-22 16:56:39 +03:00
Ivan Savenko
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared
Minimap keep aspect ratio (Letterboxing)
2023-10-22 16:55:58 +03:00
Ivan Savenko
4f47555977 Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE 2023-10-22 16:55:19 +03:00
Ivan Savenko
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
Ivan Savenko
31cf3442af Update docs 2023-10-22 16:55:19 +03:00
Ivan Savenko
36a1d6c415 Removed remaining integer bonus subtypes from configs 2023-10-22 16:55:19 +03:00
Ivan Savenko
e54ba7b977 Implement loading of bonus source type 2023-10-22 16:55:19 +03:00
Ivan Savenko
3b010d9596 Renamed MetaIdentifier to VariantIdentifier 2023-10-22 16:55:19 +03:00
Ivan Savenko
80e6485965 MetaIdentifier now uses std::variant internally 2023-10-22 16:55:19 +03:00
Ivan Savenko
b394158dc9 Bonus Source ID now uses metaidentifier 2023-10-22 16:55:18 +03:00
Ivan Savenko
77facf9387 Implement missing functions, fixes linking errors 2023-10-22 16:54:56 +03:00
Ivan Savenko
910ad50417 Fix client & server compilation 2023-10-22 16:54:48 +03:00
Ivan Savenko
0a10fc30b8 (lib) Bonus subtype is now stored as metaidentifier that can store any
other identifier inside it
2023-10-22 16:54:43 +03:00
Ivan Savenko
7e034814c1 Partially revert "Translation" type changes to avoid breaking mods 2023-10-22 16:51:08 +03:00
Ivan Savenko
454ba44ac5
Merge pull request #2988 from IvanSavenko/configurable_extensions
Extension of configurable object functionality
2023-10-22 16:24:47 +03:00
Laserlicht
b67548e7cf
format 2023-10-22 15:06:12 +02:00
Laserlicht
7b370d1967
fix team alignments 2023-10-22 15:00:04 +02:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random
show random maps
2023-10-22 12:29:31 +03:00
Ivan Savenko
acc8e9db32
Merge pull request #3082 from SoundSSGood/crash-hotfix
Сrash fixed  and little optimization
2023-10-22 12:01:28 +03:00
Ivan Savenko
07cd894024
Merge pull request #3090 from Laserlicht/fix_town_selection
[fix] no town selection on loadscreen
2023-10-22 12:01:00 +03:00
Ivan Savenko
b459abdfe3
Merge pull request #3089 from IvanSavenko/fix_game_load
Fix crash on game load
2023-10-22 11:52:21 +03:00
Ivan Savenko
757da7c234
Merge pull request #3093 from Laserlicht/fix_overloaded_events
Fix overloaded events
2023-10-22 11:52:05 +03:00
Laserlicht
0b0082eebc
format 2023-10-22 00:22:49 +02:00
Laserlicht
ab59c153b3
fix 2023-10-22 00:22:16 +02:00
Laserlicht
05a9f0fe39
move to EventReceiver 2023-10-22 00:05:14 +02:00
Laserlicht
6939989026
try to fix 2023-10-21 23:37:59 +02:00
Ivan Savenko
b0d2342c66 Updated Ukrainian translation 2023-10-22 00:23:58 +03:00
Ivan Savenko
50a0ed03db Regenerated launcher translations 2023-10-22 00:17:51 +03:00
Ivan Savenko
adf58fa834 Hide not installed translation mods to languages other than selected one 2023-10-22 00:07:21 +03:00
Ivan Savenko
b50ebba1ba Added mod type "Compatibility" that is hidden in launcher 2023-10-21 23:55:20 +03:00
Ivan Savenko
b2c336de0d JsonNode now uses std::variant internally. Fixes crash on deserialize 2023-10-21 20:41:58 +03:00
Laserlicht
9003e55158
color mode to rgb 2023-10-21 19:31:44 +02:00
Laserlicht
a042cc46c2
no town selection on loadscreen 2023-10-21 19:10:02 +02:00
Laserlicht
d215ffa011
optics 2023-10-21 18:45:45 +02:00