psi29a
bbcdac6b18
Merge branch 'fix_mygui_data_manager_includes' into 'master'
...
Add includes for used types and functions (#6744 )
See merge request OpenMW/openmw!1870
2022-05-17 07:28:35 +00:00
psi29a
c19ca8453a
Merge branch 'highp' into 'master'
...
Remove precision qualifiers
See merge request OpenMW/openmw!1871
2022-05-17 07:05:53 +00:00
cody glassman
915eaa4c91
highp is not available in version 120
2022-05-16 16:17:39 -07:00
elsid
5f2e282359
Add includes for used types and functions
2022-05-17 00:58:24 +02:00
Petr Mikheev
668be586cd
Merge branch 'permanent_storage_per_group' into 'master'
...
Move permanentStorage option from settings to groups
See merge request OpenMW/openmw!1868
2022-05-16 21:24:20 +00:00
uramer
14d83b218e
Move permanentStorage option from settings to groups
2022-05-16 21:24:20 +00:00
psi29a
0ca9510224
Merge branch 'fix_gcc_build' into 'master'
...
Fix build on gcc 12.1 (#6744 )
Closes #6744
See merge request OpenMW/openmw!1862
2022-05-16 20:15:09 +00:00
psi29a
3e3cb133bc
Merge branch 'fix_unity_build' into 'master'
...
Fix unity build
See merge request OpenMW/openmw!1860
2022-05-16 20:12:17 +00:00
Alexei Kotov
5110c4a50e
Merge branch 'single_character_changes_are_the_best' into 'master'
...
Fix inverted logic
Closes #6755
See merge request OpenMW/openmw!1866
2022-05-16 17:48:00 +00:00
Alexei Kotov
8140cceb3e
Merge branch 'construct_me_not' into 'master'
...
Address feedback on !1857
See merge request OpenMW/openmw!1865
2022-05-16 16:58:43 +00:00
Evil Eye
2531e24ee3
Fix inverted logic
2022-05-16 18:29:16 +02:00
Petr Mikheev
7ee796b481
Merge branch 'fix_pairs' into 'master'
...
Fix Lua pairs and ipairs
See merge request OpenMW/openmw!1864
2022-05-16 15:52:42 +00:00
Evil Eye
134dc2b21b
Address feedback on !1857
2022-05-16 17:37:55 +02:00
psi29a
f092d8da9a
Merge branch 'post_malone' into 'master'
...
Post Processing
See merge request OpenMW/openmw!1124
2022-05-16 14:51:13 +00:00
uramer
22994af728
Fix Lua pairs and ipairs
2022-05-16 16:32:18 +02:00
elsid
94dc696f4f
Fix gcc build
...
In file included from /home/elsid/dev/openmw/apps/openmw/mwphysics/actor.hpp:7,
from /home/elsid/dev/openmw/apps/openmw/mwphysics/trace.cpp:9:
/home/elsid/dev/openmw/apps/openmw/mwphysics/ptrholder.hpp: In member function ‘osg::Vec3f MWPhysics::PtrHolder::velocity()’:
/home/elsid/dev/openmw/apps/openmw/mwphysics/ptrholder.hpp:42:25: error: ‘exchange’ is not a member of ‘std’
42 | return std::exchange(mVelocity, osg::Vec3f());
| ^~~~~~~~
2022-05-16 15:59:18 +02:00
elsid
c33966c4a4
Fix unity build
...
In file included from /home/elsid/dev/openmw/build/clang/unity/apps/openmw/ub_mwworld.cpp:41:
/home/elsid/dev/openmw/apps/openmw/mwworld/groundcoverstore.cpp:10:9: error: no type named 'Query' in 'MWWorld::EsmLoader'; did you mean '::EsmLoader::Query'?
EsmLoader::Query query;
^~~~~~~~~~~~~~~~
::EsmLoader::Query
/home/elsid/dev/openmw/./components/esmloader/load.hpp:23:12: note: '::EsmLoader::Query' declared here
struct Query
^
2022-05-16 15:04:47 +02:00
psi29a
dd0e0fea72
Merge branch 'lua_strict_index' into 'master'
...
[Lua] makeStrictReadOnly for enums
See merge request OpenMW/openmw!1859
2022-05-16 10:59:20 +00:00
psi29a
50561bc787
Merge branch 'jvoisin-master-patch-82710' into 'master'
...
Make use of Gitlab's SAST
See merge request OpenMW/openmw!1736
2022-05-16 08:45:17 +00:00
psi29a
d8eb9d6818
Merge branch 'smooth_my_nodes' into 'master'
...
Better support BSPArrayController
See merge request OpenMW/openmw!1858
2022-05-16 08:25:18 +00:00
psi29a
65c95d97c3
Merge branch 'disable_navmeshdb_write_on_lock' into 'master'
...
Disable writes to navmeshdb on database is locked error
See merge request OpenMW/openmw!1837
2022-05-16 07:38:12 +00:00
Petr Mikheev
7ccbf95503
[Lua] makeStrictReadOnly for enums
2022-05-16 00:16:26 +02:00
cody glassman
72fdf40e06
better support for particle arrays when spawning at node positions
2022-05-15 13:41:52 -07:00
cody glassman
dae0914820
workarounds for gl4es
2022-05-15 10:03:58 -07:00
cody glassman
205452b482
updates to omwfx documentation
2022-05-15 10:03:58 -07:00
cody glassman
ac6089a430
skip flipping of 3D textures which is unsupported in OSG
2022-05-15 10:03:58 -07:00
cody glassman
0cb63ca4e6
experimental point light bindings
2022-05-15 10:03:58 -07:00
cody glassman
fee639a74f
Correct default value
2022-05-15 10:03:58 -07:00
cody glassman
04843fed6d
moddable post-processing pipeline
2022-05-15 10:03:58 -07:00
uramer
be100749f8
Merge branch 'lua_onframe' into 'master'
...
[Lua] Rename onInputUpdate -> onFrame and call it even when the game is on pause (#6745 )
See merge request OpenMW/openmw!1852
2022-05-15 16:48:38 +00:00
jvoisin
e7fb8b6fd8
Merge branch 'how_do_we_still_have_these_issues' into 'master'
...
Initialize DialInfo::DATAstruct with the proper blank values
Closes #6753
See merge request OpenMW/openmw!1857
2022-05-15 14:09:02 +00:00
Evil Eye
c0cc5feecd
Initialize DialInfo::DATAstruct with the proper blank values
2022-05-15 14:52:44 +02:00
Cody Glassman
07849b7362
Merge branch 'fix_mouse_events' into 'master'
...
Fix a typo
See merge request OpenMW/openmw!1855
2022-05-14 16:05:36 +00:00
uramer
1766f89c4d
Fix a typo
2022-05-14 16:55:11 +02:00
Petr Mikheev
072337c9b8
Merge branch 'settings_styling' into 'master'
...
Styling for Settings
See merge request OpenMW/openmw!1840
2022-05-14 10:27:30 +00:00
uramer
52d05be04b
Styling for Settings
2022-05-14 10:27:30 +00:00
uramer
24d560a872
Merge branch 'ptmikheev-master-patch-77814' into 'master'
...
Fix wrong function name in Lua docs
See merge request OpenMW/openmw!1854
2022-05-14 09:25:12 +00:00
Petr Mikheev
3e343a53d0
Fix wrong function name in Lua docs
2022-05-13 17:47:11 +00:00
Petr Mikheev
0643685ea5
[Lua] Rename onInputUpdate -> onFrame and call it even when the game is on pause ( #6745 )
2022-05-13 19:14:34 +02:00
Petr Mikheev
91c32e65c2
Merge branch 'extra_sweet_roll' into 'master'
...
Add extraRoll to the Lua camera package
Closes #6741
See merge request OpenMW/openmw!1849
2022-05-13 09:58:45 +00:00
uramer
95ad67eb8b
Add extraRoll to the Lua camera package
2022-05-12 23:21:47 +02:00
Evil Eye
4bd2f20979
Merge branch 'rm_environment_cleanup' into 'master'
...
Remove Environment cleanup
See merge request OpenMW/openmw!1846
2022-05-12 17:48:48 +00:00
AnyOldName3
1b5f4f6b36
Merge branch 'fix_default' into 'master'
...
Correct default window mode
See merge request OpenMW/openmw!1847
2022-05-11 23:43:35 +00:00
Cody Glassman
de4a75821e
Correct default window mode
2022-05-11 23:43:35 +00:00
elsid
a710cf6d10
Remove Environment cleanup
...
Some managers may use the environment in the destructors. Setting them to
nullptr may lead to nullptr dereference when the object is still alive and can
be accessible. But after object is destructed it's UB anyway to dereference
nullptr or a dangling pointer.
2022-05-11 23:26:39 +02:00
psi29a
5ff4a15a01
Merge branch 'fix/randomseed' into 'master'
...
Use random seed specified by settings for new games
See merge request OpenMW/openmw!1843
2022-05-11 14:58:39 +00:00
ζeh Matt
926cdfbe19
Use random seed specified by settings for new games
2022-05-11 16:37:16 +03:00
psi29a
2e8f9f471f
Merge branch 'fix_mouse_events' into 'master'
...
Make the documentation clearer, match the documentation when no buttons are pressed for an event
See merge request OpenMW/openmw!1842
2022-05-10 19:33:32 +00:00
uramer
e92c88a133
Make the documentation clearer, match the documentation when no buttons are pressed for an event
2022-05-10 20:00:42 +02:00
elsid
a75c7c49f0
Disable writes to navmeshdb on database is locked error
...
Simultaneously writing to sqlite3 database is not possible. Process exclusively
locks the database for this. Another process will fail to perform any request
when database is locked. Alternatively it can wait. Handling this situation
properly requires complexity that is not really needed. Users are not expected
to run multiple openmw processes simultaneously using the same navmeshdb.
Before this change running multiple openmw processes using the same navmeshdb
can lead to a crash when first transaction fails to start because there is
exception thrown and not catched.
Remove use of explicit transactions from DbWorker. Handling all possible
transaction states due to different errors brings unnecessary complexity.
Initially they were introduced to increase time between flushes to disk. This
makes sense for navmeshtool because of massive number of writes but for the
engine this is not an issue.
2022-05-09 22:54:46 +02:00