Andrew Dunn
a61237f265
Cleaned up macOS FFmpeg framework linking
...
I'm not sure why but CoreMedia, VideoToolbox, and AudioToolbox aren't
being found by find_library, so I've converted framework imports to a
standard link option. I really don't think this will be an issue given
that this change will only ever apply to Apple platforms.
2022-08-18 00:22:46 +10:00
Andrew Dunn
808a2e587a
Merge commit '5ee4ce1232b0f334f29dd702f811c58dccf5c00d' into apple-silicon-arm-build
2022-08-17 23:45:51 +10:00
psi29a
6346ffca72
Merge branch 'cleanup_components_includes' into 'master'
...
Cleanup components includes
See merge request OpenMW/openmw!2287
2022-08-17 07:50:02 +00:00
elsid
274afbc7a0
Add missing include
2022-08-16 20:06:25 +02:00
elsid
cc8c7002ea
Cleanup components includes
2022-08-16 19:14:04 +02:00
Andrew Dunn
1d7d3d5765
Get build working on Apple Silicon
...
Will validate issues with Intel OSX later
2022-08-17 02:18:48 +10:00
psi29a
b382e92953
Merge branch 'please_dont_copy_my_nfts' into 'master'
...
Prevent various values from being copied
See merge request OpenMW/openmw!2267
2022-08-16 08:36:34 +00:00
psi29a
1f25f430d6
Merge branch 'swimhack' into 'master'
...
Remove 0.43.0 death animation backward compatibility hack (#5977 )
Closes #5977
See merge request OpenMW/openmw!2274
2022-08-16 07:40:13 +00:00
psi29a
1d270e1683
Merge branch 'levelincrease' into 'master'
...
Update both instances of level detail text
See merge request OpenMW/openmw!2282
2022-08-16 07:17:04 +00:00
psi29a
823b8ebc22
Merge branch 'cleanup_detournavigator_includes' into 'master'
...
Cleanup detournavigator includes
See merge request OpenMW/openmw!2281
2022-08-16 07:16:01 +00:00
Alexei Kotov
a4427235df
Update both instances of level detail text
2022-08-16 01:43:28 +03:00
Alexei Kotov
1ce162a95c
Correct follow animation attack strength dependence
2022-08-15 22:08:59 +03:00
elsid
b1fb42a28c
Cleanup detournavigator includes
2022-08-15 19:46:10 +02:00
psi29a
6756f4397e
Merge branch 'aidisplay' into 'master'
...
Fix display for some package settings
See merge request OpenMW/openmw!2271
2022-08-15 12:32:30 +00:00
Alexei Kotov
c857346f7b
Remove 0.43.0 death animation backward compatibility hack ( #5977 )
2022-08-15 14:58:01 +03:00
psi29a
be947bfcf6
Merge branch 'hackercenturions' into 'master'
...
Override non-biped follow animation by movement
See merge request OpenMW/openmw!2276
2022-08-15 07:58:28 +00:00
Alexei Kotov
6b07acbbae
Override non-biped follow animation by movement
2022-08-15 04:14:57 +03:00
Alexei Kotov
ff5a042f5b
Remove cooldown for ranged back up (bug #5129 )
2022-08-15 03:51:16 +03:00
Alexei Kotov
e537f2b6f3
Fix display for some package settings
2022-08-14 19:51:43 +03:00
Evil Eye
eaa108d25d
Return string_view from SoundId methods
2022-08-14 14:39:58 +02:00
Evil Eye
4e9335f10a
Fix include
2022-08-13 11:15:12 +02:00
Alexei Kotov
7f3d2c18e1
Evaluate melee hits on weapon release (bug #5057 )
2022-08-13 01:15:42 +03:00
Alexei Kotov
6c05192afa
Fix swish sound volume and pitch (bug #5057 )
2022-08-13 01:15:41 +03:00
Evil Eye
2deec591cd
Use heterogenous maps for scripts
2022-08-12 20:56:50 +02:00
Evil Eye
51938f9ef7
Use string_view in Interpreter::Context
2022-08-12 19:42:35 +02:00
Evil Eye
4eb6c48285
Avoid copying in InputManager
2022-08-12 18:42:12 +02:00
psi29a
8e7ddc7c0d
Merge branch 'attackattackattack' into 'master'
...
Character controller, round 8: rewrite attack animation logic (bug #4127 )
Closes #4127
See merge request OpenMW/openmw!2263
2022-08-12 15:17:51 +00:00
Evil Eye
685906afdf
Make getScript return string_view
2022-08-11 22:51:55 +02:00
Alexei Kotov
3e34d5e9f2
Rewrite attack animation logic (bug #4127 )
2022-08-11 15:55:26 +03:00
psi29a
18dbf722eb
Merge branch 'store_view' into 'master'
...
Allow string_view lookups in MWWorld::Store
See merge request OpenMW/openmw!2010
2022-08-10 22:29:18 +00:00
elsid
bd91ced754
Move weapon types definition to .cpp file
...
Use template and switch instead of std::map to make sure all types are handled
and there is no lookup for a default value.
2022-08-10 20:41:04 +02:00
Alexei Kotov
bd7ddada7b
Cancel stagger when random attack animations end
2022-08-10 12:59:41 +03:00
Alexei Kotov
af12736baf
Cancel stagger and attack animations simultaneously
2022-08-10 12:53:32 +03:00
psi29a
10ee0e6e1b
Merge branch 'sheerheartattackhasnoweaknesses' into 'master'
...
Animation regression fixes
See merge request OpenMW/openmw!2255
2022-08-10 07:55:01 +00:00
psi29a
b551e69b6f
#5534 remove OSG 3.4 support and require at least 3.6.5 support
2022-08-09 21:07:28 +00:00
Alexei Kotov
083fda357b
Fix creature attack swish pitch and invisibility break
2022-08-09 23:03:53 +03:00
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
