1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:23:54 +00:00
Commit graph

29156 commits

Author SHA1 Message Date
Alexei Dobrohotov
ed44095cdc Use Rig/MorphGeometry state for its child geometry 2023-03-03 23:13:46 +03:00
Alexei Dobrohotov
d33be39fb6 Attach shaders to geometry that lacks a stateset if necessary (bug #7251) 2023-03-03 23:13:46 +03:00
psi29a
a7116aacbc Merge branch 'helios-stop-blinking' into 'openmw-48'
!2768 for 0.48.0

See merge request OpenMW/openmw!2793
2023-03-03 19:00:49 +00:00
Cody Glassman
7fb4acaaf2 fix sunglare flash, make sure all bound render targets have color masks set 2023-03-03 20:43:43 +03:00
psi29a
7a52b9d1d8 Merge branch 'kantoniak/lua-docs-fixes' into 'master'
Apply minor fixes to Lua documentation

See merge request OpenMW/openmw!2785

(cherry picked from commit 56c8c25a0e)

ccdd381f Minor fixes to Lua documentation
2023-03-01 21:08:03 +00:00
psi29a
66bd283d4b Merge branch 'fix_7210_48' into 'openmw-48'
!2737 for 0.48 (fixes #7210)

See merge request OpenMW/openmw!2780
2023-02-28 19:33:45 +00:00
Petr Mikheev
47df1ca1f8 !2737 for 0.48 (fixes #7210) 2023-02-28 19:24:52 +01:00
psi29a
56d9758af2 Merge branch 'silicon_fix' into 'master'
Fix executable for silicon builds

See merge request OpenMW/openmw!2767

(cherry picked from commit 3979d540b1)

f729a280 Fix executable for silicon builds
2023-02-28 08:48:22 +00:00
psi29a
2f6a809d18 Merge branch 'fix_lua_48' into 'openmw-48'
Merge !2661, !2687, !2733, !2770, !2774 to openmw-48 (fixes #7128)

See merge request OpenMW/openmw!2778
2023-02-28 08:34:19 +00:00
Petr Mikheev
ae23daf82d [Lua] Fix memory leak in sandboxed "require" (!2774 for 0.48). 2023-02-27 23:44:00 +01:00
uramer
e476cb24e7 Add a note in the docs (!2770 for 0.48) 2023-02-27 23:44:00 +01:00
uramer
ed5e0ff4f3 Set Element layout to nil on destroy (!2770 for 0.48) 2023-02-27 23:44:00 +01:00
Petr Mikheev
95219e6fa2 Fix bug in lua_ui/content.lua: getmetatable(ui.content{}) shouldn't return a global mutable table (!2733 for 0.48) 2023-02-27 23:44:00 +01:00
Petr Mikheev
1540c9679f Don't expose LuaUtil::Callback to lua (!2733 for 0.48) 2023-02-27 23:44:00 +01:00
Petr Mikheev
628017a817 Move asyncpackage from apps/openmw/mwlua to components/lua (!2733 for 0.48) 2023-02-27 23:44:00 +01:00
Bret Curtis
e206081d86 make sure lua works with macos packages (!2687 for 0.48) 2023-02-27 22:20:10 +01:00
uramer
4b2ef32b86 Move implementation of UI Content to Lua (!2661 for 0.48) 2023-02-27 22:17:04 +01:00
psi29a
15236faf03 Merge branch 'openal48' into 'openmw-48'
!2748 for 0.48

See merge request OpenMW/openmw!2772
2023-02-26 20:59:19 +00:00
Evil Eye
c2d6c29028 Bump OpenAL to 1.23.0 on Windows 2023-02-26 16:27:51 +01:00
psi29a
d95a03a8ba Merge branch 'fix_7223' into 'master'
Fix #7223

Closes #7223

See merge request OpenMW/openmw!2736

(cherry picked from commit a43b6fba4b)

0c3237ad Fix #7223
2023-02-18 22:36:16 +00:00
psi29a
c9eb08dbc3 Merge branch 'took_an_arrow_to_the_disposition_cap48' into 'openmw-48'
!2734 for 0.48

See merge request OpenMW/openmw!2735
2023-02-14 21:16:51 +00:00
Evil Eye
8e73d49602 Cap temporary disposition gain and compute permanent changes accordingly 2023-02-14 20:32:54 +01:00
psi29a
6622e9df5b Merge branch 'fix_physics_locking_48' into 'openmw-48'
Use shared locks in physics system when using multithreaded bullet (#7218) (0.48)

See merge request OpenMW/openmw!2727
2023-02-12 17:00:10 +00:00
elsid
09199ea006
Use shared locks in physics system when using multithreaded bullet 2023-02-12 15:02:41 +01:00
psi29a
e0a25e02f0 Merge branch 'postprocesshud48' into 'openmw-48'
Improve post-process HUD search field usability (0.48.0)

See merge request OpenMW/openmw!2718
2023-02-11 10:50:20 +00:00
Alexei Kotov
3ab719f5a6 Improve post-process HUD search field usability (0.48.0) 2023-02-11 03:12:17 +03:00
psi29a
1dc71a133e Merge branch 'ingredientbindings48' into 'openmw-48'
Fix Lua ingredient bindings (0.48.0)

See merge request OpenMW/openmw!2707
2023-02-10 07:45:11 +00:00
Alexei Kotov
15df41f459 Fix Lua ingredient bindings 2023-02-10 02:56:20 +03:00
psi29a
3dd8fd2ef9 Merge branch 'handle_bad_navmeshtool_message_magic_48' into 'openmw-48'
Stop updating navmeshtool progress on first bad message (0.48)

See merge request OpenMW/openmw!2660
2023-02-02 09:38:27 +00:00
psi29a
7211779889 Merge branch 'fix_gpu_osg_stats' into 'master'
Delay OSG stats reporting for 3 frames

See merge request OpenMW/openmw!2677

(cherry picked from commit 9c92a8ab57)

96ea1903 Delay OSG stats reporting for 3 frames
2023-02-01 22:49:34 +00:00
psi29a
41b5ddf010 Merge branch 'lost_archives48' into 'openmw-48'
Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d

See merge request OpenMW/openmw!2673
2023-02-01 16:42:52 +00:00
Evil Eye
b24ea17301 Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d 2023-02-01 16:36:37 +01:00
psi29a
4c5d03c5e5 Merge branch 'changelogforanilayer' into 'openmw-48'
Changelog for osga-animation layering

See merge request OpenMW/openmw!2666
2023-01-30 13:25:48 +00:00
unelsson
8d5edacffd Changelog for osga-animation layering 2023-01-30 00:53:47 +02:00
psi29a
f3f65c87d6 Merge branch 'docs_fix' into 'openmw-48'
Remove accidental copy-paste in global.doclua

See merge request OpenMW/openmw!2653
2023-01-29 11:28:19 +00:00
elsid
f23866be90
Stop updating navmeshtool progress on first bad message 2023-01-27 19:12:57 +01:00
uramer
a3a5a227ad Remove accidental copy-paste in global.doclua 2023-01-27 18:31:04 +01:00
psi29a
37152b4917 Merge branch 'no_teleporting_before_you_eat_your_veggies48' into 'openmw-48'
!2631 for 0.48

See merge request OpenMW/openmw!2633
2023-01-21 22:42:29 +00:00
Evil Eye
c1b9a91877 Delay teleportation till the menu is closed 2023-01-19 20:11:35 +01:00
psi29a
e30d5a5a35 Merge branch 'safely_on_the_other_side_of_the_door_48' into 'openmw-48'
!2619 for 0.48

See merge request OpenMW/openmw!2622
2023-01-15 21:04:53 +00:00
Evil Eye
bb36155a54 End combat when the target is outside the active grid 2023-01-15 19:54:54 +01:00
psi29a
e6b6f2ced6 Merge branch 'cuphead48' into 'openmw-48'
Regression fixes for animation-less knockout [0.48]

See merge request OpenMW/openmw!2590
2023-01-07 22:19:06 +00:00
Alexei Kotov
d327e92d7f Don't cancel animation-less knockout 2023-01-07 23:05:03 +03:00
psi29a
eebaf2b61e Merge branch 'fix_hour_modulo_48' into 'openmw-48'
Fix hour modulo expression (#7121) for 0.48

See merge request OpenMW/openmw!2560
2022-12-29 23:26:26 +00:00
Alexei Kotov
98997d893f Merge branch 'bug-fix-7116-openmw48' into 'openmw-48'
Connect zoom in/out only when the option is allowed

See merge request OpenMW/openmw!2559
2022-12-29 22:14:20 +00:00
elsid
9c34ef8720
Fix hour modulo expression
Round result of std::fmod(hours, 24) to the nearest float below 24 on double to
float conversion when it is not. Add special type and conversion function along
with tests to be used in all places where such conversion happens.

To avoid producing hours equal to 24 due to double to float precision loss.
2022-12-29 22:09:56 +01:00
Cédric Mocquillon
30e2ea2951 Connect zoom in/out only when the option is allowed 2022-12-29 21:29:39 +01:00
psi29a
01be3d16b2 Merge branch 'classless48' into 'openmw-48'
!2552 for 0.48

See merge request OpenMW/openmw!2554
2022-12-27 13:16:22 +00:00
Evil Eye
7d97ca6cd5 Don't call getClass on an empty Ptr 2022-12-27 10:09:45 +01:00
psi29a
5b56fe8d0d Merge branch 'drippy-48' into 'openmw-48'
!2537 for 0.48

See merge request OpenMW/openmw!2545
2022-12-19 23:28:47 +00:00