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,655 Commits 30 Branches 75 Tags
8f25f1fd4b1da9e539a06cd57d0a939ec9c4b4e1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko 8f25f1fd4b Serialize identifiers without implicit conversion to int 2023-11-03 16:03:29 +02:00
Ivan Savenko 2b9c362d5b Explicitly convert identifier to underlying enumeration 2023-11-03 16:03:29 +02:00
Ivan Savenko 87f6c7354b Merge pull request #3139 from IvanSavenko/component_variant_identifier 
Refactoring of Component class
 2023-11-03 15:52:07 +02:00
Ivan Savenko 4a24da3804 Merge pull request #3114 from Laserlicht/fix-highscore 
fix high scores screen
 2023-11-03 15:51:37 +02:00
Ivan Savenko eea4cbf242 Merge pull request #3136 from IvanSavenko/fix_teleport 
Fix crash on teleport cast
 2023-11-03 15:49:55 +02:00
Ivan Savenko 7a254dd55f Merge pull request #3135 from IvanSavenko/file_corruption_check 
Ignore corrupted .def files
 2023-11-03 15:49:43 +02:00
Ivan Savenko cc06492488 Merge pull request #3134 from IvanSavenko/initialize_allied_ai 
Correctly initialize current value of allied AI in Launcher
 2023-11-03 15:49:33 +02:00
Ivan Savenko 02b4947db9 Fix build 2023-11-02 20:01:20 +02:00
Ivan Savenko 056ef00f74 Bugfixing 2023-11-02 13:52:58 +02:00
Ivan Savenko f201e3019a Fix crash on right-clicking rewardable objects with no hero selected 2023-11-02 12:00:05 +02:00
Ivan Savenko 10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Ivan Savenko 0376873cb3 Merge pull request #3125 from IvanSavenko/reduce_subid_usage 
Reduce usage of CGObjectInstance::subID
 2023-11-02 11:58:01 +02:00
Ivan Savenko b42f073f0c Stabilization 2023-11-01 18:26:57 +02:00
Ivan Savenko e57276b7c5 Correctly initialize battleID for teleport action 2023-11-01 17:24:41 +02:00
Ivan Savenko 71d6c4e953 Correctly initialize current value of allied AI in Launcher 2023-11-01 16:57:17 +02:00
Ivan Savenko 8346d71c98 Remove more subID access 2023-11-01 14:44:05 +02:00
Ivan Savenko 5cdbf408c7 Slightly simplified heroes initialization 2023-11-01 14:43:20 +02:00
Ivan Savenko 461c481ef3 Fix game startup 2023-11-01 14:43:20 +02:00
Ivan Savenko cc30bdda04 Remove few more subID usages 2023-11-01 14:43:20 +02:00
Ivan Savenko 7a09646009 Cleaned up dwelling randomization 2023-11-01 14:43:20 +02:00
Ivan Savenko dcb8f4fc7b Moved object type randomization to object class 2023-11-01 14:43:20 +02:00
Ivan Savenko 03e1169781 Reduced number of accesses to CGObjectInstance::subID 2023-11-01 14:43:20 +02:00
Ivan Savenko 455d8d4738 Merge pull request #3130 from vcmi/iOS-ipa-install-options 
describe how to put ipa on iOS device
 2023-11-01 14:41:55 +02:00
Ivan Savenko 7107b3202f Merge pull request #3069 from SoundSSGood/artifact-location-id 
ArtifactLocation now use ID for artHolder identification
 2023-11-01 14:41:36 +02:00
Ivan Savenko 858ba22a27 Ignore corrupted .def files 2023-10-31 12:11:41 +02:00
Ivan Savenko 29a78c14a2 Merge pull request #3113 from Alexander-Wilms/develop 
Fix small issues
 2023-10-30 11:02:28 +02:00
Ivan Savenko 6a77191693 Merge pull request #3120 from Alexander-Wilms/pr-specific-ccache 
Improve ccache hit rate for PRs
 2023-10-30 11:02:13 +02:00
Ivan Savenko f607cce09a Merge pull request #3107 from krs0/develop 
Added ai-description to docs
 2023-10-29 22:22:59 +02:00
Ivan Savenko 207968ced3 Merge pull request #3116 from IvanSavenko/bonus_fixes 
Bonuses fixes
 2023-10-29 16:32:48 +02:00
Ivan Savenko 98cb2abd01 Merge pull request #3117 from Alexander-Wilms/patch-1 
Installation_Linux.md: Fix link to Building_Linux.md
 2023-10-29 15:23:19 +02:00
Ivan Savenko e2cffd4c7b Merge pull request #3118 from rilian-la-te/glamor-slight-bonus-fixes 
Small bonus fixes
 2023-10-29 15:23:07 +02:00
Ivan Savenko 720a404e20 Merge pull request #3121 from vcmi/fix-fight-in-dwelling 
BattleAI: fix freeze fighting in dwelling
 2023-10-29 15:22:47 +02:00
Ivan Savenko 3016014543 Merge pull request #3110 from IvanSavenko/mod_compat_fix 
Mod compatibility fixes
 2023-10-29 14:30:04 +02:00
Ivan SavenkoandNordsoft91 be5505690d Apply suggestions from code review 
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
 2023-10-29 13:47:56 +02:00
Ivan Savenko cc5bc40103 Merge pull request #3105 from IvanSavenko/fix_conflicts 
Fix handling of conflicting mods by game client
 2023-10-29 13:47:04 +02:00
Ivan Savenko 18b8971d6f Merge pull request #3101 from IvanSavenko/fix_android_data_import 
Fix data import on Android
 2023-10-29 13:46:48 +02:00
Ivan Savenko 0169c65937 Merge pull request #3100 from IvanSavenko/split_net_packs 
Split netpacks.h into multiple files
 2023-10-29 13:46:40 +02:00
Ivan Savenko 36eacf99d5 Cleanup 2023-10-28 17:58:08 +03:00
Ivan Savenko 4ba8014573 Added subtype for SPELL_DURATION 2023-10-28 17:57:56 +03:00
Ivan Savenko 1e0ea5f1f0 documented NEGATIVE_EFFECTS_IMMUNITY, fixed subtype loading 2023-10-28 17:56:11 +03:00
Ivan Savenko 1459006916 Added separate bonus for native terrain check 2023-10-28 17:54:58 +03:00
Ivan Savenko feae8b6ae4 Do not allow loading new objects into another mod namespace 2023-10-26 15:32:46 +03:00
Ivan Savenko 6337b0d3b9 Fix potential crash on loading mod with invalid handler name 2023-10-26 15:32:13 +03:00
Ivan Savenko c202f58a15 Account for conflicts (and reverse-conflicts) when loading mods 2023-10-24 14:01:20 +03:00
Ivan Savenko 5cbf5031ea move SetStackEffect to a separate file 2023-10-24 01:27:52 +03:00
Ivan Savenko 9fc3d822bb Merge pull request #3103 from IvanSavenko/spell_shool_fix 
Fix crash on accessing "any" spellschool via bonus system
 2023-10-23 23:58:36 +03:00
Ivan Savenko 77780e0de5 Fix crash on accessing "any" spellschool via bonus system 2023-10-23 22:28:36 +03:00
Ivan Savenko 2315ea84ec Invert condition 2023-10-23 22:18:21 +03:00
Ivan Savenko 7dfdee2db8 Check whether H3 data has been imported using most common spellings of 
data directory
 2023-10-23 20:33:01 +03:00
Ivan Savenko 91e202e0e3 Ignore case when checking whether path is white-listed. 
Fixes data import with H3 data that has different case in directory names
 2023-10-23 20:32:45 +03:00
Ivan Savenko 5523f05284 Moved ArtifactLocation to a separate file 2023-10-23 19:02:28 +03:00
Ivan Savenko ae92bdfb51 Fix Lua and test building 2023-10-23 16:05:38 +03:00
Ivan Savenko b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03:00
Ivan Savenko d1d4db26e0 Moved existing files to new directory 2023-10-22 22:20: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