krs
1644cab938
Added combat option Highlight Movement on Hover
2023-04-08 20:40:30 +03:00
krs
9012a25276
Stub For Max Movement Range highlight
...
When a creature is hovered., besides movement, for max possible movement, a hex in center of map is now highlighted.
2023-04-08 20:39:59 +03:00
krs
51ad49532b
Fix for wrong merge :(
2023-04-08 20:39:59 +03:00
krs
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
krs
e1c388465a
HD mod highlighting of movement for hovered stack.
...
Does not work as intended in tactics mode.
2023-04-08 20:39:59 +03:00
nordsoft
50115c3113
Rename variables
2023-04-08 20:56:05 +04:00
Ivan Savenko
454168897e
Fix handling of invalid hotkeys in configurable UI
2023-04-08 19:53:13 +03:00
Ivan Savenko
71ddaeea6e
Fix crash on missing music file
2023-04-08 19:47:16 +03:00
Ivan Savenko
4d37686eb3
Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll
...
InfoBar: disable scrollbar
2023-04-08 19:12:48 +03:00
Ivan Savenko
d00fa5bf86
Merge pull request #1887 from Adriankhl/fix_dropbox_left_click
...
Fix: close dropbox with left mouse click outside of the dropbox
2023-04-08 19:11:50 +03:00
Ivan Savenko
0abc00f82e
Fix assertion failure in in-game console
2023-04-08 18:53:47 +03:00
Ivan Savenko
3dedc963f7
Fix double-playing of battle effects
2023-04-08 18:53:28 +03:00
SoundSSGood
e58be8e7f7
vcmiartifacts fixed
2023-04-08 12:28:53 +03:00
Ivan Savenko
e35a1ba471
Merge pull request #1876 from rilian-la-te/refactoring-v1
...
VCMI Refactoring
2023-04-08 11:14:05 +03:00
Konstantin
50c9a57133
InfoBar: fix tiny selection with data
2023-04-08 01:44:08 +03:00
nordsoft
e4cd167062
Compilation fix
2023-04-08 01:49:59 +04:00
nordsoft
3e6a656e4c
Define touchscreen mode at first launch
2023-04-08 01:49:59 +04:00
nordsoft
52b53ab307
Feature and setting implemented
2023-04-08 01:49:59 +04:00
SoundSSGood
ea7dd14d8b
client is able to erase artifact
2023-04-08 00:41:55 +03:00
Ivan Savenko
50da080130
Fixed UI of objects that provide one reward that can be refused
2023-04-08 00:13:38 +03:00
Tomasz Zieliński
cf1f9c456b
Removed unrelated comment
2023-04-07 21:40:47 +02:00
Tomasz Zieliński
37f1bf9d78
Merge remote-tracking branch 'origin/beta' into fix_pandora_amounts
2023-04-07 21:26:36 +02:00
Tomasz Zieliński
f1c52f501d
Fix Pandora Box creature amounts to match OH3 exactly.
2023-04-07 21:23:34 +02:00
Konstantin
f8c15f3a4b
InfoBar: disable scrollbar
2023-04-07 20:50:47 +03:00
Ivan Savenko
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
Ivan Savenko
f3aed901fd
Merge pull request #1883 from rilian-la-te/fixup-healing-destination
...
CGameHandler: fixup healing destination
2023-04-07 12:42:52 +03:00
Ivan Savenko
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
Ivan Savenko
c675e6878a
Merge pull request #1878 from IvanSavenko/fix_battle_ui
...
Fix visual glitches in battle UI
2023-04-07 12:41:29 +03:00
Ivan Savenko
d8faacc9f2
Merge pull request #1875 from IvanSavenko/ttf_fonts_fallback
...
TTF fonts fallback
2023-04-07 12:41:00 +03:00
Ivan Savenko
c304687b2a
Merge pull request #1873 from IvanSavenko/fix_stack_experience_bonuses
...
Fix stack experience bonuses
2023-04-07 12:38:23 +03:00
Sergei Trofimovich
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
nordsoft
b1d06b6141
Complete quick combat feature
2023-04-06 22:49:38 +04:00
nordsoft
e85593dbb3
Save & restore mana
2023-04-06 21:19:46 +04:00
Adriankhl
57409a0d94
fix: close dropbox with left mouse click outside of the dropbox
2023-04-06 18:32:21 +02:00
nordsoft
3e28b58c80
Fixes
2023-04-06 19:59:22 +04:00
nordsoft
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
nordsoft
ce3028bd73
Intermediate commit
2023-04-06 19:34:07 +04:00
Konstantin
a04d8b34f3
vcmi: fix rmg header levels
...
It was printed as char, not as int.
2023-04-06 12:48:53 +03:00
Konstantin
dc7d0297a7
CGameHandler: fixup healing destination
...
If it contains hex, not unit, server complains.
Add actual unit there.
2023-04-06 00:21:21 +03:00
Konstantin
11b237a23c
vcmi: massive refactoring v1
2023-04-05 22:33:12 +03:00
Andrey Filipenkov
1da06e04cc
fix "development mode" condition when building in single process mode
2023-04-05 20:22:29 +03:00
Andrey Filipenkov
41696d6692
Merge pull request #1850 from kambala-decapitator/conan-docs-arm-mac
...
[Conan][docs] improve using prebuilt binaries for Apple Silicon
2023-04-05 18:56:37 +03:00
Ivan Savenko
a3c5f75600
Fix visibility of alternative actions button in tactics stage
2023-04-05 18:36:10 +03:00
Ivan Savenko
cf966015bb
Correctly update battle queue state after changing its state
2023-04-05 18:35:45 +03:00
Konstantin
ee489f18d2
vcmi: PlayerState is now an Entity
...
This will reduce code duplication a little bit.
2023-04-05 01:22:04 +03:00
Konstantin
8968f0ef0e
vcmi: change EAlignment to enum class
2023-04-05 01:22:04 +03:00
Konstantin
0c7dbea990
HeroBonus: remove unused function
2023-04-04 23:02:55 +03:00
Konstantin
b7d6270272
vcmi: add getNativeTerrain method to factions
2023-04-04 23:02:55 +03:00
Konstantin
e0715a76c8
vcmi: reduce CStack usage a little bit
2023-04-04 23:02:54 +03:00
Konstantin
e946ddcfeb
CGameHandler: obstacle trigger does not use CStack
2023-04-04 23:02:54 +03:00
