72b2a09f0b
Boat summon spell rewritten
2023-04-10 01:06:02 +04:00
69ad62ef58
Fixes from code review
2023-04-09 23:00:20 +04:00
a8f31fabd1
Fix bug
2023-04-09 23:00:20 +04:00
67c0d29478
Fix header
2023-04-09 23:00:20 +04:00
e7c6f596ee
Little code improvement
2023-04-09 23:00:20 +04:00
ab7d316c3f
Rename fields
2023-04-09 23:00:20 +04:00
b40a3a1b14
Banned arts and skills cannot be randomly rewarded
2023-04-09 23:00:20 +04:00
26c3277895
New format for skills selection
2023-04-09 23:00:20 +04:00
b7ccc4d649
Revert "Random selection for secondary skills"
...
This reverts commit 6e538dab30
2023-04-09 23:00:20 +04:00
6c5f3f21a5
Extend loadKey function
2023-04-09 23:00:20 +04:00
fe21acb0d0
Revert "Random selection for resources"
...
This reverts commit 0e4ff3e2bf
2023-04-09 23:00:20 +04:00
dce5a924b0
Random selection for secondary skills
2023-04-09 23:00:20 +04:00
53e16c7e22
Random selection for primary skills
2023-04-09 23:00:20 +04:00
bb915b0e7e
Random selection for resources
2023-04-09 23:00:20 +04:00
bfd77d871c
Merge pull request #1918 from IvanSavenko/fix_map_loading
...
Fix vcmi map loading
2023-04-09 20:08:23 +03:00
6e90c0fd09
Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot
...
Fix initialization of spell effects registry
2023-04-09 20:07:29 +03:00
235fddaf4b
vcmi: constexpr IDs
2023-04-09 19:54:41 +03:00
737c34b8c6
BattleAI: avoid selfblocking on siege
2023-04-09 16:22:37 +03:00
3166fd05f4
Handle array exceed limit potential crash
2023-04-09 14:43:51 +04:00
23e411cacd
Adding logging and error handling
2023-04-09 13:29:07 +04:00
a6ce99573c
Added fallback identifiers for reading older vcmi maps
2023-04-09 12:27:33 +03:00
7c13246851
Keep creatures and arts
2023-04-09 05:02:34 +04:00
08809f1cdc
String building id
2023-04-09 04:53:06 +04:00
6ed8f748b3
Use string ids for most of bonuses
2023-04-09 04:26:04 +04:00
307fb071a2
VCMI campaign format support prototype
2023-04-09 03:24:40 +04:00
ae5d273df9
Merge pull request #1905 from IvanSavenko/fix_rewardables
...
Fixed UI of objects that provide one reward that can be refused
2023-04-08 22:15:22 +03:00
1d6192ca62
Shut down the thread for tactic phase properly
2023-04-08 22:52:46 +04:00
a97ebc2bf1
Merge pull request #1874 from krs0/feature/separate_movement_highlight_for_hoverd_units_in_battle
...
Separate movement highlight for hovered units in battle
2023-04-08 21:47:49 +03:00
f211207f83
Merge pull request #1893 from trofi/fix-build-without-pch
...
Add missing include headers when building with -DENABLE_PCH=OFF
2023-04-08 21:45:47 +03:00
84af64ce6b
Removed magical initialization of registry via static variables
2023-04-08 21:29:04 +03:00
dab07bdef9
Now unit range is shown in Tactics phase as well
...
A new parameter: isActiveStack was needed in battleGetAvailableHexes, so that we show the propper Tactics range.
2023-04-08 20:39:59 +03:00
e58be8e7f7
vcmiartifacts fixed
2023-04-08 12:28:53 +03:00
ea7dd14d8b
client is able to erase artifact
2023-04-08 00:41:55 +03:00
50da080130
Fixed UI of objects that provide one reward that can be refused
2023-04-08 00:13:38 +03:00
cf1f9c456b
Removed unrelated comment
2023-04-07 21:40:47 +02:00
37f1bf9d78
Merge remote-tracking branch 'origin/beta' into fix_pandora_amounts
2023-04-07 21:26:36 +02:00
f1c52f501d
Fix Pandora Box creature amounts to match OH3 exactly.
2023-04-07 21:23:34 +02:00
1590c710dd
Merge pull request #1886 from rilian-la-te/fix-rmg-levels
...
vcmi: fix rmg header levels
2023-04-07 12:43:34 +03:00
e306e8f9ce
Merge pull request #1879 from kambala-decapitator/single-process-development-mode
...
fix "development mode" condition when building in single process mode
2023-04-07 12:42:03 +03:00
d8faacc9f2
Merge pull request #1875 from IvanSavenko/ttf_fonts_fallback
...
TTF fonts fallback
2023-04-07 12:41:00 +03:00
2885536bf5
Add missing include headers when building with -DENABLE_PCH=OFF
...
Example build failure is missing `VCMI_LIB_NAMESPACE_BEGIN` declaration:
[ 0%] Building CXX object lib/CMakeFiles/vcmi.dir/spells/ObstacleCasterProxy.cpp.o
In file included from lib/spells/ProxyCaster.h:13,
from lib/spells/ObstacleCasterProxy.h:11,
from lib/spells/ObstacleCasterProxy.cpp:11:
lib/../include/vcmi/spells/Caster.h:13:1: error: 'VCMI_LIB_NAMESPACE_BEGIN' does not name a type
13 | VCMI_LIB_NAMESPACE_BEGIN
| ^~~~~~~~~~~~~~~~~~~~~~~~
2023-04-07 10:25:11 +01:00
e85593dbb3
Save & restore mana
2023-04-06 21:19:46 +04:00
ece8a2a41f
Merge branch 'battle-dialog' into battle-dialog2
...
# Conflicts:
# AI/BattleAI/BattleAI.h
# AI/StupidAI/StupidAI.h
# client/CPlayerInterface.cpp
# client/CPlayerInterface.h
# client/Client.cpp
# client/NetPacksClient.cpp
# client/battle/CBattleInterface.cpp
# client/battle/CBattleInterface.h
# client/battle/CBattleInterfaceClasses.cpp
# client/battle/CBattleInterfaceClasses.h
# config/schemas/settings.json
# lib/CGameInterface.h
# lib/IGameEventsReceiver.h
# lib/NetPacks.h
# lib/NetPacksLib.cpp
# lib/battle/BattleInfo.cpp
# server/CGameHandler.cpp
# server/CQuery.h
2023-04-06 19:53:52 +04:00
ce3028bd73
Intermediate commit
2023-04-06 19:34:07 +04:00
a04d8b34f3
vcmi: fix rmg header levels
...
It was printed as char, not as int.
2023-04-06 12:48:53 +03:00
11b237a23c
vcmi: massive refactoring v1
2023-04-05 22:33:12 +03:00
1da06e04cc
fix "development mode" condition when building in single process mode
2023-04-05 20:22:29 +03:00
ee489f18d2
vcmi: PlayerState is now an Entity
...
This will reduce code duplication a little bit.
2023-04-05 01:22:04 +03:00
8968f0ef0e
vcmi: change EAlignment to enum class
2023-04-05 01:22:04 +03:00
0c7dbea990
HeroBonus: remove unused function
2023-04-04 23:02:55 +03:00
