krs
91c96b1b68
Fix for merge.
2023-04-17 00:53:25 +03:00
krs
14cbdf7ab0
Split Process console commands code into individual functions
...
Extracted functions for each if branch, added one line doc for each function, rearranged the commands to be groupped more logically.
2023-04-16 23:45:37 +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
Ivan Savenko
1704fab3a2
Fix assertion failure on fighting against AI with tactics
2023-04-15 17:20:38 +03:00
Ivan Savenko
cc8c1c769a
Fix duplicated maps in scenario selection screen
2023-04-15 17:20:38 +03:00
Ivan Savenko
de855085f0
Added information on banks, seer hut and monster properties
2023-04-15 17:20:38 +03:00
Ivan Savenko
3738171b21
Refactoring of H3M loader to make HotA format support easier
...
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
Nordsoft91
6b12ee044f
Merge pull request #1969 from Nordsoft91/spectator
...
Single player spectator
2023-04-15 03:33:18 +04:00
Ivan Savenko
b354f99cc3
Merge pull request #1936 from IvanSavenko/cpp_17_upgrade
...
Upgrade c++ standard to c++17
2023-04-14 19:21:17 +03:00
Ivan Savenko
128764b1c9
Merge pull request #1968 from rilian-la-te/fix-caster-tactics
...
Fix caster tactics
2023-04-14 18:59:03 +03:00
Ivan Savenko
44b83b2e11
Merge master -> develop
2023-04-14 16:51:35 +03:00
nordsoft
289259f64a
Unblock spectator interface during AI turns
2023-04-14 00:22:47 +04:00
nordsoft
35fa06008b
Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c"
...
This reverts commit 129b15a49c911315789721b7e62b93757819519a.
2023-04-14 00:20:51 +04:00
nordsoft
413870d39a
Revert "Single player spectator"
...
This reverts commit b9e5e42647
2023-04-14 00:18:29 +04:00
Ivan Savenko
1978e6f8e8
Do not show unit information on dead creatures
2023-04-13 21:16:55 +03:00
nordsoft
b9e5e42647
Single player spectator
2023-04-13 13:12:00 +04:00
nordsoft
e28dd128e0
Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c"
...
This reverts commit 46d35541b453b6c026c457bf0c788f79311968b3.
2023-04-13 12:45:10 +04:00
Konstantin P
384ee99834
vcmi: configurable teleport v2
...
1. Redesign wall and teleport penalty using shortest path
This will avoid OH3 exploits with teleport inside walls
2. Teleport is now configurable
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
Konstantin
8397bd91fb
BattleActionsController: do not pass unused caster
...
This is unused, so, remove this parameter to prepare for teleport action
2023-04-13 11:24:19 +03:00
Konstantin
15031d2e16
vcmi: do not block interface on setup spells
2023-04-13 01:06:36 +03:00
nordsoft
fb4db41891
Single player spectator
2023-04-13 02:01:13 +04:00
nordsoft
f005dbbc14
Spectator mode
2023-04-13 00:59:44 +04:00
Ivan Savenko
644f0f4b32
Removed ARRAY_COUNT in favor of std::size
2023-04-12 01:04:26 +03:00
Ivan Savenko
506c3d29bc
Replaced vstd clamp with std version
2023-04-12 01:03:14 +03:00
Ivan Savenko
5f74aca341
Fix missing attribute
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
39f4bc0072
Reset battle bonuses on client side
2023-04-11 17:25:19 +04:00
nordsoft
8e77b833d9
Merge remote-tracking branch 'upstream/develop' into battle-dialog
2023-04-11 15:54:08 +04:00
Ivan Savenko
e25cd7f90f
Merge pull request #1934 from IvanSavenko/beta_fixes
...
Fixed bugs for 1.2 release
2023-04-11 11:08:40 +03: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
40bea35a26
CHeroWindow: fix picked art mana limit display
2023-04-10 15:35:21 +03:00
Ivan Savenko
07230f3b47
Attempt to fix stack splitting on macos
2023-04-10 14:34:17 +03:00
Ivan Savenko
02c9a3f3d8
Correctly reset UI on aborting Clone/Sacrifice
2023-04-10 14:33:24 +03: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
Ivan Savenko
e2d0cd37e4
Merge pull request #1910 from IvanSavenko/beta_fixes
...
Fixes for 1.2 branch
2023-04-09 20:09:03 +03:00
Ivan Savenko
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
Adriankhl
1d6192ca62
Shut down the thread for tactic phase properly
2023-04-08 22:52:46 +04:00
Ivan Savenko
84af64ce6b
Removed magical initialization of registry via static variables
2023-04-08 21:29:04 +03:00
krs
7eda4b6c1e
replaced SDLK_LSHIFT check with GH.isKeyboardShiftDown()
2023-04-08 20:42:37 +03:00
krs
3194999809
Add SHIFT + hover shortcut to show movement highlight while pressed.
2023-04-08 20:42:37 +03:00
krs
aba5840a6f
Removed Max Movement Highlight stubs
2023-04-08 20:40:30 +03:00
krs
1644cab938
Added combat option Highlight Movement on Hover
2023-04-08 20:40:30 +03:00
