psi29a
db5ca630f7
Merge branch 'update-windows-deps' into 'openmw-48'
...
Update OSGoS dependency package
See merge request OpenMW/openmw!2278
(cherry picked from commit cc27baec6214663b83944e7489619bb73d149d0b2f
2022-08-16 07:21:47 +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
Evil Eye
9817528011
Merge branch 'STRONGFOLLOW' into 'master'
...
Correct follow animation attack strength dependence
See merge request OpenMW/openmw!2280
2022-08-15 20:22:58 +00: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
ζeh Matt
cdcf1393fc
Fix increment of dynamic id when player is inserted
2022-08-15 17:06:01 +03:00
ζeh Matt
6abb96250f
Fix using the wrong id for insertStatic
2022-08-15 17:04:37 +03: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
psi29a
f42ab6a3e7
Merge branch 'coverity' into 'master'
...
Do not copy data when it is not needed
See merge request OpenMW/openmw!2277
2022-08-15 12:30:09 +00:00
Alexei Kotov
c857346f7b
Remove 0.43.0 death animation backward compatibility hack ( #5977 )
2022-08-15 14:58:01 +03:00
psi29a
cdec6495aa
Merge branch 'fnv_support' into 'master'
...
Use Fowler-Noll-Vo hash instead of std::hash
See merge request OpenMW/openmw!2273
2022-08-15 08:01:00 +00: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
psi29a
593853636c
Merge branch 'backupyourcenturion' into 'master'
...
Remove cooldown for ranged back up (bug #5129 )
Closes #5129
See merge request OpenMW/openmw!2275
2022-08-15 07:57:11 +00:00
Andrei Kortunov
e3ad30a517
Do not copy data when it is not needed
2022-08-15 11:52:09 +04: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
Matt
e6868fd211
Allow constexpr hashing
2022-08-14 19:06:29 +00:00
Evil Eye
de8d9b8db3
Use Fowler-Noll-Vo hash instead of std::hash
2022-08-14 19:55:32 +02: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
psi29a
16922f8000
Merge branch 'cs-tables-doc-fix' into 'master'
...
OpenMW-CS tables doc polish
See merge request OpenMW/openmw!2269
2022-08-13 08:12:22 +00:00
Matjaž Lamut
d67b1e1320
OpenMW-CS tables doc polish
2022-08-13 08:12:22 +00:00
psi29a
5b4e2ab843
Merge branch 'unitedstatesofswish' into 'master'
...
Character controller, round 9: melee hit evaluation, swish sound (bug #5057 )
Closes #5057
See merge request OpenMW/openmw!2268
2022-08-13 07:09:03 +00:00
florent.teppe
166717d601
Makes sure threads are only stopped once ,and that they will be re-started
2022-08-13 00:34:01 +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
florent.teppe
16a4b5716b
adds missing include
2022-08-12 18:52:31 +02:00
florent.teppe
b14cc673bc
adds missing decleration
2022-08-12 18:47:29 +02:00
Evil Eye
4eb6c48285
Avoid copying in InputManager
2022-08-12 18:42:12 +02:00
florent.teppe
decfbc5387
Fix threading issues
2022-08-12 18:37:19 +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
psi29a
64a72fcb16
Merge branch 'getScript_view' into 'master'
...
Make getScript return string_view
See merge request OpenMW/openmw!2264
2022-08-12 14:12:42 +00:00
psi29a
feacc1b837
Merge branch 'sky-doc-small-fixes' into 'master'
...
Better wording and formatting of the Sky Structure doc
See merge request OpenMW/openmw!2265
2022-08-12 10:03:16 +00:00
Matjaž Lamut
fe4001d96b
Better wording and formatting of the Sky Structure doc
2022-08-12 10:03:16 +00:00
psi29a
0d5d416ee4
Update .gitlab-ci.yml, CI/install_debian_deps.sh
2022-08-12 07:04:11 +00:00
psi29a
a292906bda
Merge branch 'remove_ndk' into 'master'
...
Comment Android ndk out until it someone fixes things to work with NDK >= 24
See merge request OpenMW/openmw!2261
2022-08-12 05:55:26 +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
e733dca907
Merge branch 'disable_cpp_extensions' into 'master'
...
Disable C++ extensions
See merge request OpenMW/openmw!2095
2022-08-10 22:33:33 +00:00
psi29a
202502c34b
Comment Android ndk out until it someone fixes things to work with NDK >= 24
2022-08-10 22:31:09 +00: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
psi29a
295965ee12
Merge branch 'weapon_type' into 'master'
...
Move weapon types definition to .cpp file
See merge request OpenMW/openmw!2260
2022-08-10 22:27:41 +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
psi29a
bb3bc5538d
Merge branch 'stagger' into 'master'
...
Stagger regression fixes
See merge request OpenMW/openmw!2258
2022-08-10 13:28:28 +00:00
psi29a
75454c3c68
Merge branch 'go_49' into 'master'
...
Flip the switch on for 0.49
See merge request OpenMW/openmw!2256
2022-08-10 12:55:30 +00:00
