jvoisin
5065e4e571
Merge branch '1234knockout' into 'master'
...
Avoid clearing the current weapon animation group if it's still going to be in use
See merge request OpenMW/openmw!2025
2022-06-17 09:53:13 +00:00
Alexei Kotov
0b38e165f7
Avoid clearing the current weapon animation group if it's still going to be in use
2022-06-17 09:53:13 +00:00
Alexei Kotov
a5d8286cf2
Reject models that don't have grass\ prefix from groundcover cache
2022-06-16 16:26:25 +03:00
psi29a
67e764a44a
Merge branch 'severecharacterdisorder' into 'master'
...
Make the character controller less miserable, round 4: juicy stuff (bug #5592 )
Closes #5592
See merge request OpenMW/openmw!2014
2022-06-15 11:42:17 +00:00
elsid
fdd84265b3
Use proper agent height and radius when render actor path
...
That are based on half extents used to find path over navmesh which is different
for interior and exterior cells.
Use common functions to get agent height and radius for actor path rendering and
navmesh generation.
2022-06-15 01:11:11 +02:00
Alexei Kotov
2b019864b7
Remove more legacy states
2022-06-14 13:47:16 +03:00
Alexei Kotov
30ef7ad81b
Properly cancel the landing animation during movement
2022-06-14 12:50:30 +03:00
Alexei Kotov
c2ac52c82a
Remove dead code
2022-06-14 12:50:30 +03:00
Alexei Kotov
61d382dc9f
Set the initial IdleState to CharState_None
2022-06-14 12:50:30 +03:00
Alexei Kotov
4ce08664e9
Fix swim spellcasting stance turning fallback
2022-06-14 12:50:30 +03:00
Alexei Kotov
5dfce6205a
Reset the idle animation after a movement animation ends
...
Fix non-biped actor idle reset
2022-06-14 12:50:30 +03:00
Alexei Kotov
1a646374b0
Always reset the idle animation after the landing animation ends
2022-06-14 12:50:30 +03:00
Alexei Kotov
69a1d8ac86
Restart idle instantly only after the hit state ends
2022-06-14 12:50:30 +03:00
Alexei Kotov
35db7b8319
Fix fallback for missing swim/sneak idle animations
2022-06-14 01:12:05 +03:00
Alexei Kotov
253de65d13
Fix knockout animation interruption/looping
2022-06-13 17:53:38 +03:00
Alexei Kotov
b8018024a6
Avoid passing weapon short group to refreshXAnims
2022-06-13 17:53:38 +03:00
Alexei Kotov
0a38c3ab78
Reset current animation states in a consistent way
2022-06-13 17:53:38 +03:00
Alexei Kotov
dd42a69ca5
Consolidate refreshIdleAnims
2022-06-13 17:53:38 +03:00
Alexei Kotov
2c3d385672
Consolidate refreshHitRecoilAnims
2022-06-13 17:53:38 +03:00
Alexei Kotov
a105ba14e4
Consolidate refreshJumpAnims
2022-06-13 12:59:18 +03:00
Alexei Kotov
ab46337c41
Rewrite handleTextKey using substring views
2022-06-13 12:28:12 +03:00
Alexei Kotov
9e6b7fed1a
Consolidate refreshMovementAnims()
2022-06-13 12:13:10 +03:00
psi29a
c8eb246198
Merge branch 'no_update_useless_ugly_nodes' into 'master'
...
Only update active children
See merge request OpenMW/openmw!2001
2022-06-12 18:47:56 +00:00
psi29a
eac1d8599a
Merge branch 'lua_record_paths' into 'master'
...
Correct VFS paths in Lua records
See merge request OpenMW/openmw!1853
2022-06-12 18:45:24 +00:00
psi29a
b7918282ad
Merge branch 'minor_simpl_sortfilteritemodel' into 'master'
...
Minor simplifications in sortfilteritemmodel.cpp
See merge request OpenMW/openmw!1975
2022-06-12 18:43:50 +00:00
psi29a
33c5b192c9
Merge branch 'crossovercharacter' into 'master'
...
Make the character controller less miserable, round 2: state mappings
See merge request OpenMW/openmw!2003
2022-06-12 18:37:13 +00:00
jvoisin
8d56e79877
Minor simplifications in sortfilteritemmodel.cpp
...
- Change an if-else-if-else… spaghetti into a switch-case
- Replace a linear search in a dynamically constructed
vector with a switch-case. Thanks elsid for the idea!
2022-06-12 18:00:43 +02:00
psi29a
bf8cc36645
Merge branch 'camera_settings' into 'master'
...
In-game camera settings
Closes #6715
See merge request OpenMW/openmw!1924
2022-06-12 12:47:11 +00:00
uramer
bf905fce4c
Don't use WindowManager outside of UI, correct paths for new record types
2022-06-12 13:07:50 +02:00
uramer
fd7965d77f
Use correctMeshPath instead of string constants
2022-06-12 11:30:29 +02:00
uramer
1fb136a417
Correct icon and mesh paths in Lua records
2022-06-12 11:30:29 +02:00
psi29a
bb0dad7c08
Update to C++20 and see if our CI can handle it.
2022-06-12 08:00:11 +00:00
Alexei Kotov
c2e637d661
Mark setAttackingOrSpell as const
2022-06-12 03:02:23 +03:00
Alexei Kotov
47f574e14b
Move death state mapping out of playDeath/playRandomDeath
2022-06-12 02:58:04 +03:00
Alexei Kotov
b4e87abfe1
Clean up run-to-walk state conversion
2022-06-12 02:52:49 +03:00
Alexei Kotov
31d636ea20
Map movement animation groups with a switch
2022-06-12 02:49:13 +03:00
Petr Mikheev
5f0a7c2b16
Fix jumping when using move360 with a controller
2022-06-12 00:09:13 +02:00
Petr Mikheev
65efd6f1c2
Remove from settings.cfg camera settings that are controlled from Lua
2022-06-12 00:06:39 +02:00
Petr Mikheev
c548708a27
Remove Lua package openmw.settings
2022-06-12 00:06:39 +02:00
psi29a
f8a6001e87
Merge branch 'outofcharacter' into 'master'
...
Make CharacterController less miserable, round 1
See merge request OpenMW/openmw!1999
2022-06-11 18:50:06 +00:00
psi29a
9c1970dce4
Merge branch 'lua_esm' into 'master'
...
Advanced Lua scripts configuration in omwaddon
See merge request OpenMW/openmw!1947
2022-06-11 18:48:23 +00:00
glassmancody.info
d7425cc016
change update visitor to only traverse active children in scenegraph
2022-06-11 00:09:33 -07:00
Alexei Kotov
45e6add5f5
Optimize clearAnimQueue(true)
2022-06-11 04:54:50 +03:00
Alexei Kotov
d4d4304f1e
Fix walk animation fallback replace call
2022-06-11 04:54:50 +03:00
Alexei Kotov
93068d71ea
Use std::string_view whenever reasonable in CharacterController
...
C++ Core Guidelines SL.str.2
2022-06-11 04:54:50 +03:00
Alexei Kotov
97d4206a3d
Improve CharacterController const-correctness
...
C++ Core Guidelines Con. 2
2022-06-11 02:08:43 +03:00
Alexei Kotov
788de7edcb
Initialize most of CharacterController in-class
...
See C++ Core Guidelines C.48
2022-06-11 00:40:14 +03:00
ζeh Matt
9559feaa90
Fix effects not being removed from scene graph
2022-06-10 22:59:23 +03:00
psi29a
436db8c0e5
Merge branch 'ffmpeg5' into 'master'
...
fix hang with ffmpeg5 (ffmpeg_decoder: signal EOF/errors on readPacket)
Closes #6631
See merge request OpenMW/openmw!1941
2022-06-09 20:45:50 +00:00
Matt
4d74f8137c
Use vector for EffectManager effects
2022-06-09 20:43:53 +00:00
