Ivan Savenko
|
76956cfe3a
|
Merge pull request #3188 from IvanSavenko/remove_identifier_implicit_int_conversion2
Remove implicit conversion of identifier to integer
|
2023-11-16 17:26:32 +02:00 |
|
Ivan Savenko
|
59b2cbe4d2
|
Fix regressions
|
2023-11-15 15:57:03 +02:00 |
|
Ivan Savenko
|
6cb1f6ff11
|
Remove all remaining implicit conversion in lib
|
2023-11-15 15:55:19 +02:00 |
|
Ivan Savenko
|
96c81be68e
|
Win/loss conditions now use VariantIdentifier. Removed non-implemented
options
|
2023-11-15 15:55:19 +02:00 |
|
Ivan Savenko
|
13763cad8e
|
Remove few more implicit conversions
|
2023-11-15 15:55:19 +02:00 |
|
Ivan Savenko
|
34338f4eaa
|
Remove few more implicit conversions
|
2023-11-15 15:55:19 +02:00 |
|
Ivan Savenko
|
abad4b01ce
|
Remove explicit convesion to int in operators
|
2023-11-15 15:55:19 +02:00 |
|
Ivan Savenko
|
10e110320b
|
Remove std::vector<boo> from Json Serializer, simplify affected code
|
2023-11-15 15:55:18 +02:00 |
|
Ivan Savenko
|
0842f5afee
|
Removed remaining usages of std::vector<bool>
|
2023-11-15 15:55:18 +02:00 |
|
Ivan Savenko
|
301ac2457a
|
Cleanup
|
2023-11-13 17:48:55 +02:00 |
|
Ivan Savenko
|
20ef3a69e7
|
Fix most of memleaks discovered by valgrind
|
2023-11-13 16:27:15 +02:00 |
|
Ivan Savenko
|
1192dbff15
|
Merge pull request #3180 from IvanSavenko/bugfixing
Fixes for miscellaneous accumulated issues
|
2023-11-13 16:26:33 +02:00 |
|
Ivan Savenko
|
c6f9434c8e
|
Merge pull request #3170 from gamestales/gamestales/2903-morale-description-1442
#2903-morale-description-#1442
|
2023-11-13 01:53:29 +02:00 |
|
Ivan Savenko
|
9c9127be7d
|
Fix tooltip for spell scrolls on adventure map
|
2023-11-13 00:08:14 +02:00 |
|
Ivan Savenko
|
bc51d9c772
|
Merge pull request #3161 from SoundSSGood/art-swap-optimization
Artifacts swap optimization
|
2023-11-12 19:37:25 +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 |
|
gamestales-com
|
a574f18e69
|
#2903-morale-description-#1442
|
2023-11-10 15:58:19 +01:00 |
|
SoundSSGood
|
57e3abc548
|
ask assemble regression fixed
|
2023-11-08 21:59:55 +02:00 |
|
Ivan Savenko
|
ed66fc2fb3
|
Minor optimization of map startup time
|
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
|
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
|
6b81012f31
|
Use variant identifier in netpacks where applicable
|
2023-11-08 14:00:23 +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
|
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 |
|
nordsoft
|
870aeddad5
|
Serialize owner for abandoned mine
|
2023-11-07 20:11:24 +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 |
|
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
|
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
|
056ef00f74
|
Bugfixing
|
2023-11-02 13:52:58 +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
|
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
|
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 |
|
Ivan Savenko
|
29a78c14a2
|
Merge pull request #3113 from Alexander-Wilms/develop
Fix small issues
|
2023-10-30 11:02:28 +02: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
|
ab2f6abb87
|
ArtifactLocation now use ID for artHolder identification part2
|
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
|
0169c65937
|
Merge pull request #3100 from IvanSavenko/split_net_packs
Split netpacks.h into multiple files
|
2023-10-29 13:46:40 +02:00 |
|
Andrii Danylchenko
|
b579ca8a33
|
#1912 trap, exception on adding duplicating hero
|
2023-10-29 11:03:37 +02:00 |
|
Ivan Savenko
|
4ba8014573
|
Added subtype for SPELL_DURATION
|
2023-10-28 17:57:56 +03: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 |
|
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
|
b88a8da4e8
|
Split off some netpack structures into separate files
|
2023-10-23 13:59:15 +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
|
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
|
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
|
454ba44ac5
|
Merge pull request #2988 from IvanSavenko/configurable_extensions
Extension of configurable object functionality
|
2023-10-22 16:24:47 +03: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 |
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
nordsoft
|
4651893b48
|
Fix hota quests
|
2023-10-14 00:15:15 +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
|
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 |
|