games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity
14,250 Commits 22 Branches 61 Tags 102 MiB
51b7de4b98
Commit Graph

6138 Commits

Author SHA1 Message Date
Ivan Savenko
bbd3312705 Fix randomization of heroes in campaigns 2023-11-12 19:18:17 +02:00
Ivan Savenko
1d430d0328 Fix initialization order of Seer Huts and Creatures - Seer Hut might be 
initialized before creature that its quest is linked to
 2023-11-12 19:18:00 +02:00
Ivan Savenko
071fb97b33 Fix tooltip of visited banks after leaving some troops for banks with 
creatures as reward
 2023-11-12 17:50:52 +02:00
Ivan Savenko
7b92e23f3f Fix crash on right-clicking some visited configurable objects 2023-11-12 16:55:42 +02:00
Andrii Danylchenko
142d0083d5 #3173 - fix trap crash on random hero 2023-11-12 16:14:06 +02:00
Ivan Savenko
5c810df36f Reorganized types registration code 2023-11-11 00:39:08 +02:00
gamestales-com
a574f18e69 #2903-morale-description-#1442 2023-11-10 15:58:19 +01:00
Ivan Savenko
4a7fa9bf8c Simplified CTypeList class 2023-11-08 22:05:36 +02:00
SoundSSGood
57e3abc548 ask assemble regression fixed 2023-11-08 21:59:55 +02:00
SoundSSGood
ce3d407396 artifacts swap optimization 2023-11-08 21:58:48 +02:00
Ivan Savenko
eb167d94a6 Mod compatibility check is now in a separate class and not part of 
ModHandler
 2023-11-08 21:27:05 +02:00
Ivan Savenko
a61ceaf2a7 Serialization version bump 2023-11-08 21:27:05 +02:00
Ivan Savenko
ed66fc2fb3 Minor optimization of map startup time 2023-11-08 21:27:05 +02:00
Ivan Savenko
4e654a7e6e Better names 2023-11-08 21:27:05 +02:00
Ivan Savenko
0691dfef3b Moved stateful artifact randomization logic to gamestate from handler 2023-11-08 21:27:05 +02:00
Ivan Savenko
34c012d119 Serialization version bump 2023-11-08 21:27:05 +02:00
Ivan Savenko
2cc8b5baeb Fix map startup 2023-11-08 21:27:05 +02:00
Ivan Savenko
54103813dd Remove no longer used serialization methods 2023-11-08 21:27:05 +02:00
Ivan Savenko
c7676bde53 Serialize Enitity classes by their ID 2023-11-08 21:27:05 +02:00
Ivan Savenko
f8a7f6e5a7 Remove remaining boost::mpl usages 2023-11-08 21:27:05 +02:00
Ivan Savenko
ad3c870fb6 Remove serialization of VLC, remove unused code 2023-11-08 21:27:05 +02:00
Ivan Savenko
32a2e540d3 Fix build 2023-11-08 14:00:23 +02:00
Ivan Savenko
6b81012f31 Use variant identifier in netpacks where applicable 2023-11-08 14:00:23 +02:00
Ivan Savenko
63e99a32d7
Merge pull request #3157 from IvanSavenko/switch_rng 
Use minstd_rand instead of mt19937 to avoid save game bloat
 2023-11-08 13:42:22 +02:00
Ivan Savenko
bdc83bb1b8
Add description why minstd has been chosen 2023-11-07 23:48:12 +02:00
Ivan Savenko
0acf8890ef
Merge pull request #3143 from IvanSavenko/metastring_refactor 
Metastring refactor
 2023-11-07 23:36:20 +02:00
Ivan Savenko
2835044282
Merge pull request #3159 from IvanSavenko/beta 
Merge beta -> develop (rebased)
 2023-11-07 22:49:29 +02:00
Ivan Savenko
748d70b191 Fix build 2023-11-07 22:47:11 +02:00
Ivan Savenko
09e42cd9df Remove magic number 2023-11-07 22:47:11 +02:00
Ivan Savenko
5cd340ad85 Remove old code 2023-11-07 22:47:11 +02:00
Ivan Savenko
86a3806bec MetaString refactor to eliminate integer usage for identifiers 
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
 2023-11-07 22:47:10 +02:00
Ivan Savenko
f4feaea177
Merge pull request #3141 from IvanSavenko/better_tooltips 
Better tooltips
 2023-11-07 22:46:02 +02:00
Tomasz Zieliński
01f70475ad Missing change 2023-11-07 20:58:22 +01:00
Tomasz Zieliński
c909bd766e Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	lib/rmg/CMapGenOptions.cpp
#	lib/rmg/CMapGenOptions.h
 2023-11-07 20:54:04 +01:00
nordsoft
870aeddad5 Serialize owner for abandoned mine 2023-11-07 20:11:24 +02:00
Ivan Savenko
414c25ea49
Use minstd_rand instead of mt19937 to avoid save game bloat 2023-11-06 23:35:28 +02:00
Ivan Savenko
2f3d14da5c Show quest description only after visit 2023-11-06 20:37:17 +02:00
Ivan Savenko
d7d8177390 Show artifact description and icon on right click if UI tweaks are on 2023-11-06 20:37:17 +02:00
Ivan Savenko
c1c2119f3d Show Seer Hut quest icon on right click. Fix broken tooltip. 2023-11-06 20:37:07 +02:00
Ivan Savenko
1ebb151b41 Show available creatures in owned dwellings on right-click 2023-11-06 20:37:07 +02:00
Ivan Savenko
f039b20653 Improvement for wandering monster tooltip/hover text: 
- show Visions information only on right-click (H3 logic)
- show threat level only on right-click and only if UI tweaks are on
 2023-11-06 20:37:07 +02:00
Ivan Savenko
2bf599bbee
Merge pull request #3119 from Nordsoft91/rmg-fix 
Fix crash caused by duplicated delete
 2023-11-05 17:09:52 +02:00
Andrii Danylchenko
0927d3e3e8
Merge pull request #3145 from vcmi/fix-3142 
#3142 - fi custom campaign selection screen
 2023-11-05 11:12:58 +02:00
Ivan Savenko
5487f07d3b added toEntity overload that accepts generic Services class 2023-11-04 17:04:53 +02:00
Andrii Danylchenko
d50ebd7d58 #3142 - fi custom campaign selection screen 2023-11-04 14:34:18 +02:00
Ivan Savenko
04aeea9b68 use toEnum instead of getNum for switch'es 2023-11-03 19:20:25 +02:00
Ivan Savenko
f1032063bc Restore implicit conversion 2023-11-03 16:03:29 +02:00
Ivan Savenko
cac37df334 Remove unused constructor 2023-11-03 16:03:29 +02:00
Ivan Savenko
184f5a72cc Use toEntity/toXXX methods in Identifier instead VLC objects access 2023-11-03 16:03:29 +02:00
Ivan Savenko
8d5fa41a19 Minor fixes 2023-11-03 16:03:29 +02:00
Ivan Savenko
3634fb2158 Remove int <=> Identifier comparisons 2023-11-03 16:03:29 +02:00
Ivan Savenko
885dce0c27 Replace static_cast's of Identifiers with getNum call 2023-11-03 16:03:29 +02:00
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
eea4cbf242
Merge pull request #3136 from IvanSavenko/fix_teleport 
Fix crash on teleport cast
 2023-11-03 15:49:55 +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
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
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
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
Andrii Danylchenko
caffc8f3cd
Merge pull request #3122 from vcmi/fix-2993 
#2993 - destruct battle info first when destructing CGameState
 2023-10-31 21:43:55 +02:00
Andrii Danylchenko
25b64dd08b
Update lib/gameState/CGameState.cpp 
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
 2023-10-31 21:43:06 +02:00
Tomasz Zieliński
29f023eaa5 More tolerance for Subterranean Gates placement 2023-10-31 16:04:21 +01:00
Tomasz Zieliński
6625831cf6 Use the object templates with least terrains allowed. 2023-10-31 09:07:53 +01:00
Tomasz Zieliński
6e7b68d0e6 Unused variable, unused code 2023-10-30 21:33:49 +01:00
Tomasz Zieliński
80198f21d8 Revert "Fix unused variable" 
This reverts commit c753a1fdf7.
 2023-10-30 21:07:50 +01:00
Tomasz Zieliński
3b7b21bcc8 Fix unused variable 2023-10-30 21:07:14 +01:00
Tomasz Zieliński
c753a1fdf7 Fix unused variable 2023-10-30 20:59:13 +01:00
Tomasz Zieliński
e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp
 2023-10-30 20:08:13 +01:00
Tomasz Zieliński
5962e5c0e0 Fix infinite loop 2023-10-30 19:47:59 +01:00
Tomasz Zieliński
ec0bf05163 Rename "cpu" parameter to correct "humans" 2023-10-30 17:21:03 +01:00
Ivan Savenko
29a78c14a2
Merge pull request #3113 from Alexander-Wilms/develop 
Fix small issues
 2023-10-30 11:02:28 +02:00
Tomasz Zieliński
f39edf9413 Update ally and enemy flags when selecting new template 2023-10-30 07:48:51 +01:00
Tomasz Zieliński
4f2cde018c Fixed most of reported issues, removed unused code. 2023-10-29 21:25:39 +01:00
Andrii Danylchenko
1418e6884e
Merge pull request #2847 from vcmi/trap-1912 
#1912 trap, exception on adding duplicating hero
 2023-10-29 19:24:47 +02:00
SoundSSGood
7e6ab5e87b fix test & fix build & suggested changes 2023-10-29 17:46:14 +02:00
SoundSSGood
c2f658d638 Bulk move artifacts. id 2023-10-29 17:46:13 +02:00
SoundSSGood
3c5527a222 ArtifactLocation now use ID for artHolder identification part3 2023-10-29 17:46:13 +02:00
SoundSSGood
ab2f6abb87 ArtifactLocation now use ID for artHolder identification part2 2023-10-29 17:46:13 +02:00
SoundSSGood
61fc236d79 ArtifactLocation now use ID for artHolder identification part1 2023-10-29 17:46:13 +02:00
Ivan Savenko
207968ced3
Merge pull request #3116 from IvanSavenko/bonus_fixes 
Bonuses fixes
 2023-10-29 16:32:48 +02:00
Alexander Wilms
5cbc75d3b7 Merge remote-tracking branch 'upstream/develop' into develop 2023-10-29 13:35:37 +00: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
3016014543
Merge pull request #3110 from IvanSavenko/mod_compat_fix 
Mod compatibility fixes
 2023-10-29 14:30:04 +02:00
Ivan Savenko
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
0169c65937
Merge pull request #3100 from IvanSavenko/split_net_packs 
Split netpacks.h into multiple files
 2023-10-29 13:46:40 +02:00
Tomasz Zieliński
368a185008 Cleaning up the code 2023-10-29 10:05:24 +01:00
Andrii Danylchenko
b579ca8a33 #1912 trap, exception on adding duplicating hero 2023-10-29 11:03:37 +02:00
Andrii Danylchenko
4d6d64837f #2993 - destruct battle info first when destruction CGameState 2023-10-29 09:41:22 +02:00
nordsoft
35e7fbb366 Fix crash cause by duplicated delete 2023-10-28 22:22:30 +02:00
Tomasz Zieliński
07dac8b6d4 Works more or less 2023-10-28 20:30:38 +02:00
Konstantin
df07b27129 parseSelector: fix anyOf and noneOf 2023-10-28 18:35:59 +03: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
Alexander Wilms
3d8dd35d43 lib/NetPacksLib.cpp: Directly assign to the "std::optional", without dereferencing it. 
Assigning to an optional should directly target the optional
 2023-10-28 10:15:50 +00:00
Alexander Wilms
703ab677ba lib/mapObjects/IMarket.cpp: Show error message about failed dynamic_cast() even if cast object is nullptr 2023-10-27 23:43:39 +00:00
Alexander Wilms
03835236fb lib/mapObjects/CGPandoraBox.cpp: Identical sub-expressions on both sides of operator "||". 
Identical expressions should not be used on both sides of a binary operator
 2023-10-27 23:40:55 +00:00
Alexander Wilms
860f6150aa lib/mapObjects/IMarket.cpp: Forming reference to null pointer 
Null pointers should not be dereferenced
 2023-10-27 23:34:11 +00:00
Alexander Wilms
f01ec55d21 Use the "nullptr" literal. 
"nullptr" should be used to denote the null pointer
 2023-10-27 18:18:59 +00:00
Alexander Wilms
70acf987b4 lib/BasicTypes.cpp: Remove the unary minus operator or change the expression's underlying type. 
Unary minus should not be applied to an unsigned expression
 2023-10-27 14:47:09 +00:00
Alexander Wilms
2b21001743 lib/rmg/RoadPlacer.cpp: Remove "e" from this "throw" statement to rethrow the original exception. 
The original exception object should be rethrown
 2023-10-27 14:35:03 +00: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
Tomasz Zieliński
36911d1e0a Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	client/lobby/RandomMapTab.cpp
 2023-10-26 10:31:41 +02:00
nordsoft
b6b75beb29 Fixes for map editor 
1) fix owner serialization for hero placeholder
2) fix roads/rivers layout
3) fix lasso
 2023-10-24 23:58:26 +02: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
77780e0de5 Fix crash on accessing "any" spellschool via bonus system 2023-10-23 22:28:36 +03:00
Ivan Savenko
5523f05284 Moved ArtifactLocation to a separate file 2023-10-23 19:02:28 +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
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
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
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
Laserlicht
0eba0ee686
show random maps 2023-10-21 02:12:34 +02:00
Ivan Savenko
1c4a142849 Fix remaining TODO's 2023-10-21 00:44:57 +03:00
nordsoft
b9a660f6c3 Redesign map editor rendering 2023-10-20 01:25:06 +02:00
Nordsoft91
d03b75696a
Merge pull request #3067 from Nordsoft91/editor-improvements-1.4 
Add hero placeholder properties
 2023-10-19 22:23:58 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix) 
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
 2023-10-19 16:23:21 +02: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
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
nordsoft
966ffe4377 Fix warnings about empty kill target 2023-10-18 00:13:32 +02:00
Alexandre Detiste
15e45f966c typos found by lintian 2023-10-17 22:06:08 +02: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
927ce4e60e Improvements to rewardable objects popups 2023-10-16 23:55:37 +03:00
Nordsoft91
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change 
possibility to change name in lobby
 2023-10-16 22:28:31 +02:00
nordsoft
f6d7755c6a Add hero placeholder properties 2023-10-16 22:24:12 +02:00
Ivan Savenko
850d0ff8eb Show (mostly) correct messages in Shrines 2023-10-16 18:16:15 +03:00
Nordsoft91
02c1425939
Merge pull request #3046 from Nordsoft91/editor-improvements-1.4 
Add map editor zoom and objects lock functionality
 2023-10-16 01:22:18 +02: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
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
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
nordsoft
4651893b48 Fix hota quests 2023-10-14 00:15:15 +02:00
nordsoft
5f52e6b35e Revert "Auxiliary commit to revert individual files from 2bf8cdc9f525099348439c700af0466955f01b30" 
This reverts commit d9952495391f7ac77dd32dcf33f487e146b3655b.
 2023-10-13 23:35:37 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name 2023-10-13 23:04:35 +02:00
nordsoft
55900ceb66 Add portraits delegate 2023-10-13 20:15:29 +02:00
nordsoft
2bf8cdc9f5 Hota-related bugs were fixed 2023-10-13 12:52:45 +02:00
nordsoft
fbf5492fd9 Remove unnecessary virtuals 2023-10-12 13:30:01 +02:00
nordsoft
74a90cde5d Fix hero level limiter 2023-10-12 12:52:01 +02:00
nordsoft
14b030d2eb Support hota quest gates 2023-10-11 23:15:24 +02:00
nordsoft
7ccd4cdcb2 Refactor quests progress 2023-10-11 21:10:42 +02:00
nordsoft
22c9eecd7d Fix mistake 2023-10-11 08:54:54 +02:00
nordsoft
2b88e6941c Fix mana limiter 2023-10-11 01:43:24 +02:00
nordsoft
6093f042dd Text container fix 2023-10-11 01:26:07 +02:00
nordsoft
8335fffaea Fix rumors 2023-10-11 00:58:32 +02:00
nordsoft
5b10b457cf Fix code review suggestions 2023-10-11 00:47:19 +02:00
nordsoft
62c4e8a98d Fix compiling 2023-10-10 23:44:29 +02:00
nordsoft
31d71ddd25 Minor fixes in text 2023-10-10 23:44:29 +02:00
nordsoft
5eeda3cd25 Quests mostly work 2023-10-10 23:44:29 +02:00
nordsoft
d2d64dbddd Bugfixes 2023-10-10 23:44:29 +02:00
nordsoft
bb238f9b72 New quests work 2023-10-10 23:44:29 +02:00
nordsoft
63bdfb8ff6 New quests implemented 2023-10-10 23:44:29 +02:00
nordsoft
1460541ee5 New limiter based quests 2023-10-10 23:44:29 +02:00
nordsoft
b7568a160c Fixes 2023-10-10 23:44:29 +02:00
nordsoft
6a7b23c007 Additional properties for limiter 2023-10-10 23:44:28 +02:00
nordsoft
937a8d63c7 Check for artifacts copies in limiter 2023-10-10 23:44:28 +02:00
nordsoft
0cf3205e15 Fix quest regressions 2023-10-10 23:44:28 +02:00
nordsoft
d7d435dcb7 Add game pause 2023-10-08 16:03:57 +02:00
Nordsoft91
1c4bbf1078
Merge pull request #3012 from Nordsoft91/fixes 2023-10-08 12:11:32 +02:00
nordsoft
043f54698b Fix translations in map editor / fix crash on game end 2023-10-05 23:34:29 +02:00
SoundSSGood
bcce4c68e5 Artifacts placement fixed 2023-10-05 15:17:02 +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
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
39a92cdde3 Add query for dwellings dialog 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
Andrii Danylchenko
20a944c551
Merge pull request #2884 from vcmi/nkai-air-water-walking 
NKAI: water and air walking
 2023-10-03 21:46:35 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework 2023-10-02 21:03:16 +02:00
Nordsoft91
80be1e9f4c
Merge pull request #2981 from Nordsoft91/rmg-template 
Select random object template instead of first
 2023-10-02 20:42:39 +02:00
Nordsoft91
c57d5545c2
Merge pull request #2971 from Nordsoft91/translations 
Multi-language support for network game and for VMAPs
 2023-10-02 20:41:42 +02:00
nordsoft
10eb19758a Code review fixes 2023-10-01 18:00:36 +02:00
Ivan Savenko
b21a361b99
Merge pull request #2814 from SoundSSGood/arts-counter-impovements 
Artifacts counter impovements
 2023-10-01 17:53:51 +03:00
nordsoft
3ea7988883 Treasure placement uses random templates now 2023-09-30 23:06:38 +02:00
Laserlicht
8b835c9253
load game support 2023-09-30 20:03:33 +02:00
Andrii Danylchenko
2dd0d76412 NKAI: water and air walking 2023-09-30 10:37:32 +03:00
nordsoft
1502ea2250 Fix pandora mana problem 2023-09-30 01:33:12 +02:00
nordsoft
ce62ab3e66 Select random object template instead of first 2023-09-30 01:19:18 +02:00
nordsoft
70796d232b Full support of maps translations 2023-09-29 00:24:45 +02:00
nordsoft
ae073ee35d Remove unused identifiers 2023-09-28 23:15:36 +02:00
nordsoft
98fde9ab1d Add string IDs in map editor 2023-09-28 14:38:31 +02:00
nordsoft
60df49236f Inspector widgets set string ID 2023-09-28 14:03:58 +02:00
nordsoft
56eefab255 Fix headers 2023-09-28 13:28:24 +02:00
nordsoft
1dbecc2e18 Revert "Add header" 
This reverts commit d661600858.
 2023-09-28 13:28:04 +02:00
nordsoft
d661600858 Add header 2023-09-28 13:14:23 +02:00
nordsoft
a710c88b07 Proper map translations loading 2023-09-28 13:09:01 +02:00
nordsoft
67e1200448 Remove forward declaration 2023-09-28 12:46:28 +02:00
nordsoft
ba1dbbbb1d New version for map format 2023-09-28 04:23:14 +02:00
nordsoft
65f696b018 Cosmetic changes for json map reader 2023-09-28 03:02:46 +02:00
nordsoft
9098126684 Separate map text identifiers from global 2023-09-28 02:52:49 +02:00
nordsoft
40af83a55c Fix quest 2023-09-28 02:51:58 +02:00
nordsoft
3c2549d905 Fix town name 2023-09-28 02:51:44 +02:00
nordsoft
6da605ff83 Campaign meta strings 2023-09-28 00:10:28 +02:00
nordsoft
5b97c323d3 Rename hero strings to text id 2023-09-28 00:04:05 +02:00
nordsoft
486091a915 Heroes switched to text id 2023-09-28 00:00:32 +02:00
nordsoft
0c94a4d891 Town name switched to id 2023-09-27 23:57:05 +02:00
nordsoft
41da252e67 Seerhut meta strings 2023-09-27 23:49:27 +02:00
nordsoft
00c8c2eb82 Event message meta string 2023-09-27 23:28:17 +02:00
nordsoft
f9f79255c5 Creature message meta string 2023-09-27 23:25:19 +02:00
nordsoft
0ac893b80f Rumors meta string 2023-09-27 23:22:45 +02:00
nordsoft
ab373f08ab Use meta string for messages 2023-09-27 23:11:11 +02:00
nordsoft
03c099d4fd First steps 2023-09-27 22:53:13 +02:00
Ivan Savenko
9b482a2b1e Fix boat creation for heroes recruited on water 2023-09-27 21:25:27 +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