1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-31 06:32:39 +00:00

3639 Commits

Author SHA1 Message Date
Evil Eye
de51525c76 Allow string_view lookups in MWWorld::Store and get some use out of that 2022-08-09 20:43:14 +02:00
psi29a
bb9884c024 Merge branch 'split_stringops' into 'master'
Split components/misc/stringops.hpp into multiple headers

See merge request OpenMW/openmw!2233
2022-08-09 18:06:40 +00:00
Alexei Kotov
c4881c8613 Move weapon equip sound logic to weapon equip animation logic 2022-08-09 15:46:24 +03:00
Alexei Kotov
9f39f6d48e Streamline attack body pitching 2022-08-09 14:53:02 +03:00
Alexei Kotov
2b167317da Clean up updateWeaponState inventory block 2022-08-09 14:34:49 +03:00
Alexei Kotov
1b3baa812a Streamline hit/follow animation key construction 2022-08-09 14:34:49 +03:00
Alexei Kotov
2e112847be Further updateWeaponState cleanup 2022-08-09 14:10:46 +03:00
Alexei Kotov
ea78e904a9 Merge inventory blocks in updateWeaponState 2022-08-09 14:00:16 +03:00
Alexei Kotov
ad62f5cda3 Move werewolf/ranged weapon swish logic to playSwishSound 2022-08-08 22:22:34 +03:00
Alexei Kotov
09141388ad Detangle attack start, knockdown attack cancel and on-going wind-up logic 2022-08-08 22:22:34 +03:00
Alexei Kotov
8f280c521c Play pick/probe animation in attack start animation logic 2022-08-08 22:22:32 +03:00
Alexei Kotov
a4b5bfc051 Don't cancel the attack prematurely after running out of ammo 2022-08-08 22:19:51 +03:00
Alexei Kotov
d280a29b18 Re-enable lower body crossbow animation playback 2022-08-08 20:45:29 +03:00
Alexei Kotov
ac892f2bfd Clean up updateWeaponState() 2022-08-08 20:45:29 +03:00
Alexei Kotov
e5ef9f1464 Improve upper body character state naming 2022-08-08 19:46:46 +03:00
psi29a
b55a511ad8 Merge branch 'idlechance' into 'master'
Fix Wander random idle chance

See merge request OpenMW/openmw!2242
2022-08-04 09:55:05 +00:00
elsid
f99ed6f1db
Split components/misc/stringops.hpp into multiple headers
Replace all ciEqual overloads with one having std::string_view as argument.
2022-08-03 22:06:24 +02:00
Alexei Kotov
b4f743ad60 Fix Wander idle chance 2022-08-02 15:55:29 +03:00
Alexei Kotov
acfff6b25e Restore invisibility early-out in combat engagement 2022-08-01 15:11:18 +03:00
Alexei Kotov
0b1e6a2b59 Fix pipeline errors 2022-07-31 14:43:57 +03:00
psi29a
a41c9240d9 Merge branch 'wallflower_breakdancing' into 'master'
Break invisibility before applying CE enchantments

Closes #6913

See merge request OpenMW/openmw!2218
2022-07-31 09:49:14 +00:00
Evil Eye
6196e777da Break invisibility before applying CE enchantments 2022-07-31 09:48:01 +02:00
Alexei Kotov
7a6e984e90 Fix spellcasting state getting stuck due to premature attack attempts 2022-07-31 09:05:35 +03:00
psi29a
5cd4dbd9a9 Merge branch 'unrestrictedfailure' into 'master'
Spellcasting timing fixes (bug #4227)

Closes #4227

See merge request OpenMW/openmw!2201
2022-07-30 07:35:46 +00:00
psi29a
7361a1c6fd Merge branch 'awareness' into 'master'
Fix invisibility handling in awareness checks

See merge request OpenMW/openmw!2203
2022-07-30 06:41:07 +00:00
Alexei Kotov
fede5c7c02 Fix invisibility handling in awareness checks 2022-07-29 18:54:14 +03:00
Alexei Kotov
8005d3ca25 Rename updateState back into updateWeaponState 2022-07-29 17:22:51 +03:00
Alexei Kotov
a914d7a9b0 Spellcasting timing fixes (bug #4227)
Play spellcasting animation and VFX (but not hand VFX) if spellcasting failed due to insufficient magicka
Apply spellcasting fatigue loss when the spellcasting starts instead of when the spell is applied
2022-07-29 16:24:28 +03:00
Alexei Kotov
93eb470024 Break invisibility after stopping preparing the attack (bug #5976) 2022-07-29 14:01:55 +03:00
psi29a
4ecfc0e9ac Merge branch 'torchwood' into 'master'
Don't extinguish held light sources when they're hidden (bug #6910)

Closes #6910

See merge request OpenMW/openmw!2194
2022-07-29 09:40:48 +00:00
psi29a
48c26117da Merge branch 'stagger' into 'master'
Cancel stagger after weapon release animations (bug #6869)

Closes #6869

See merge request OpenMW/openmw!2192
2022-07-29 09:40:22 +00:00
psi29a
3db753a30c Merge branch 'invisibility' into 'master'
Don't headtrack or greet magically hidden actors (bug #5978)

Closes #5978

See merge request OpenMW/openmw!2196
2022-07-29 09:38:54 +00:00
Alexei Kotov
88bd3d559a Don't headtrack or greet magically hidden actors (bug #5978) 2022-07-29 10:47:50 +03:00
Alexei Kotov
94dfcdd062 Don't extinguish held light sources when they're hidden (bug #6910) 2022-07-29 10:16:29 +03:00
Alexei Kotov
16e373f30e Make enchanted item casting use accurate aiming for 1 frame (bug #6909) 2022-07-28 19:10:53 +03:00
Alexei Kotov
a2c5161ac4 Cancel stagger animation when an attack ends (bug #6869) 2022-07-28 18:42:38 +03:00
Evil Eye
55134d1e31 Use string_view in the CharacterController 2022-07-26 17:23:00 +02:00
Alexei Kotov
45a94bdf32 Merge branch 'no_hugs' into 'master'
Don't allow non-bipedal actors to use non-weapon animations while moving

Closes #6868

See merge request OpenMW/openmw!2153
2022-07-26 14:48:54 +00:00
psi29a
d43e85051f Merge branch 'walkwhenyoucantride' into 'master'
Revert MR 2048

See merge request OpenMW/openmw!2175
2022-07-26 14:19:32 +00:00
unknown
95a074b8aa Shorten diff 2022-07-24 20:43:05 +02:00
Alexei Kotov
510d1d76d7 Fix applying of falling damage 2022-07-24 19:08:54 +03:00
Alexei Kotov
819101144d Landing animation playback fixes
Cancel landing animation immediately after moving during the first frame of landing and due to turning animation
2022-07-24 17:24:17 +03:00
Alexei Kotov
bbb8a5e1cb Revert MR 2048 2022-07-24 00:31:57 +03:00
Evil Eye
4e65829cec Don't allow non-bipedal actors to use non-weapon animations while moving 2022-07-17 21:47:50 +02:00
ζeh Matt
841fd9618f
Rename DrawState_ to DrawState and use enum class 2022-07-17 20:50:26 +03:00
psi29a
06db2446b1 Merge branch 'cleanup_aistate' into 'master'
Cleanup MWMechanics::AiState

See merge request OpenMW/openmw!2141
2022-07-17 09:13:04 +00:00
elsid
b8937a493a
Avoid manual memory management for MWMechanics::DerivedClassStorage 2022-07-16 17:13:16 +02:00
elsid
d2b7253c7f
Use forward declarations instead of including aistate.hpp 2022-07-16 17:13:16 +02:00
elsid
f5c2e09df9
Move AiTemporaryBase to a separate header 2022-07-16 17:13:16 +02:00
elsid
e11fbc10b1
Remove unused member functions from MWMechanics::DerivedClassStorage 2022-07-16 17:13:16 +02:00