1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00

16661 Commits

Author SHA1 Message Date
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
Zackhasacat
86666761a3 Requested changes 2024-02-08 21:51:54 -06: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
Zackhasacat
4700fdcfc2 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-07 22:06:34 -06: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
psi29a
7793a6d0d9 Merge branch 'modelviewbutnocontroller' into 'master'
Collect string_views when deciding what to preload

See merge request OpenMW/openmw!3816
2024-02-06 09:06:57 +00:00
Zackhasacat
c8eaa5976a Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-05 15:01:59 -06:00
uramer
6792cf02b2 Group owner bindings into a table 2024-02-05 18:48:53 +01:00
Andrei Kortunov
66b2d428c8 Merge branch 'qt_localization' into 'master'
Localize Launcher and Wizard

See merge request OpenMW/openmw!3571
2024-02-05 15:11:42 +00:00
psi29a
76842c3ba1 Merge branch 'more_move' into 'master'
Address Coverity Scan complaints left

See merge request OpenMW/openmw!3837
2024-02-05 13:22:14 +00:00
jvoisin
838785d5a3 Merge branch 'sworc' into 'master'
Make StartCombat a no-op for dead targets and don't always play attack lines

Closes #7769 and #5413

See merge request OpenMW/openmw!3803
2024-02-05 09:48:20 +00:00
Alexei Kotov
a5d88d489b Merge branch 'menu_fixes' into 'master'
Follow up fixes for Lua Menu MR !3464

See merge request OpenMW/openmw!3834
2024-02-05 00:41:11 +00:00
Evil Eye
6c2ddc635d Reset friendly hits at the end of combat and don't count hits while in combat 2024-02-04 21:41:03 +01:00
uramer
02accd7a49 Fix statemanager cleanup setting game state to ended by accident 2024-02-04 11:12:12 +01:00
uramer
8c6a1ae8c0 Allow menu scripts to send global events while a game is loaded 2024-02-04 11:12:11 +01:00
Alexei Kotov
62f2f4a011 Merge branch 'clear_lua_actions' into 'master'
Fix quickload causing a crash with certain Lua queued actions

Closes #7801

See merge request OpenMW/openmw!3833
2024-02-04 07:25:39 +00:00
Andrei Kortunov
292879d0fb Address Coverity Scan complaints left 2024-02-04 08:56:25 +04:00
Zackhasacat
5f9acbd0f0 Add function to replace duplicated code 2024-02-03 13:03:23 -06:00
Zackhasacat
97203f2706 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-03 12:31:34 -06:00
Alexei Kotov
8b47381162 Merge branch 'more_move' into 'master'
Fix some Coverity Scan complaints

See merge request OpenMW/openmw!3829
2024-02-03 17:24:53 +00:00
Zackhasacat
9daf10c305 Remove comment 2024-02-03 10:45:24 -06:00
Zackhasacat
55285b5e57 Fix Global Iteration 2024-02-03 10:43:38 -06:00
uramer
a1970857fd Queue quick loads 2024-02-03 15:18:34 +01:00