mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 03:39:14 +00:00
Code Issues Projects Releases Wiki Activity
29,009 Commits 17 Branches 65 Tags 492 MiB
16922f8000
Commit Graph

29009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
d9c9285b0d Merge branch 'changelog2' into 'master' 
Additional fixes for 0.48 changelog

See merge request OpenMW/openmw!2257
 2022-08-10 07:49:49 +00:00
Andrei Kortunov
63682fc3ba Additional fixes for 0.48 changelog 2022-08-10 11:38:21 +04:00
Bret Curtis
bfd3ece818 Flip the switch on for 0.49 2022-08-09 23:09:57 +02:00
psi29a
8301e1fb9a Merge branch 'cleanup' into 'master' 
#5534 remove OSG 3.4 support and require at least 3.6.5 support

Closes #3180 and #5534

See merge request OpenMW/openmw!2228
 2022-08-09 21:07:29 +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
Arnaud Dochain
19f4e58fed French i10n translations 2022-08-09 20:04:12 +02:00
psi29a
ed45804b0e Merge branch 'textkeys-doc' into 'master' 
Update the Animated Creature Docs

See merge request OpenMW/openmw!2254
 2022-08-09 15:47:11 +00:00
Matjaž Lamut
ed0c9c97ab Update the Animated Creature Docs 2022-08-09 15:47:11 +00:00
psi29a
d9d7277b0e Merge branch 'attackontitan' into 'master' 
Make the character controller less miserable, round 7: attack animations, round 2

See merge request OpenMW/openmw!2253
 2022-08-09 15:46:31 +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
uramer
db8238e4fc Merge branch 'docs_in_docker' into 'master' 
An easy way to build OpenMW documentation in docker

See merge request OpenMW/openmw!2183
 2022-08-09 09:29:02 +00:00
Petr Mikheev
540a22b023 An easy way to build OpenMW documentation in docker 2022-08-09 09:29:02 +00:00
psi29a
0a16d54865 Merge branch 'lockandload' into 'master' 
Make the character controller less miserable, round 6: attack animations, round 1

See merge request OpenMW/openmw!2252
 2022-08-08 21:16:53 +00:00
psi29a
611180a5d8 Merge branch 'ubb_fix' into 'master' 
Remove excessive allocations in lightmanager

See merge request OpenMW/openmw!2251
 2022-08-08 21:10:40 +00:00
glassmancody.info
c513ec7824 null check 2022-08-08 12:53:20 -07: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