psi29a
e4a9e83609
Merge branch 'disable-shadows-properly-properly' into 'master'
...
Affect correct texture units when disabling shadows for stateset
Closes #7838
See merge request OpenMW/openmw!3891
2024-02-22 18:05:48 +00:00
psi29a
a6c9e63520
Merge branch 'nojumpallowed' into 'master'
...
Reduce false-positive jumping events (#7833 )
Closes #7833
See merge request OpenMW/openmw!3869
2024-02-22 18:05:07 +00:00
AnyOldName3
535c5e328a
Affect correct texture units when disabling shadows for stateset
...
Knowing which are right required making the function non-static, so the shadow manager had to become a singleton as the results of passing it around to where it's needed were hellish.
I'm seeing a bunch of OpenGL errors when actually using this, so I'll investigate whether they're happening on master.
I'm hesitant to look into it too much, though, as I'm affected by https://gitlab.com/OpenMW/openmw/-/issues/7811 , and also have the Windows setting enabled that turns driver timeouts into a BSOD so a kernel dump is collected that I can send to AMD.
2024-02-20 21:02:31 +00:00
Zackhasacat
b4c5a2777a
Rename var
2024-02-20 13:20:09 -06:00
Zackhasacat
ccb506385f
Fix player looking/controls
2024-02-20 13:07:44 -06:00
Zackhasacat
fed62a8517
Remove unneeded line
2024-02-18 15:58:18 -06:00
Zackhasacat
92242a3d54
Simplify
2024-02-18 13:20:58 -06:00
Zackhasacat
731095831d
Add missing function types.Item.isCarriable()
2024-02-18 13:15:56 -06:00
psi29a
f9820e2061
Merge branch 'debugdrawdebugged' into 'master'
...
Try to uncursify debug primitive drawer (#7767 )
Closes #7767
See merge request OpenMW/openmw!3852
2024-02-17 18:56:21 +00:00
jvoisin
0db730825d
Merge branch 'drainmaximummagicka' into 'master'
...
Hide magnitude for Fortify Maximum Magicka when requested as well (#7832 )
Closes #7832
See merge request OpenMW/openmw!3868
2024-02-16 23:02:52 +00:00
Alexei Kotov
aae74224e8
Prevent swim upward correction from causing false-positive jumping events ( #7833 )
2024-02-16 14:28:43 +03:00
Alexei Kotov
7873714103
Restore vertical movement reset for various movement states ( #7833 )
...
Note getJump already handles incapacitation states (dead/paralyzed/KO)
2024-02-16 13:37:11 +03:00
Alexei Kotov
6e81927d60
Make extra sure to ignore movement input for scripted animations ( #7833 )
2024-02-16 13:37:11 +03:00
Alexei Kotov
c1b9beb763
Merge branch 'deadanimation' into 'master'
...
Remove dead code
See merge request OpenMW/openmw!3866
2024-02-15 00:57:59 +00:00
Alexei Kotov
a0ba0d781a
Hide magnitude for Fortify Maximum Magicka when requested as well ( #7832 )
2024-02-15 01:50:49 +03:00
psi29a
ec1cf46ec7
Merge branch 'lua_keybinds' into 'master'
...
Lua Implement mouse input engine handlers, improve inputBinding renderer
See merge request OpenMW/openmw!3855
2024-02-14 08:30:38 +00:00
psi29a
fda47a6ebe
Merge branch 'flying-fish-straight-to-jail' into 'master'
...
Groundcover should ignore non-geometry Drawables
Closes #7633
See merge request OpenMW/openmw!3859
2024-02-14 08:29:28 +00:00
Evil Eye
8f88838ff5
Remove dead code
2024-02-13 19:30:32 +01:00
psi29a
744cd50520
Merge branch 'decoupled-audio' into 'master'
...
Add option to use camera as sound listener
Closes #5944
See merge request OpenMW/openmw!3836
2024-02-13 09:18:18 +00:00
Epoch
6486f3f2cf
Add option to use camera as sound listener
2024-02-13 09:18:18 +00:00
psi29a
50ea852928
Merge branch 'STOP_IGNORING_ME_AND_LOOK_ME_IN_THE_EYES' into 'master'
...
add ignore list to raycasts (#7788 )
See merge request OpenMW/openmw!3848
2024-02-13 09:15:49 +00:00
psi29a
9e1cdaceff
Merge branch 'markers' into 'master'
...
Fix ESM4 marker model hiding hack
See merge request OpenMW/openmw!3853
2024-02-13 09:13:56 +00:00
Cody Glassman
56b31ceaf5
add ignore list to raycasts
2024-02-12 07:52:47 -08:00
psi29a
c889026b71
Merge branch 'cleanup_physics_callbacks' into 'master'
...
Cleanup physics callbacks
See merge request OpenMW/openmw!3831
2024-02-12 14:16:26 +00:00
psi29a
1c2fc59a6f
Merge branch 'water' into 'master'
...
Refraction fog based on water depth
See merge request OpenMW/openmw!3842
2024-02-12 14:13:48 +00:00
psi29a
e9c97b835e
Merge branch 'acertainsign' into 'master'
...
Expose birth signs to Lua
See merge request OpenMW/openmw!3850
2024-02-12 14:11:29 +00:00
psi29a
a060a7297c
Merge branch 'dehardcode-skillprogression' into 'master'
...
Lua: Dehardcode skill and level progression
See merge request OpenMW/openmw!3779
2024-02-12 14:10:51 +00:00
psi29a
d36583bdec
Merge branch 'nevercruelorcowardly' into 'master'
...
Correct activation behavior for actors in combat (#7794 )
Closes #7794
See merge request OpenMW/openmw!3822
2024-02-12 14:10:08 +00:00
AnyOldName3
8c591a0b44
Groundcover should ignore non-geometry Drawables
...
Fix https://gitlab.com/OpenMW/openmw/-/issues/7633
Untested - the issue didn't link to a mod using the mesh and I couldn't be bothered setting one up manually.
2024-02-12 01:16:49 +00:00
uramer
63a1bbb88d
Enable Lua mouse engine handlers while in UI
2024-02-11 23:49:26 +01:00
Alexei Kotov
887d09e051
Fix ESM4 marker model hiding hack
2024-02-11 04:02:01 +03:00
uramer
c68dee214e
Mouse input engine handlers
2024-02-10 22:56:46 +01:00
Alexei Kotov
3301ebb2cb
Merge branch 'localize_screenshot' into 'master'
...
Localize screenshot messages
See merge request OpenMW/openmw!3843
2024-02-10 13:54:05 +00:00
Alexei Kotov
a54d97669f
Merge branch 'imnotyourpalbuddy' into 'master'
...
Reset friendly hits at the end of combat and don't count hits while in combat
Closes #5755
See merge request OpenMW/openmw!3839
2024-02-09 21:28:04 +00:00
Alexei Kotov
0d1da08493
Set node mask on DebugDrawer
...
Fixes primitive drawing in exteriors/quasiexteriors
2024-02-09 20:50:33 +03:00
Alexei Kotov
f9498e6ea4
Make DebugDrawer a LightManager child, don't use VAO for lines
...
Fixes terrain lighting but currently breaks non-line primitive rendering in exteriors
2024-02-09 20:50:33 +03:00
Alexei Kotov
38ab09a52e
Try to uncursify DebugDrawer scene representation
2024-02-09 20:49:40 +03:00
Evil Eye
7586acc18b
Remove Core from functions that aren't in openmw.core
2024-02-08 16:53:48 +01:00
Andrei Kortunov
525dee00f1
Refraction fog based on water depth (feature 5926)
2024-02-08 18:07:48 +04:00
Alexei Kotov
0178c5aaef
Remove Open action fallback for Tribunal NPC companions
2024-02-08 12:38:20 +03:00
Andrei Kortunov
6760fa4945
Localize screenshot messages
2024-02-08 12:50:12 +04:00
Alexei Kotov
c5564323e4
Correct activation behavior for actors in combat ( #7794 )
...
Stop battle music upon death animation end
2024-02-08 11:47:35 +03:00
Alexei Kotov
6be6f47503
Merge branch 'lua_enchantment_charge_nil' into 'master'
...
Lua Use nil instead of -1 for default enchantment charge
See merge request OpenMW/openmw!3845
2024-02-08 08:25:15 +00:00
elsid
506824cb9d
Cleanup physics callbacks
...
* Do not copy with allocations.
* Remove unused DeepestNotMeContactTestResultCallback.
* Avoid using pointers which should not be nullptr.
* Move constructors implementation to headers.
* Move types defined in .cpp are to unnamed namespace.
* Comment unused arguments.
* Avoid C-style casts.
2024-02-07 22:04:34 +01:00
Evil Eye
5715e6428a
Merge branch 'lua_separate_owner' into 'master'
...
Group owner bindings into a table
See merge request OpenMW/openmw!3841
2024-02-07 19:06:18 +00:00
Evil Eye
f114d409c8
Add get and set birth sign
2024-02-07 19:35:26 +01:00
Evil Eye
f7aa9f8d94
Expose birth signs to Lua
2024-02-07 18:08:06 +01:00
psi29a
557e83d502
Merge branch 'more_move' into 'master'
...
Move action argument
See merge request OpenMW/openmw!3844
2024-02-07 09:18:34 +00:00
uramer
b1773d7e9f
Use nil instead of -1 for default enchantment charge
2024-02-06 17:30:48 +01:00
Andrei Kortunov
a8c219f07c
Move action argument
2024-02-06 14:18:08 +04:00
