1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Commit Graph

19794 Commits

Author SHA1 Message Date
Laserlicht
11459d9268 editor for JSON config in launcher 2025-03-19 19:03:28 +01:00
George King
4a0d8a2015 Merge pull request #1 from vcmi/develop
Update branch
2025-03-19 09:45:29 +01:00
Ivan Savenko
356eaae716 Merge pull request #5543 from kambala-decapitator/ios-portrait-mode
[iOS] enable portrait mode
2025-03-19 10:09:47 +02:00
Ivan Savenko
c73116a010 Reduce boost includes further 2025-03-19 08:03:56 +00:00
Ivan Savenko
7a3e1409d0 Remove old boost includes and defines 2025-03-19 08:03:56 +00:00
Ivan Savenko
2b286378e8 Remove logic for banks in 1.5 format 2025-03-19 08:02:39 +00:00
Ivan Savenko
8e1bd64799 Merge pull request #5570 from IvanSavenko/savecompat_150
Remove save compatibility with 1.5.X
2025-03-19 10:01:57 +02:00
Ivan Savenko
ca8dcf30ed Fix build 2025-03-18 11:56:22 +00:00
Ivan Savenko
eb3b51a6cf Remove save compatibility with 1.5.X 2025-03-18 11:35:15 +00:00
George King
02bae5ef21 Removed non needed part of code 2025-03-17 22:08:08 +01:00
George King
2e352dc233 Minimize changes 2025-03-17 22:01:08 +01:00
George King
784b5ba09e Minimize changes 2025-03-17 21:59:10 +01:00
George King
29ccc70f17 Fix testing leftover 2025-03-17 21:56:11 +01:00
George King
537a112a65 Minimize changes 2025-03-17 21:54:43 +01:00
George King
08c42b156f Cleanup, fix for non existant campaign files 2025-03-17 21:47:25 +01:00
George King
453240fd4d Remove unneeded headers 2025-03-17 20:54:09 +01:00
George King
a6ba2f97e0 Add files via upload 2025-03-17 20:21:22 +01:00
George King
af5f68128c Support for huge campaigns sets with pages in menu 2025-03-17 20:17:09 +01:00
George King
f2a935a475 Campaigns switch pages buttons 2025-03-17 20:16:08 +01:00
kdmcser
32e945c116 fix lack icons when allow morale or luck > 3 or < -3 (setting in gameConfig.json) 2025-03-18 00:45:54 +08:00
Ivan Savenko
81759143f4 Merge pull request #5436 from MichalZr6/fix_map_sorting
Small improvements to map sorting and search mapobjects feature
2025-03-16 19:19:44 +02:00
Ivan Savenko
860f65ea62 Merge branch 'develop' into fix_map_sorting 2025-03-16 19:19:27 +02:00
Ivan Savenko
134535ee15 Merge pull request #5562 from kambala-decapitator/editorconfig
add EditorConfig configuration
2025-03-16 19:09:37 +02:00
Ivan Savenko
64aaaf68d5 Merge pull request #5549 from MichalZr6/BattleHexArray_update
Fix BattleHexArray::contains() and fix no damage chance for catapult
2025-03-16 19:09:28 +02:00
Ivan Savenko
8ed3126a36 Merge pull request #5547 from kambala-decapitator/ios-mute-switch
[iOS] add setting to honor mute switch
2025-03-16 19:09:06 +02:00
Ivan Savenko
6ed1aad11b Merge pull request #5545 from Laserlicht/video_skip_harominize
optimize skip video keys
2025-03-16 19:08:57 +02:00
Ivan Savenko
cb7c2d2f07 Merge pull request #5544 from IvanSavenko/fix_shutdown
Fix shutdown
2025-03-16 19:08:41 +02:00
kdmcser
ffb31cc77c support setting dice molecule for rolling morale and luck 2025-03-16 23:44:38 +08:00
Andrey Filipenkov
fa5220a613 add EditorConfig configuration 2025-03-15 17:22:27 +03:00
George King
796287df95 Fix shortcut typo 2025-03-15 10:42:32 +01:00
George King
cb5b25a49e Added VCMI Shortcut 2025-03-14 15:42:38 +01:00
George King
711adfeb19 Shortcuts configuration 2025-03-14 15:37:09 +01:00
George King
a5542aac50 Campaigns tweaks 2025-03-14 15:32:01 +01:00
George King
f46f295aa1 Support for Generating 4-8 campaigns backgrounds 2025-03-14 15:30:18 +01:00
George King
219514afca Added Chronicles, HotA, WoG campaign hotkeys 2025-03-14 15:29:09 +01:00
Andrey Filipenkov
60af2454a0 Merge pull request #5552 from vcmi/conan-android-fix-comment
[conan] move comment to a separate line
2025-03-14 11:40:49 +03:00
Tomasz Zieliński
363e83e78a Remove unused method, rename the other one 2025-03-14 08:27:53 +01:00
Andrey Filipenkov
e9dc6c2b53 [conan] move comment to a separate line 2025-03-14 10:18:37 +03:00
Laserlicht
46cd1f7805 optimize skip video keys 2025-03-13 20:56:09 +01:00
Tomasz Zieliński
56b3867bb3 Cleanup 2025-03-13 19:59:11 +01:00
Tomasz Zieliński
58041ee123 Solution suggested by ChatGPT 2025-03-13 19:45:28 +01:00
Tomasz Zieliński
2c3284791d Merge remote-tracking branch 'origin/develop' into non_euclidean_roads 2025-03-13 19:14:44 +01:00
DjWarmonger
daa57f30d5 Merge pull request #5525 from vcmi/fix_small_rmg_zones
Move main town to the tile with highest distance to water shore
2025-03-13 19:14:00 +01:00
Tomasz Zieliński
0b00c290bf First acceptable formula for roads 2025-03-13 18:26:30 +01:00
MichalZr6
a8f9ac41e1 Fix no damage chance for catapult with no ballistics 2025-03-13 17:50:18 +01:00
Andrey Filipenkov
0435d8f49c [iOS] add setting to honor mute switch 2025-03-13 12:14:25 +03:00
MichalZr6
749149a679 Fixes following reviews
Use std::optional and improve textSearchSimilarityScore()
2025-03-12 21:40:07 +01:00
MichalZr6
4b0fe811ac Contains returns false instead of true for invalid hexes 2025-03-12 17:55:50 +01:00
MichalZr6
3f4616eb0f SonarCloud fixes 2025-03-12 17:44:13 +01:00
Ivan Savenko
ed4079e83b Code cleanup, add comments where relevant 2025-03-12 15:57:06 +00:00