1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Commit Graph

19603 Commits

Author SHA1 Message Date
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
Tomasz Zieliński
363e83e78a Remove unused method, rename the other one 2025-03-14 08:27:53 +01: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
Ivan Savenko
6877bbfe3a Fix issues found by Valgrind 2025-03-12 15:56:52 +00:00
Ivan Savenko
96d691b40c Fix crash on closing game during background image upscaling 2025-03-12 14:18:44 +00:00
Ivan Savenko
6855b895a0 Fix possible crashes on audio shutdown 2025-03-12 13:33:12 +00:00
Ivan Savenko
4684756c49 Do not create ENGINE in headless mode 2025-03-12 13:33:12 +00:00
Ivan Savenko
eaad6f9ce0 Fix crash on trasferring to next scenario in campaign 2025-03-12 13:33:12 +00:00
Ivan Savenko
e73d05933d Quick shutdown of ConsoleHandler thread 2025-03-12 13:33:12 +00:00
Ivan Savenko
8204990fa6 Fix crashes on app shutdown 2025-03-12 13:33:12 +00:00
Ivan Savenko
4d383d5880 Fix build 2025-03-12 13:33:12 +00:00
Ivan Savenko
a474803aaf Use exception throwing to shutdown main thread 2025-03-12 13:33:12 +00:00
Ivan Savenko
9732d39c70 Moved shutdown request dialog handling to GameInstance 2025-03-12 13:33:12 +00:00
Ivan Savenko
f8c1d217d4 Moved main loop to game engine class 2025-03-12 13:33:12 +00:00
Ivan Savenko
222b73bbcd Simplify library initialization 2025-03-12 13:33:12 +00:00
Ivan Savenko
f7305fd1c2 Merge pull request #5540 from GeorgeK1ng/campaign_sets
Make campaign sets modable
2025-03-12 14:56:10 +02:00
Ivan Savenko
e5d476d9c4 Merge pull request #5538 from IvanSavenko/fix_cannonyard
Fixes for crashes
2025-03-12 14:55:42 +02:00
Ivan Savenko
a0e4db98b0 Merge pull request #5533 from Laserlicht/fixes_dev
multiple fixes
2025-03-12 14:55:12 +02:00
Ivan Savenko
d870a7b742 Merge pull request #5527 from Laserlicht/subtitle_disable
setting to disable subtitle
2025-03-12 14:53:59 +02:00
Ivan Savenko
e96ca4363b Merge pull request #5521 from XCOM-HUB/patch-1
Update swedish.json (develop)
2025-03-12 14:52:26 +02:00
Ivan Savenko
ccfd99b316 Merge pull request #5520 from heroesiiifan/_translate_add
add romanian and bulgarian
2025-03-12 14:52:04 +02:00
Ivan Savenko
4df077ca1b Merge pull request #5513 from AlexSnowLeo/develop
Update Mods/vcmi/Content/config/russian.json
2025-03-12 14:51:26 +02:00
MichalZr6
9fbb2d7370 Fix: use LIBRARY instead of VLC 2025-03-11 23:45:59 +01:00
MichalZr6
5363424451 Small fixes to search mapobject feature:
- Trim overly long names to prevent incorrect item display
- Use getLocaleName() for proper locale-aware to_lower conversion
- Implement scoring-based sorting for better search match ranking
- Remove Boost dependency: replace with std::string::find() and rfind()
2025-03-11 23:22:04 +01:00
MichalZr6
2973a769df Remove setting up en_US.UTF-8 locale in VCMIDirsWIN32::init() 2025-03-11 23:22:04 +01:00