nordsoft
|
de159df481
|
Rename boats
|
2023-04-20 21:20:51 +04:00 |
|
nordsoft
|
0a28262c15
|
Merge remote-tracking branch 'upstream/develop' into boats
# Conflicts:
# AI/VCAI/Pathfinding/AINodeStorage.cpp
|
2023-04-19 02:22:19 +04:00 |
|
nordsoft
|
008db447e7
|
Minor changes
|
2023-04-19 02:11:24 +04:00 |
|
nordsoft
|
22da7a931d
|
Boat as bonus system node
|
2023-04-19 01:11:51 +04:00 |
|
nordsoft
|
1c66cd221d
|
Polish transport mechanics
|
2023-04-18 19:18:44 +04:00 |
|
nordsoft
|
3ff99a1a15
|
Mechanic for air and land transport
|
2023-04-18 18:33:28 +04:00 |
|
nordsoft
|
ddcdfb643a
|
Try to enable air/land movement
|
2023-04-18 17:36:42 +04:00 |
|
nordsoft
|
ed798b06da
|
Prepare transport enum
|
2023-04-18 13:04:49 +04:00 |
|
Konstantin
|
7a5775a9f9
|
vcmi: use std::optional
|
2023-04-17 00:43:13 +03:00 |
|
Konstantin
|
0d35606a44
|
vcmi: use std::variant
|
2023-04-17 00:43:13 +03:00 |
|
Ivan Savenko
|
e3ed728193
|
Merge pull request #1932 from rilian-la-te/proper-teleport
VCMI: teleport redesign
|
2023-04-16 22:52:01 +03:00 |
|
Konstantin P
|
f11fa8f0c8
|
Teleport: can trigger obstacles now
|
2023-04-13 11:24:19 +03:00 |
|
Konstantin
|
bc1aad3b26
|
vcmi: remove deprecated CStack::getCreature()
Function battle::Unit::unitType() does the same.
|
2023-04-13 11:24:19 +03:00 |
|
Ivan Savenko
|
506c3d29bc
|
Replaced vstd clamp with std version
|
2023-04-12 01:03:14 +03:00 |
|
Ivan Savenko
|
63b197b78a
|
Converted attributes to use c++17 functionality
|
2023-04-12 01:03:14 +03:00 |
|
Nordsoft91
|
3951bbb395
|
Merge pull request #1108 from Nordsoft91/battle-dialog
[HDMod features] Quick combat
|
2023-04-11 21:18:04 +04:00 |
|
Ivan Savenko
|
dfa2e2a349
|
Merge beta into develop
|
2023-04-11 19:37:35 +03:00 |
|
nordsoft
|
8e77b833d9
|
Merge remote-tracking branch 'upstream/develop' into battle-dialog
|
2023-04-11 15:54:08 +04:00 |
|
Ivan Savenko
|
ff66592fad
|
Merge pull request #1882 from rilian-la-te/native-terrain-refactor
Native terrain refactor
|
2023-04-11 02:14:37 +03:00 |
|
nordsoft
|
bfc75ccd39
|
Merge remote-tracking branch 'upstream/develop' into battle-dialog
|
2023-04-11 02:22:42 +04:00 |
|
Nordsoft91
|
ebd17c9e4a
|
Merge pull request #1928 from Nordsoft91/cast-reward
Spell cast reward
|
2023-04-10 22:49:36 +04:00 |
|
Konstantin
|
fedf7d377c
|
vcmi: remove TFaction
This is a huge change and will break save compatibility
|
2023-04-10 19:28:16 +03:00 |
|
Ivan Savenko
|
42b2be4bbb
|
Merge pull request #1908 from SoundSSGood/art-client-server-fixes
Artifact related fixes
|
2023-04-10 18:26:49 +03:00 |
|
Konstantin
|
2eaecfd1ae
|
ObstacleCasterProxy: beta branch
|
2023-04-10 15:41:58 +03:00 |
|
nordsoft
|
464ad63749
|
Implement behavior
|
2023-04-10 05:46:45 +04:00 |
|
nordsoft
|
c0b90432cb
|
Change callback interface
|
2023-04-10 05:40:03 +04:00 |
|
nordsoft
|
e440343921
|
Bypass initial version of spell callback
|
2023-04-10 04:34:24 +04:00 |
|
SoundSSGood
|
e58be8e7f7
|
vcmiartifacts fixed
|
2023-04-08 12:28:53 +03:00 |
|
SoundSSGood
|
ea7dd14d8b
|
client is able to erase artifact
|
2023-04-08 00:41:55 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
Konstantin
|
4259d116e1
|
vcmi: move ServerSpellCastEnvironment in separate file
In theory, it should not know about CGameHandler
|
2023-04-04 23:02:54 +03:00 |
|
Ivan Savenko
|
307065a633
|
Merge beta into develop
|
2023-04-04 16:06:20 +03:00 |
|
Ivan Savenko
|
c661419897
|
Merge pull request #1700 from rilian-la-te/resource-array
Modernize resourceSet.
|
2023-04-02 20:12:45 +03:00 |
|
Ivan Savenko
|
2b1def4ef1
|
Merge pull request #1813 from Laserlicht/patch-1
hide messages from AI
|
2023-04-02 20:08:45 +03:00 |
|
Ivan Savenko
|
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 |
|
Ivan Savenko
|
efbc5cf581
|
Merge pull request #1815 from IvanSavenko/beta_fixes
Beta fixes
|
2023-04-02 20:02:41 +03:00 |
|
krs
|
28486a0b40
|
In the Silmarillion, Gandalf is referred to as "Olórin"
|
2023-04-02 10:58:20 +03:00 |
|
krs
|
7bec5bf606
|
Added LotR alternatives for vcmiarmy and vcmiexp
|
2023-04-02 10:58:20 +03:00 |
|
Ivan Savenko
|
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 |
|
Konstantin
|
05cc7fbf67
|
GGameHandler: fix spell-like attack targeting
|
2023-04-01 01:06:26 +03:00 |
|
Ivan Savenko
|
56e1866db9
|
Remove final path node when directly attacking guards
|
2023-03-31 23:18:45 +03:00 |
|