mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 07:53:52 +00:00
Code Issues Releases Wiki Activity
29169 commits 108 branches 66 tags 133 MiB
Commit graph

29169 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
florent teppe
baadc06e98 Merge branch 'master' into 'SHADER_HOT_RELOAD' 
# Conflicts:
#   apps/openmw/mwrender/postprocessor.hpp
 2022-08-09 09:26:55 +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
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
glassmancody.info
2cea4f3172 stop excessive allocations with lightmanager callback 2022-08-07 17:04:03 -07:00
florent.teppe
603b30e117 Added some variable names to make it clearer what their function was 
avoid having lost of ->first and ->second that aren't meaningfull
 2022-08-07 22:56:32 +02:00
psi29a
69654b6697 Merge branch 'revert_active' into 'master' 
Revert traversal mode to default

See merge request OpenMW/openmw!2249
 2022-08-07 16:23:19 +00:00
psi29a
6ee20835fc Merge branch 'main_pp' into 'master' 
[Postprocessing] Remove default shader and simplify pipeline

Closes #6920

See merge request OpenMW/openmw!2248
 2022-08-07 14:50:08 +00:00
cody glassman
ac4b29be08 cleanup default shaders and remove confusing main shader 2022-08-07 06:42:48 -07:00
psi29a
e75d3285cf Merge branch 'paged_refs_vector' into 'master' 
Use std::vector to store paged ref nums

See merge request OpenMW/openmw!2245
 2022-08-07 13:35:54 +00:00
psi29a
6d7216adba Merge branch 'coverity' into 'master' 
Use ubuntu:20.04 docker image for Coverity

See merge request OpenMW/openmw!2244
 2022-08-07 09:47:20 +00:00
florent.teppe
c71f3508df changed overview.rst of post processing 2022-08-07 00:26:29 +02:00
florent.teppe
df69fc7659 Post processing shaders now use the same lua commands, no more launcher option to enable live reload 2022-08-07 00:19:19 +02:00
cody glassman
c770c462e4 revert traversal nodes, discovered to break some NIFs with UV controllers 2022-08-06 11:39:23 -07:00
Alexei Kotov
bc1a6bfd72 Merge branch 'changelog' into 'master' 
Cleanup 0.48 changelog

See merge request OpenMW/openmw!2247
 2022-08-06 15:43:12 +00:00
Andrei Kortunov
af542a873f Cleanup 0.48 changelog 2022-08-06 15:05:51 +04:00
Alexei Kotov
0fd817150e Merge branch 'ordinator_farming_restored' into 'master' 
Save state for disposed actors if they can respawn

Closes #6923

See merge request OpenMW/openmw!2232
 2022-08-06 11:03:06 +00:00
Alexei Kotov
263a955290 Merge branch 'coverity' into 'master' 
Avoid possible null dereference

See merge request OpenMW/openmw!2243
 2022-08-06 10:53:38 +00:00
Alexei Kotov
43db803938 Merge branch 'race_scroll' into 'master' 
Allow mouse scrolling in the race preview widget

See merge request OpenMW/openmw!2246
 2022-08-06 10:49:02 +00:00
Andrei Kortunov
7dd668bf12 Allow mouse scrolling in the race preview widget (feature 6925) 2022-08-06 11:25:27 +04:00