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

13571 Commits

Author SHA1 Message Date
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
Laserlicht
737525756f
fix redraw 2023-10-21 17:28:23 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps 2023-10-21 16:49:50 +02:00
Laserlicht
86e6f7d156
fix 2023-10-21 02:26:03 +02:00
Laserlicht
ceb70af528
fix 2023-10-21 02:22:22 +02:00
Laserlicht
9a116f9b20
small optimisation 2023-10-21 02:16:42 +02:00
Laserlicht
0eba0ee686
show random maps 2023-10-21 02:12:34 +02:00
Ivan Savenko
1baac44495 Update documentation 2023-10-21 00:45:08 +03:00
Ivan Savenko
1c4a142849 Fix remaining TODO's 2023-10-21 00:44:57 +03:00
Ivan Savenko
b9540fa507 Split object jsons into smaller files 2023-10-21 00:31:48 +03:00
Nordsoft91
f3acc939b9
Merge pull request #3062 from Laserlicht/sort_towns
sort town/hero feature
2023-10-20 22:51:26 +02:00
Nordsoft91
12b179ef1f
Merge pull request #3057 from Laserlicht/rw_hero 2023-10-20 01:42:06 +02:00
nordsoft
b9a660f6c3 Redesign map editor rendering 2023-10-20 01:25:06 +02:00
SoundSSGood
068a7d5d4a crash fixed 2023-10-20 01:11:10 +03:00
Nordsoft91
d03b75696a
Merge pull request #3067 from Nordsoft91/editor-improvements-1.4
Add hero placeholder properties
2023-10-19 22:23:58 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00