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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|