45a3064e5d
suggested changes
2022-11-30 18:28:33 +02:00
5cd405bce8
Fixed meta field handling in JsonUtils::inherit function, removed
...
workarounds
2022-11-30 17:38:53 +02:00
79c96e94fa
Cleared up comments
2022-11-30 17:37:36 +02:00
36ae26bc37
Fixed several scenarios which could lead to json with incorrectly set
...
mod origin info, leading to non-resolving identifiers
2022-11-29 22:34:32 +02:00
abe11aaf54
Introduced "map" scope for accessing identifier on map loading.
...
Currently it allows access to all mods, should be restricted to mods
that map depends on
2022-11-29 22:33:08 +02:00
96d8e952c4
attempt to fix the build
2022-11-29 21:45:37 +02:00
909dcb82fa
use ArtifactID
2022-11-29 00:32:18 +02:00
6974d4ea53
Merge pull request #1130 from IvanSavenko/banned_skills_fix
...
Fixes #1096 - do not propose banned skills on levelup
2022-11-15 09:32:12 +02:00
8b964be71f
Merge pull request #1111 from GermanAizek/develop
...
Code refactor and fix condition bug
2022-11-15 09:23:16 +02:00
7fdad4e0f6
Code refactor following C++ standard and condition fixes
2022-11-15 03:20:55 +03:00
729357824b
Added common method for secondary skill availability checks
2022-11-14 19:08:49 +02:00
e06db2365d
Fixes #1096 - do not propose banned skills on levelup
...
Remove possibility to get banned skill on levelup as "obligatory skill"
if all other such skills have been learned before.
May happen under some conditions, e.g. if hero quickly learns other
magic schools - in witch hut/university, leading to case where banned
skill is the only obligatory skill that can be offered on levelup
2022-11-14 17:16:49 +02:00
0f35082024
Fix crash with objects belonging players without state
2022-11-06 03:26:13 +04:00
6cbaa40e29
#1065 - fix random hero initial position
2022-10-13 11:58:32 +03:00
8c481dff46
Fix incorrect templates for mines in HoTA
2022-10-08 12:42:10 +03:00
b26db479d7
don't add Necromancy to Witch Hut on random maps
2022-10-01 16:01:47 +03:00
acfdbe87fe
remove duplicate entry
2022-10-01 16:01:02 +03:00
aa217236b3
check amount of artifacts on hero when checking requirements of a quest that requires artifact(s)
...
fixes case when 2 or more identical artifacts are required
2022-10-01 09:28:32 +03:00
86708841f8
code improvement
2022-10-01 09:24:58 +03:00
127d7ec40b
Fixed asserts (only for debug build)
2022-09-29 21:10:44 +02:00
557512b308
Merge pull request #1006 from AgostonSzepessy/dev/agos/small-fixes
...
Small misc fixes
2022-09-29 19:53:27 +03:00
20c102e648
Remove T prefix from new typedefs
2022-09-29 11:44:46 +02:00
475f835769
More style tweaks
2022-09-28 11:38:08 +02:00
f386f42166
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
...
# Conflicts:
# lib/Terrain.cpp
# lib/Terrain.h
# lib/battle/CBattleInfoEssentials.cpp
# lib/rmg/ObstaclePlacer.cpp
# lib/rmg/RiverPlacer.cpp
2022-09-27 07:50:17 +02:00
2bd30556a3
Store TerrainType by havlue and handle by reference
2022-09-26 09:17:55 +02:00
4ea57ea7fc
A variety of suggested style tweaks
2022-09-25 09:33:56 +02:00
0718acdb6d
Use tuple instead of vector for comparing values
...
There are only 3 values, and they're only used for doing a comparison,
so it's wasteful to create a whole vector for that. std::tuple is better
suited for this use case.
2022-09-24 23:50:31 -07:00
ff635edc0b
wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined
...
preparation for having client and server in a single process
2022-09-24 15:55:21 +03:00
a5077245a8
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
...
# Conflicts:
# lib/Terrain.cpp
# lib/Terrain.h
2022-09-23 20:01:13 +02:00
ebe45d512d
Moved roads and rivers to TerrainTypeHandler, by analogy to TerrainType.
2022-09-23 16:24:01 +02:00
e53613caa7
Fixed crash in pathfinder
2022-09-21 21:44:39 +02:00
6cd810e065
fix showing "visited" message for Warrior's Tomb
2022-09-21 15:19:04 +03:00
c9c4603f75
Firts working version that launches original maps
2022-09-21 13:43:57 +02:00
494b0f0226
First version that compiles
2022-09-21 11:34:23 +02:00
b20f649521
stash
2022-09-19 16:13:58 +02:00
7ba271edf1
Rotation rebase2 ( #912 )
...
* Instead of [x][y][z] coordinates, map will be stored as [z][x][y].
* Nullkiller AI can get it too.
* Use boost::multi_array instead of nested vectors
* In MapHandler too
* Rotate foreach algorithms, too
* VCAI gets rotated, too
2022-09-18 17:39:10 +03:00
e4ac0d4370
Editor prerequisites [part 2] ( #889 )
2022-09-17 14:04:01 +03:00
a598925a0b
Support pickable objects
2022-09-16 09:41:23 +03:00
7dc05d8e81
Support rewardable objects
2022-09-15 11:05:13 +03:00
77e43cb36f
Cache Pathfinding skill
2022-09-14 15:24:24 +02:00
d0f857c3c4
- Generate caching string with sprintf
...
- Reserve BonusList space to avoid costly vector reallocation
- Tweaks in int3 and UNDEAD bonus
2022-09-14 11:00:40 +02:00
3d2dc2335b
Switch ObjectTemplate to shared_ptr<const> ( #870 )
2022-09-11 16:13:53 +03:00
22b4795f86
Well, we should have some sensible exception handling in VCMI
2022-09-11 11:31:28 +03:00
1649cf2bb9
misc comments
2022-09-11 11:31:27 +03:00
efb6580958
Fix for mislaced hero rescued from Prison - https://bugs.vcmi.eu/view.php?id=3227
2022-09-11 11:31:27 +03:00
665bd4346e
Fix getting battlefield crash
2022-09-11 11:31:27 +03:00
4b4cc3cf4b
battlefields in VLC and custom bonuses for terrain patches
2022-09-11 11:31:27 +03:00
3b1d271ae0
allow configurable battleground graphics
2022-09-11 11:31:26 +03:00
aaa07e4d2e
New terrain support - part 1 ( #755 )
...
Initial support of new terrains
2022-09-11 11:31:26 +03:00
5c1a66ab69
Rmg water support ( #745 )
...
* RMG: water support and refactoring
* Fix seers hut bug
2022-06-11 18:40:24 +03:00
