mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 18:45:36 +00:00
Code Issues Releases Wiki Activity
29125 commits 108 branches 66 tags 134 MiB
Commit graph

29125 commits

This branch
This branch
All branches
Author SHA1 Message Date
Evil Eye
47d75c70ea Don't capture temporaries by reference 2023-03-20 22:14:21 +01:00
psi29a
3f19dc62e5 Merge branch '1372_for_048' into 'openmw-48' 
MR 1372 for 0.48. Unbreak boats mods and scripted transformations

See merge request OpenMW/openmw!2841
 2023-03-19 10:04:06 +00:00
fredzio
76c6848121 In 0.46, SetPos was setting position of actors before physics simulation, and from this position movement was simulated. This changed with async physics merging, and at the same time problems started, mostly with abot's scenic travel. 
Skipping the simulation, switching off collisions, and other approaches were not correct as they either broke some mods, or some core mechanics of the engine such as teleportation or waterwalking. As it turns out, the way to go is to simply do _nothing_ (modulo some gymnastics to account for the 1 frame difference in case of async).

Scripted movement and the unstucking logic tends to collide. Early out of unstuck in case the actor doesn't attempt to move. This means there is no AI package for NPC, which are the case for some boats and striders, or the player is content with their position.
 2023-03-18 22:01:55 +01:00
psi29a
f81e78e4c1 Merge branch 'update-appdata-48' into 'openmw-48' 
Update AppData summary to be more concise (for 0.48.0)

See merge request OpenMW/openmw!2828
 2023-03-13 09:35:11 +00:00
Alexander Olofsson
d4fe16415a Update AppData summary to be more concise 
This brings the AppData in line with the Debian package title
 2023-03-12 20:18:50 +01:00
psi29a
fb3a80bebd Merge branch 'openmw-48-stereo-fixes' into 'openmw-48' 
Openmw 48 stereo fixes

See merge request OpenMW/openmw!2815
 2023-03-12 10:53:15 +00:00
Alexei Kotov
e093474ba2 Merge branch '2805-for-48' into 'openmw-48' 
2805 for OpenMW 0.48

See merge request OpenMW/openmw!2817
 2023-03-11 21:07:24 +00:00
Mads Buvik Sandvei
e5582799a2 Empty-Commit to trigger pipeline 2023-03-11 20:11:00 +01:00
AnyOldName3
681026ba1c Ensure shader requirements are pushed at least once for subgraph 
Shaders, if deemed necessary, get attached to the node mentioned by the
top of the requirements stack. Previously an empty stack was incorrectly
assumed to mean no shaders were required, but we found out that was
wrong. We need to put shaders *somewhere*, and the root of the subgraph
we're modifying should be the best place.
 2023-03-11 19:07:19 +00:00
AnyOldName3
c223b214bd Revert "Attach shaders to geometry that lacks a stateset if necessary (bug #7251)" 
This reverts commit d33be39fb6.
 2023-03-11 19:06:33 +00:00
Mads Buvik Sandvei
7d057600ea SkyStereoStatesetUpdater was incorrectly always using reverseZ matrices. 2023-03-11 14:01:11 +01:00
Mads Buvik Sandvei
00e02bb326 Change assosiative order of stereo-related matrix multiplications to reduce FP errors. 2023-03-11 14:00:39 +01:00
Mads Buvik Sandvei
93a72a6368 update OSG multiview build to one that includes missing dll osgdb_dae.dll 2023-03-11 13:56:18 +01:00
psi29a
5c2f4f462e Merge branch 'fix_physics_deadlock_48' into 'openmw-48' 
Do not use std::shared_mutex to wait for job for async physics (0.48)

See merge request OpenMW/openmw!2799
 2023-03-05 20:25:01 +00:00
elsid
2c0e64510c
Do not use std::shared_mutex to wait for job for async physics 
std::shared_mutex in combination with std::condition_variable_any may
lead to a situation when notify_all does not wake up all waiting threads
on Windows. Use separate std::mutex and std::condition_variable to
notify about new job. Encapsulate all workers synchronization logic into
a separate type.
 2023-03-05 18:06:50 +01:00
psi29a
bb3ef08ac5 Merge branch 'maybe-fix-freeze-catcher' into 'master' 
Fix Windows freeze catcher

See merge request OpenMW/openmw!2795

(cherry picked from commit afa6643c6e)

5b3e9e15 Maybe fix Windows freeze catcher
 2023-03-04 13:38:11 +00:00
psi29a
0fb7d93219 Merge branch 'limit_max_bullet_supported_threads' into 'master' 
Limit max bullet supported threads by BT_MAX_THREAD_COUNT - 1

See merge request OpenMW/openmw!2797

(cherry picked from commit 31ae1cd339)

949b9191 Limit max bullet supported threads by BT_MAX_THREAD_COUNT - 1
 2023-03-04 12:43:03 +00:00
psi29a
a6989dcb12 Merge branch 'shadervisitor48' into 'openmw-48' 
Fixes to shader rendering state handling (0.48.0)

See merge request OpenMW/openmw!2783
 2023-03-04 12:41:36 +00:00
psi29a
5dfd2709b7 Merge branch 'fix_clamp_physics_threads' into 'master' 
Fix clamping physics threads

See merge request OpenMW/openmw!2792

(cherry picked from commit fbb00027d8)

3d3cccb8 Fix clamping physics threads
 2023-03-03 21:53:13 +00:00
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