|
|
ebd17c9e4a
|
Merge pull request #1928 from Nordsoft91/cast-reward
Spell cast reward
|
2023-04-10 22:49:36 +04:00 |
|
|
|
fedf7d377c
|
vcmi: remove TFaction
This is a huge change and will break save compatibility
|
2023-04-10 19:28:16 +03:00 |
|
|
|
42b2be4bbb
|
Merge pull request #1908 from SoundSSGood/art-client-server-fixes
Artifact related fixes
|
2023-04-10 18:26:49 +03:00 |
|
|
|
2eaecfd1ae
|
ObstacleCasterProxy: beta branch
|
2023-04-10 15:41:58 +03:00 |
|
|
|
c0b90432cb
|
Change callback interface
|
2023-04-10 05:40:03 +04:00 |
|
|
|
e440343921
|
Bypass initial version of spell callback
|
2023-04-10 04:34:24 +04: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 |
|
|
|
f3aed901fd
|
Merge pull request #1883 from rilian-la-te/fixup-healing-destination
CGameHandler: fixup healing destination
|
2023-04-07 12:42:52 +03:00 |
|
|
|
b1d06b6141
|
Complete quick combat feature
|
2023-04-06 22:49:38 +04: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 |
|
|
|
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 |
|
|
|
11b237a23c
|
vcmi: massive refactoring v1
|
2023-04-05 22:33:12 +03:00 |
|
|
|
e0715a76c8
|
vcmi: reduce CStack usage a little bit
|
2023-04-04 23:02:54 +03:00 |
|
|
|
e946ddcfeb
|
CGameHandler: obstacle trigger does not use CStack
|
2023-04-04 23:02:54 +03:00 |
|
|
|
4259d116e1
|
vcmi: move ServerSpellCastEnvironment in separate file
In theory, it should not know about CGameHandler
|
2023-04-04 23:02:54 +03:00 |
|
|
|
307065a633
|
Merge beta into develop
|
2023-04-04 16:06:20 +03:00 |
|
|
|
c661419897
|
Merge pull request #1700 from rilian-la-te/resource-array
Modernize resourceSet.
|
2023-04-02 20:12:45 +03:00 |
|
|
|
2b1def4ef1
|
Merge pull request #1813 from Laserlicht/patch-1
hide messages from AI
|
2023-04-02 20:08:45 +03:00 |
|
|
|
f471d1b23a
|
Merge pull request #1816 from krs0/feature/all_cheats_should_have_lotr_equivalent
Added LotR alternatives for vcmiarmy and vcmiexp
|
2023-04-02 20:08:33 +03:00 |
|
|
|
efbc5cf581
|
Merge pull request #1815 from IvanSavenko/beta_fixes
Beta fixes
|
2023-04-02 20:02:41 +03:00 |
|
|
|
28486a0b40
|
In the Silmarillion, Gandalf is referred to as "Olórin"
|
2023-04-02 10:58:20 +03:00 |
|
|
|
7bec5bf606
|
Added LotR alternatives for vcmiarmy and vcmiexp
|
2023-04-02 10:58:20 +03:00 |
|
|
|
63d0e437a9
|
Merge pull request #1820 from rilian-la-te/fix-magogs
GGameHandler: fix spell-like attack targeting
|
2023-04-01 23:09:08 +03:00 |
|
|
|
05cc7fbf67
|
GGameHandler: fix spell-like attack targeting
|
2023-04-01 01:06:26 +03:00 |
|
|
|
56e1866db9
|
Remove final path node when directly attacking guards
|
2023-03-31 23:18:45 +03:00 |
|
|
|
820c9be61b
|
Use own resources when buying boat in allied shipyard
|
2023-03-31 23:18:45 +03:00 |
|
|
|
f7feeacc1f
|
hide messages from AI
|
2023-03-31 22:10:48 +02:00 |
|
|
|
6d17b9342d
|
ResourceSet: resolve .at troubles
|
2023-03-31 14:12:38 +03:00 |
|
|
|
d8a237ba46
|
vcmi: add getTrigger method to obstacles
Fixes advanced remove obstacle spell
|
2023-03-31 01:01:26 +03:00 |
|
|
|
d5e2933bee
|
CGameHandler: slightly rework obstacle caster
|
2023-03-31 01:01:26 +03:00 |
|
|
|
53a6fb2836
|
CGameHandler: do not open-code toInfo
There is an obstacle function which is doing exactly this.
|
2023-03-31 01:01:25 +03:00 |
|
|
|
f704a17e1a
|
vcmi: add a last hex setting
I consider this behaviour as H3 bug, but this is H3.
So, added a setting to disable this behaviour.
|
2023-03-31 01:01:25 +03:00 |
|
|
|
a8478a012b
|
vcmi: check long bridge by moat
If moat is on GATE_BRIDGE hex, then it is a long bridge.
No need to check town type.
|
2023-03-31 01:01:25 +03:00 |
|
|
|
aab5b47038
|
vcmi: setup moats using MoatAbility
Setup moats using moat ability, need playtest for now.
-3 to defence not added for now.
|
2023-03-31 01:01:25 +03:00 |
|
|
|
cd1730b1fb
|
vcmi: remove obstacle caster logic
It is possible now to cast something via obstacle
Immune creatures should not trigger an obstacle trigger now
and should not reveal it.
|
2023-03-30 14:41:40 +03:00 |
|
|
|
5716925b47
|
NetPacks: change GiveBonus enum to enum class.
|
2023-03-30 12:41:17 +03:00 |
|
|
|
484f0a175a
|
Blocked movement of war machines in tactics phase
|
2023-03-30 12:20:13 +03:00 |
|
|
|
3e1506dba3
|
Merge pull request #1767 from Adriankhl/fix_battle_thread_shutdown
Properly shutdown battle thread
|
2023-03-29 14:40:15 +03:00 |
|
|
|
b2f5042942
|
Merge pull request #1783 from vcmi/beta
Merge beta -> develop
|
2023-03-27 21:21:25 +03:00 |
|
|
|
b875da108b
|
Merge pull request #1717 from SoundSSGood/backpack-limit-size
Introducing backpack size limit functionality
|
2023-03-27 17:17:49 +03:00 |
|
|
|
e3b5db0ade
|
Merge pull request #1778 from rilian-la-te/fix-obstacle-removal-mechanincs
Fix landmines staying on battlefield after trigger
|
2023-03-27 17:17:14 +03:00 |
|
|
|
9a229d6e48
|
vcmi: really correct obstacle trigger
Now obstacle trigger really matches H3
|
2023-03-27 16:11:17 +03:00 |
|
|
|
5b50191af7
|
NetPacksLib: remove obstacle ACTIVATE* actions
Actually these actions was not working anyway.
|
2023-03-26 22:59:34 +03:00 |
|
|
|
21a4113fc1
|
Properly shutdown battle thread in CGameHandler destructor
|
2023-03-25 20:29:33 +01:00 |
|
|
|
5288e3761e
|
Merge pull request #1764 from IvanSavenko/selectable_spellcaster
Implemented support for multi-spell casters
|
2023-03-25 20:08:47 +02:00 |
|
|
|
dc099b2a35
|
Implemented support for multi-spell casters
|
2023-03-25 00:48:14 +02:00 |
|
|
|
970981cfc9
|
Show information on potential kills in attack tooltip
|
2023-03-24 17:18:47 +02:00 |
|
