Bret Curtis
3ffe773105
fix for macos intel for CI
2023-05-25 23:22:59 +02:00
psi29a
4f919d9239
Merge branch 'fix_element_destroy' into 'master'
...
Fix bug in LuaUi::Element::destroy() that sometimes leads to an infinite loop on UI cleanup
See merge request OpenMW/openmw!3033
(cherry picked from commit 364bc91f5bc6eed2a6
2023-05-21 17:34:13 +00:00
psi29a
0e141dc06e
Merge branch 'fix_navmeshtool_avoid_shape_48' into 'openmw-48'
...
Use different object id for avoid shape (0.48)
See merge request OpenMW/openmw!3019
2023-05-14 15:41:38 +00:00
elsid
227b4d3e5e
Use different object id for avoid shape
...
Otherwise addObject will ignore it as a duplicate and resulting recastmesh will
not match generated by the engine causing navmeshdb cache miss.
2023-05-14 15:00:58 +02:00
psi29a
53f3a5b49b
Merge branch 'fix_local_map_update_48' into 'openmw-48'
...
Update cell local map on different neighbour cells (0.48) (#7140 )
See merge request OpenMW/openmw!3015
2023-05-12 10:31:45 +00:00
elsid
de99c74ef9
Fix integration tests job deps
2023-05-12 00:28:49 +02:00
elsid
ab0a460a6f
Update cell local map on different neighbour cells
2023-05-11 22:55:22 +02:00
psi29a
9dbf2e708b
Merge branch 'lua_casting_48' into 'openmw-48'
...
Fix crash on sol::object type mismatch in invalid Lua script (!2975 for 0.48)
See merge request OpenMW/openmw!2978
2023-05-08 10:10:00 +00:00
Petr Mikheev
d18588dce7
Use LuaUtil::cast for casting sol::object to prevent crashing on type mismatch in Lua scripts.
2023-04-26 00:38:29 +02:00
Petr Mikheev
51cbfa84fa
Add function LuaUtil::cast
2023-04-26 00:27:36 +02:00
psi29a
2d25ffeb89
Merge branch 'openmw-48-patch-50cc' into 'openmw-48'
...
fix broken macos builds
See merge request OpenMW/openmw!2869
2023-03-28 13:15:46 +00:00
psi29a
37df58cc79
fix macos issue
2023-03-28 09:45:56 +00:00
psi29a
ed528c5d70
Update file luascripts.hpp
2023-03-26 11:11:20 +00:00
psi29a
64ca3e71bb
Merge branch 'fix_launcher_paths_48' into 'openmw-48'
...
Save original paths in launcher (#7246 ) for 0.48
See merge request OpenMW/openmw!2849
2023-03-21 10:26:13 +00:00
elsid
80387049c1
Save original paths
...
If directory path is a symlink it should be showed and written to config files
as is. Between launcher runs the resulting canonical path may be different so
the resolved path becomes outdated.
2023-03-21 09:39:28 +01:00
elsid
9f00b99b22
Use set to track visited directories instead of removing duplicates
2023-03-21 09:39:17 +01:00
psi29a
da5376ff3a
Merge branch 'cstemprefs48' into 'openmw-48'
...
!2844 for 0.48
See merge request OpenMW/openmw!2846
2023-03-20 22:39:17 +00:00
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 afa6643c6e5b3e9e15
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 31ae1cd339949b9191
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 fbb00027d83d3cccb8
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 56c8c25a0eccdd381f
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 3979d540b1f729a280
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
