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,339 Commits 30 Branches 75 Tags
25952f8223b92b1df27e5622deeebb0f90e1c52d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan SavenkoandGitHub 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 SavenkoandGitHub 2e3e116bc4 Merge pull request #3008 from IvanSavenko/fix_conan_docs 
Fix conan docs
 2023-10-05 19:41:58 +03:00
Ivan SavenkoGitHubAndrey 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 SavenkoandGitHub 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 SavenkoandGitHub 84da774005 Merge pull request #2995 from Laserlicht/patch-4 
[Docs] Update Building_Linux.md
 2023-10-05 00:26:48 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub 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 SavenkoandGitHub 56d5c74a61 Merge pull request #2996 from Nordsoft91/fix-2992 
Capture key event in chat box
 2023-10-04 19:59:06 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub 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 SavenkoandGitHub b21a361b99 Merge pull request #2814 from SoundSSGood/arts-counter-impovements 
Artifacts counter impovements
 2023-10-01 17:53:51 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub 9ba1aa652d Merge pull request #2967 from IvanSavenko/bugfixing 
Miscellaneous bugfixing
 2023-09-28 12:11:51 +03:00
Ivan SavenkoandGitHub 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 SavenkoandGitHub 97097c20ad Merge pull request #2874 from SoundSSGood/exchange-window-update 
Exchange window update
 2023-09-27 15:50:52 +03:00
Ivan SavenkoandGitHub 71a1ed816a Merge pull request #2892 from Laserlicht/highscore_menu 
Highscore Menu & end video
 2023-09-27 15:48:47 +03:00
Ivan SavenkoandGitHub efe3393408 Merge pull request #2947 from Laserlicht/enableUiEnhancements_button 
enableUiEnhancements button
 2023-09-27 15:47:25 +03:00
Ivan SavenkoandGitHub 94dbde05a0 Merge pull request #2868 from IvanSavenko/simultaneous_turns 
Simultaneous turns
 2023-09-27 15:45:02 +03:00
Ivan SavenkoandGitHub 4d43562bca Merge pull request #2924 from Laserlicht/datetime_android 
Datetime android
 2023-09-27 15:43:46 +03:00
Ivan SavenkoandGitHub 724eb7902e Merge pull request #2950 from soulsource/feature/make-erm-compile-again 
Make ERM compile again.
 2023-09-27 15:42:33 +03:00
Ivan SavenkoandGitHub d0046d29f2 Merge pull request #2957 from ProjectMutilation/fix-pvs-issues 
Fixed some issues found by pvs
 2023-09-27 15:40:37 +03:00
Ivan SavenkoandGitHub 9147fd49ab Merge pull request #2932 from Laserlicht/mainmenu_layer 
fix layer problem in mainmenu
 2023-09-27 15:37:40 +03:00
Ivan SavenkoandGitHub 0864f975aa Merge pull request #2860 from IvanSavenko/modding_docs_update 
Update modding documentation
 2023-09-26 17:29:59 +03:00
Ivan Savenko 42030ed10f Fix hotseat 2023-09-26 17:28:50 +03:00
Ivan Savenko 67a98d086f Clarified animations format 2023-09-26 16:00:33 +03:00
Ivan Savenko 0ab766479d One more documentation update iteration 2023-09-26 15:55:27 +03:00
Ivan Savenko 8210a2cafd Added list of all identifiers from base game 2023-09-26 15:55:27 +03:00
Ivan Savenko 43246477d4 Update bonuses docs 2023-09-26 15:55:27 +03:00
Ivan Savenko 403acc0cf1 Update spell docs 2023-09-26 15:55:27 +03:00
Ivan Savenko ddda6c0c01 Updated localization docs 2023-09-26 15:55:27 +03:00
Ivan Savenko 9f894d6ca0 Updated RMG template schema 2023-09-26 15:55:27 +03:00
Ivan Savenko f4ee9424e4 Removed unused properties 2023-09-26 15:55:27 +03:00
Ivan Savenko 9710a6b7b3 Updated terrain/river/road schema, added docs 2023-09-26 15:55:27 +03:00
Ivan Savenko 7b8ca9fd40 Add missing schema for "rmg" section of object description 2023-09-26 15:55:27 +03:00
Ivan Savenko 0b044663d9 Updated docs 2023-09-26 15:55:27 +03:00
Ivan Savenko dfc72134f2 Removed unused property 2023-09-26 15:55:27 +03:00
Ivan Savenko 52cb4505e1 RMG schema now actually works 2023-09-26 15:55:27 +03:00
Ivan Savenko 43020c8108 Added value missing from schema 2023-09-26 15:55:27 +03:00
Ivan Savenko 27b75dbbea Fixed silent errors on invalid Json references in schemas 2023-09-26 15:55:27 +03:00
Ivan Savenko 9c4475385b Updated most of remaining bonus type docs 2023-09-26 15:55:27 +03:00
Ivan Savenko 524c476264 Removed no longer used bonuses 2023-09-26 15:55:27 +03:00
Ivan Savenko a7ebbf8680 Updated bonus documentation up to SPELL_AFTER_ATTACK 2023-09-26 15:55:27 +03:00
Ivan Savenko 0a0c01d639 Replaced 'isVisitActiveFor' methods with single 'getVisitingHero' 2023-09-26 15:55:07 +03:00
Ivan Savenko 49c148502b Correctly close dialogs on end of turn 2023-09-26 15:54:24 +03:00
Ivan Savenko 54adeef29f Added temporary UI for simturns testing 2023-09-26 13:42:20 +03:00
Ivan Savenko 5b21a5ffbc Simturn duration is now part of StartInfo 2023-09-26 13:42:20 +03:00
Ivan Savenko 3ea807fb8d Fixed movement through teleporters by AI 2023-09-26 13:42:20 +03:00
Ivan Savenko a9dbd08dec Compute player contacts only once on turn start 2023-09-26 13:42:20 +03:00
Ivan Savenko 623fb2a63e Do not allow visiting objects blocked by visit of another player 2023-09-26 13:42:20 +03:00
Ivan Savenko b807c3855b Add proper visitation checks for netpacks 2023-09-26 13:42:20 +03:00
Ivan Savenko d257fb37f0 Use optional instead of Json for queries 2023-09-26 13:42:20 +03:00
Ivan Savenko 541f7590c5 Add simple detection of player-player contact 2023-09-26 13:42:20 +03:00
Ivan Savenko c8a96647c3 Add turn limit option to pathfinder 2023-09-26 13:42:20 +03:00
Ivan Savenko 56074e18a9 Block turn end button after player ends turn 2023-09-26 13:42:20 +03:00
Ivan Savenko 64c43c91dc Added hardcoded min/max simturns duration 2023-09-26 13:42:20 +03:00
Ivan Savenko 64c82c9133 Fixed UI locking in simturns 2023-09-26 13:42:20 +03:00
Ivan Savenko b2f30f78fa Allow one AI and human to act simultaneously 2023-09-26 13:42:20 +03:00
Ivan SavenkoandGitHub b89fa254fc Merge pull request #2921 from vdhan/develop 
add Vietnamese
 2023-09-25 12:34:00 +03:00
Ivan SavenkoandGitHub e8fdf46a29 Merge pull request #2939 from utzuro/develop 
fix some ukrainian strings in the android launcher
 2023-09-25 11:40:31 +03:00
Ivan SavenkoandGitHub ad4c92b6e1 Merge pull request #2936 from Laserlicht/json_fix 
[fix] no invalid json
 2023-09-24 11:30:49 +03:00
Ivan SavenkoandGitHub 455c13164e Merge pull request #2886 from IvanSavenko/h3m_parser_fixes 
H3m parser fixes
 2023-09-22 18:53:51 +03:00
Ivan SavenkoandGitHub a9abd294da Merge pull request #2876 from IvanSavenko/revisit_object_button_block 
Block revisit object shortcut if no visit is possible
 2023-09-20 22:09:36 +03:00
Ivan SavenkoandGitHub 42d9ba6c82 Merge pull request #2877 from IvanSavenko/simturn_fixes 
Changes for simturns support
 2023-09-20 22:09:25 +03:00
Ivan Savenko 3f35ed000c Fixed parsing of some user-made H3M maps 2023-09-20 22:00:03 +03:00
Ivan Savenko 02dfecd38b Fixed hota maps templates loading 2023-09-20 21:59:16 +03:00
Ivan Savenko 921569e02e Fixed "Long Live the King", 1st scenario victory condition 2023-09-20 21:58:47 +03:00
Ivan SavenkoandGitHub cd1a487ad1 Merge pull request #2835 from IvanSavenko/update_release_process 
Updated release process docs
 2023-09-20 13:44:17 +03:00
Ivan SavenkoandGitHub 00db2e245f Merge pull request #2872 from Laserlicht/bonus_selection 
fix bonus selection
 2023-09-20 13:19:54 +03:00
Ivan SavenkoandGitHub 7b37c2353a Merge pull request #2865 from IvanSavenko/market_ownership_check_fix 
Cleaned up and fixed ownership checks for market netpack
 2023-09-19 23:43:33 +03:00
Ivan Savenko 371d798302 Fix tests 2023-09-19 20:09:18 +03:00
Ivan Savenko d3ced6b703 Block revisit object shortcut if no visit is possible 2023-09-19 19:51:31 +03:00
Ivan Savenko 2af7d7c085 Ignore garrison update events of another towns for our castleInt 2023-09-19 19:24:35 +03:00
Ivan Savenko a16d47037e Fix build 2023-09-19 19:24:35 +03:00
Ivan Savenko 8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
Ivan Savenko 3cdc3daa2c Fix crash on handling invalid player request 2023-09-19 19:21:23 +03:00
Ivan SavenkoandGitHub e630dcb7de Merge pull request #2855 from IvanSavenko/end_turn_netpack 
Added explicit "PlayerEndsTurn" netpack
 2023-09-18 22:08:12 +03:00
Ivan Savenko 219f81d28b Added explicit "PlayerEndsTurn" netpack 
- PlayerEndsTurn pack is now sent when player ends turn
- YourTurn pack has been renamed to PlayerStartsTurn for consistency
- PlayerStartsTurn will no longer replace list of acting players
- PlayerEndsGame and PlayerEndsTurn will remove player from acting list
 2023-09-18 20:55:01 +03:00
Ivan SavenkoandGitHub 54ff039c51 Merge pull request #2850 from IvanSavenko/remove_hero_move_thread 
Remove hero movement thread
 2023-09-18 20:54:13 +03:00
Ivan Savenko f1c40466d3 Changes according to review 2023-09-18 18:17:26 +03:00
Ivan SavenkoandGitHub f50f32fade Merge pull request #2854 from IvanSavenko/video_player_fix 
Fix looped playback of video files
 2023-09-18 17:33:50 +03:00
Ivan Savenko 3d04e9c9ed Cleaned up and fixed ownership checks for market netpack 2023-09-18 17:22:30 +03:00
Ivan SavenkoandGitHub c6a86d9a5f Merge pull request #2842 from Alexander-Wilms/develop 
Add JSON validation as a CI stage
 2023-09-17 17:43:31 +03:00
Ivan SavenkoandGitHub 7c91de2115 Merge pull request #2857 from Alexander-Wilms/fix-json 
Fix JSON files
 2023-09-17 17:07:48 +03:00