mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 21:41:04 +00:00
Code Issues Projects Releases Wiki Activity
30,412 Commits 17 Branches 68 Tags
Commit Graph

6686 Commits

Author SHA1 Message Date
psi29a
944931c9bf Merge branch 'load_esm4_lights' into 'master' 
Adds ESM4 light into ESM4 Cells

See merge request OpenMW/openmw!2692
 2023-02-07 16:50:10 +00:00
florent.teppe
486d15b19e moved light common to its own file 
moved esm4light to it's own file
 2023-02-07 16:29:17 +01:00
florent.teppe
dc961e3189 Adds the light into the scene. 
Common struct for ESM3 and ESM4 light
 2023-02-07 10:07:59 +01:00
elsid
627bed09ee
Remove redundant operator<< overloads from Log 2023-02-06 21:18:35 +01:00
psi29a
a0795ba7ae Merge branch 'launch_fix' into 'master' 
Fix some non-ASCII path issues

Closes #6817

See merge request OpenMW/openmw!2686
 2023-02-06 19:50:30 +00:00
florent.teppe
a71a86e64a Load light models in the engine. Doesn't emit light 2023-02-06 20:22:17 +01:00
psi29a
15b3af92df Merge branch 'macos_lua_fix' into 'master' 
make sure lua works with macos packages

See merge request OpenMW/openmw!2687
 2023-02-06 18:53:19 +00:00
psi29a
4f001d8736 Merge branch 'qt6' into 'master' 
Add an initial Qt6 support

See merge request OpenMW/openmw!2684
 2023-02-06 16:55:20 +00:00
Andrei Kortunov
7e2aedf637 Add an initial Qt6 support 2023-02-06 18:38:59 +04:00
Bret Curtis
a708fb4a5c make sure lua works with macos packages 2023-02-06 14:35:22 +01:00
Andrei Kortunov
8925f854e7 Fix non-ASCII path logging 2023-02-06 15:12:24 +04:00
Andrei Kortunov
5836d27928 Fix ContentSelector usage with non-ASCII paths 2023-02-06 13:36:02 +04:00
psi29a
4032c447e9 Merge branch 'load-ESM4-Cell' into 'master' 
Can load and coc into an interrior oblivion cell

See merge request OpenMW/openmw!2647
 2023-02-06 08:56:23 +00:00
glassmancody.info
e778ffee9b po2 scaling for average luminance 2023-02-05 12:30:38 -08:00
elsid
e92ada09af
Replace QRegExp by QRegularExpression 2023-02-05 13:30:26 +01:00
AnyOldName3
80d6f6bc97 Add line break that clang-format wanted 2023-02-05 02:07:00 +00:00
AnyOldName3
0edc8fc77d Don't use FFP-friendly texture image units for shadow maps 
This more-or-less gets rid of the shadow system's only depencency on FFP
stuff. All that remains is it using OSG cameras, which OSG provides a
uniform-based implementation of, too, which we can trivially migrate to.

This should mean we're not eating any of the ~8 FPP-friendly texture
units, which is good as Morrowind models can use all of those on their
(although they very rarely do), and instead use some of the ~160
shader-only texture image units. This just requires not calling
glEnable(GL_TEXTURE_2D), accomplished by changing
setTextureAttributeAndModes to setTextureAttribute.

Also changes from using glTexGen and its eye plane matrices to pass the
shadow space matrix for each light to explicit uniforms. Thankfully, the
maths was a simple combination of the valid region matrix and eye plane
matrix maths.

As of this commit, I believe this kills shadows in one eye for stereo
rendering.
 2023-02-05 00:40:33 +00:00
psi29a
aee7716c3a Merge branch 'launcher_typed_settings' into 'master' 
Typed launcher settings

See merge request OpenMW/openmw!2650
 2023-02-04 23:41:59 +00:00
florent.teppe
084207af64 Avoids a lot a special cases for ESM3 vs ESM4 cells. 2023-02-04 23:25:06 +01:00
florent.teppe
1caed2de2a Applies some review comments. 
Proper visit for ESM::CellVariant

Fixed MWWorldCell constructor
 2023-02-04 17:09:54 +01:00
elsid
f1dbd9b959
Fix -Wduplicated-branches warnings 2023-02-04 00:10:30 +01:00
elsid
c79c14da91
Fix -Wnon-virtual-dtor warnings 2023-02-03 23:00:09 +01:00
psi29a
00978ed7a4 Merge branch 'wherefore_art_thou_horatius' into 'master' 
Fix global variable replacement in dialogue

Closes #7197

See merge request OpenMW/openmw!2675
 2023-02-01 23:38:32 +00:00
psi29a
68b3b90255 Merge branch 'ui_content_leak' into 'master' 
Move implementation of UI Content to Lua (#7155)

See merge request OpenMW/openmw!2661
 2023-02-01 22:51:47 +00:00
Evil Eye
8d2b5ed8ee Combine initializer_lists 2023-02-01 22:27:22 +01:00
Evil Eye
d3bc79e9b2 Reduce code duplication 2023-02-01 21:57:50 +01:00
Evil Eye
32ac7406ab Fix global variable replacement in dialogue 2023-02-01 17:49:11 +01:00
Evil Eye
571e11cd42 Restore 0936d716d96cd45b3efc2d1a3697614f7f96952d 2023-02-01 17:26:39 +01:00
uramer
e96681151c Get rid of the LuaUI::Content namespace 2023-02-01 17:18:50 +01:00
uramer
d24c506b0e Move metatable protection asserts to tests 2023-02-01 16:34:32 +01:00
uramer
2a35bae655 Use range_error for invalid indexes 2023-02-01 16:24:58 +01:00
uramer
fb0646dda1 Remove Ui Content counter in Lua profiler 2023-01-31 19:52:28 +01:00
uramer
bbbef96087 Switch to loadInternalLib 2023-01-31 19:50:33 +01:00
uramer
c7b0c0a406 Protecd UI Content's metatable 2023-01-30 23:22:18 +01:00
florent.teppe
4e7cde5d72 applied some review changes. 
crashfix tests
 2023-01-30 20:49:34 +01:00
psi29a
92f88c16a9 Merge branch 'remove-strerror' into 'master' 
Remove strerror usages

Closes #7151

See merge request OpenMW/openmw!2664
 2023-01-30 17:09:39 +00:00
psi29a
bc90636316 Merge branch 'fix-7117' into 'master' 
Replace boost::scoped_array with std::vector

Closes #7117

See merge request OpenMW/openmw!2662
 2023-01-30 14:12:04 +00:00
psi29a
ef0a81e811 Merge branch 'integration_tests_crash_log' into 'master' 
Use proper log paths and print crash log in integration tests CI job

See merge request OpenMW/openmw!2668
 2023-01-30 12:12:21 +00:00
Petr Mikheev
3096111abb Merge branch 'docs_fixes' into 'master' 
Documentation and API fixes (part of !2529)

See merge request OpenMW/openmw!2649
 2023-01-30 10:13:26 +00:00
uramer
c17eedd348 Documentation and API fixes (part of !2529) 2023-01-30 10:13:26 +00:00
elsid
c44bc5ade5
Setup logging with properly initialized configuration manager 
Default constructed instance may provide different paths from initialized one.
 2023-01-30 09:30:55 +01:00
elsid
007ad4e4d1
Write crash log to temporary directory 
To make sure current user has rights to do so.
 2023-01-30 09:30:55 +01:00
Andrzej Głuszak
9b0a499b58 Remove strerror usages 2023-01-29 22:41:59 +01:00
Andrzej Głuszak
c9e5f0208d Replace boost::scoped_array with std::vector 2023-01-29 20:40:07 +01:00
uramer
259f104311 Clean up 2023-01-29 19:40:13 +01:00
uramer
749c89e26e Add missing to_string 2023-01-29 19:28:54 +01:00
uramer
3618b3f409 Fix Content::View::remove 2023-01-29 18:52:18 +01:00
uramer
fc1430af95 Move implementation of UI Content to Lua 2023-01-29 17:07:38 +01:00
psi29a
3a9a60a453 Merge branch 'esmtool_esm4_globals' into 'master' 
Support more fields in esmtool for ESM4

See merge request OpenMW/openmw!2659
 2023-01-29 11:30:01 +00:00
florent.teppe
ebfee18e35 implements std::visit for CellVariant, fixes struct vs class forward decl 2023-01-29 11:28:39 +01:00