games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
13,524 Commits 30 Branches 75 Tags
77780e0de57ff2cc76fdbf3c04dfe2ee979c465a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko 77780e0de5 Fix crash on accessing "any" spellschool via bonus system 2023-10-23 22:28:36 +03: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
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
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
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
Ivan Savenko 4c0eabf20c Show guards preview for visited banks on right click 2023-10-19 15:41:59 +03:00
Ivan Savenko 01920bb74e Fix treasure chests 2023-10-19 15:41:41 +03:00
Ivan Savenko 8f4791914e Show content preview only for Witch Huts / Shrines / Tree 2023-10-19 15:17:58 +03:00
Ivan Savenko e0f6b582f5 Display object description only on right-click 2023-10-19 14:36:11 +03:00
Ivan Savenko 530c70c282 Added object descriptions present in H3 2023-10-19 13:34:15 +03:00
Ivan Savenko 0f2922d064 Only show components if UI enhancements is on 2023-10-19 13:33:49 +03:00
Ivan Savenko d295840c64 Merge pull request #3075 from josch/spelling 
some spelling fixes
 2023-10-19 11:15:25 +03:00
Ivan Savenko 18a2eb34ab Merge pull request #3077 from h2oboi89/patch-1 
Fixed anchor links in Manual.md
 2023-10-18 23:56:25 +03:00
Ivan Savenko 901fd77699 Fix Cover of Darkness 2023-10-18 18:04:01 +03:00
Ivan Savenko 8f33fdcd83 Allow learning banned spell from Scholars (H3 logic) 2023-10-18 17:38:40 +03:00
Ivan Savenko ce480c8c84 Fixed Scholar handling 2023-10-18 17:14:22 +03:00
Ivan Savenko f7718628dc Merge pull request #3074 from Nordsoft91/quests 
Fix warnings about empty kill target
 2023-10-18 12:34:44 +03:00
Ivan Savenko 0091e9ae42 Merge pull request #3071 from a-detiste/develop 
typos found by lintian
 2023-10-18 12:33:18 +03:00
Ivan Savenko 48eba6c362 Fix Witch Hut messages to match H3 2023-10-17 16:52:57 +03:00
Ivan Savenko eedaa63f5f Hnadling of Shrine messages now matches H3 2023-10-17 16:35:34 +03:00
Ivan Savenko a77f332411 Merge pull request #3053 from Alexander-Wilms/metainfo-discord 
Improve metainfo file
 2023-10-17 12:16:51 +03:00
Ivan Savenko 927ce4e60e Improvements to rewardable objects popups 2023-10-16 23:55:37 +03:00
Ivan Savenko 850d0ff8eb Show (mostly) correct messages in Shrines 2023-10-16 18:16:15 +03:00
Ivan Savenko 0ea44520fd Fix build 2023-10-16 00:12:39 +03:00
Ivan Savenko e10de0594e Scholar is now configurable object (partial) 2023-10-16 00:12:39 +03:00
Ivan Savenko ca368f606f Added new files 2023-10-16 00:12:39 +03:00
Ivan Savenko bb05c2dea5 Implemented configurable shrine 2023-10-16 00:12:39 +03:00
Ivan Savenko dd841bdaa7 Use enum instead of mix of bool's and int's for tile reveal 2023-10-16 00:12:38 +03:00
Ivan Savenko 98fd939ed6 Cartographer/Observatory is now configurable object 2023-10-16 00:12:38 +03:00
Ivan Savenko f3ed589e35 Use same fow radius calculation as in H3 2023-10-16 00:12:38 +03:00
Ivan Savenko c0a31b716a Added new version of witch hut config 2023-10-16 00:12:38 +03:00
Ivan Savenko a3b2354481 Implemented visit mode "limiter". Fixed h3m variable loading 2023-10-16 00:12:38 +03:00
Ivan Savenko fd01a25352 Implemented basic version of configurable Witch Hut 2023-10-16 00:12:38 +03:00
Ivan Savenko 79b7518b0e Unified Json randomization logic for all entity types 2023-10-16 00:12:38 +03:00
Ivan Savenko aa0b064154 Fixed randomization of artifacts on some custom maps 2023-10-16 00:12:38 +03:00
Ivan Savenko e052a96637 Merge pull request #3054 from Alexander-Wilms/ci-cleanup 
Move JSON validation script to CI folder
 2023-10-15 12:48:03 +03:00
Ivan Savenko e247c29269 Merge pull request #3021 from Laserlicht/video 
video loop fix and missing videos/sounds for battle result
 2023-10-10 18:48:19 +03:00
Ivan Savenko 2e3e116bc4 Merge pull request #3008 from IvanSavenko/fix_conan_docs 
Fix conan docs
 2023-10-05 19:41:58 +03:00
Ivan SavenkoandAndrey Filipenkov 0826b542e3 Apply suggestions from code review 
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
 2023-10-05 19:09:07 +03:00
Ivan Savenko 63453d4ad2 Reverted conan docs to older (but more correct) version 2023-10-05 00:38:00 +03:00
Ivan Savenko b75a67ef7c Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor 
Improvements to type safety of Identifier class
 2023-10-05 00:33:07 +03:00
Ivan Savenko 84da774005 Merge pull request #2995 from Laserlicht/patch-4 
[Docs] Update Building_Linux.md
 2023-10-05 00:26:48 +03:00
Ivan Savenko c80a73e5fc Merge pull request #3007 from Fabrice-TIERCELIN/fix-chinese-translation 
Fix Chinese translation
 2023-10-05 00:02:03 +03:00
Ivan Savenko f72a106e30 Overwrite Catherine / Kendal portraits in AB+ correctly 2023-10-04 23:23:09 +03:00
Ivan Savenko 179def179f Merge pull request #2969 from IvanSavenko/tavern_query 
Add query for Tavern, Dwelling and Market visits
 2023-10-04 22:34:45 +03:00
Ivan Savenko 56d5c74a61 Merge pull request #2996 from Nordsoft91/fix-2992 
Capture key event in chat box
 2023-10-04 19:59:06 +03:00
Ivan Savenko d97a7ac5d3 Merge pull request #3000 from Nordsoft91/russian-translation 
Update russian translation
 2023-10-04 19:33:01 +03:00
Ivan Savenko 037efdf5fc Improvements to type safety of Identifier class 
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
 2023-10-04 18:05:23 +03:00
Ivan Savenko 46e4d862a5 Fix AI recruitment 2023-10-04 17:47:12 +03:00
Ivan Savenko 39a92cdde3 Add query for dwellings dialog 2023-10-04 17:47:12 +03:00
Ivan Savenko 3cb489e9bd Fix University and Altar 2023-10-04 17:47:12 +03:00
Ivan Savenko 898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
Ivan Savenko e322d0a084 Merge pull request #2966 from IvanSavenko/simplify_ui_lock 
Simplified locking of game UI state
 2023-10-04 16:50:23 +03:00
Ivan Savenko b21a361b99 Merge pull request #2814 from SoundSSGood/arts-counter-impovements 
Artifacts counter impovements
 2023-10-01 17:53:51 +03:00
Ivan Savenko b919b3a2d1 Merge pull request #2983 from Alexander-Wilms/faster-ci 
CI: Install all packages at once on Linux
 2023-10-01 17:53:30 +03:00
Ivan Savenko 9ba1aa652d Merge pull request #2967 from IvanSavenko/bugfixing 
Miscellaneous bugfixing
 2023-09-28 12:11:51 +03:00
Ivan Savenko 47a17cc4a7 Merge pull request #2965 from IvanSavenko/movement_fix 
Fix freeze on moving through teleporters without set path
 2023-09-27 23:08:27 +03:00
Ivan Savenko 9b482a2b1e Fix boat creation for heroes recruited on water 2023-09-27 21:25:27 +03:00
Ivan Savenko 16424d2fc0 Fixed boat boarding 2023-09-27 21:25:04 +03:00
Ivan Savenko f4c33f49ee Removed excessive warning 2023-09-27 21:24:37 +03:00
Ivan Savenko 92fdaa20b1 Fix crash on loading Seer Hut with kill monster mission 2023-09-27 21:24:25 +03:00
Ivan Savenko 71ad9d6707 Fix crash on starting map as non-red player 2023-09-27 21:23:54 +03:00
Ivan Savenko 03a939fd52 Remove redundant thread name - this method is not thread entry point 2023-09-27 19:13:26 +03:00
Ivan Savenko 195320dcf2 Removed remaining references to 'pim' name 2023-09-27 18:50:01 +03:00
Ivan Savenko 0dcfd6e65c Removed optional locking in waitWhileDialog method 2023-09-27 18:44:08 +03:00
Ivan Savenko d6b9fa8fbd Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock 
- Removed CPlayerInterface::pim since this lock does not actually
protects LOCPLINT but rather entire game UI state
- added more logical CGuiHandler::interfaceLock
- interface lock is now non-recursive and is locked only once by initial
caller that want to access GUI
 2023-09-27 18:33:52 +03:00
Ivan Savenko c330998518 Fix freeze on moving through teleporters without set path 2023-09-27 17:17:06 +03:00
Ivan Savenko 97097c20ad Merge pull request #2874 from SoundSSGood/exchange-window-update 
Exchange window update
 2023-09-27 15:50:52 +03:00
Ivan Savenko 71a1ed816a Merge pull request #2892 from Laserlicht/highscore_menu 
Highscore Menu & end video
 2023-09-27 15:48:47 +03:00
Ivan Savenko efe3393408 Merge pull request #2947 from Laserlicht/enableUiEnhancements_button 
enableUiEnhancements button
 2023-09-27 15:47:25 +03:00
Ivan Savenko 94dbde05a0 Merge pull request #2868 from IvanSavenko/simultaneous_turns 
Simultaneous turns
 2023-09-27 15:45:02 +03:00