1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00

8394 Commits

Author SHA1 Message Date
AnyOldName3
942eeb54c1 Yet another osgpluginchecker rewrite
It turns out that it's possible for OSG plugins to be spread across multiple directories, and OSG doesn't account for this in osgDB::listAllAvailablePlugins(), even though it works when actually loading the plugin.

Instead, use code that's much more similar to how OSG actually loads plugin, and therefore less likely to miss anything.

Incidentally make things much simpler as we don't need  awkwardness from working around osgDB::listAllAvailablePlugins()'s limitations.
2024-03-12 23:30:11 +00:00
uramer
b12f98db98 Don't destroy root widget for new elements 2024-03-12 17:48:42 +01:00
elsid
859d765921
Use normalized path for NifFileManager::get 2024-03-11 22:07:37 +01:00
elsid
3ea3eeb613
Use string_view for canOptimize 2024-03-11 22:07:37 +01:00
elsid
a98ce7f76a
Replace std::filesystem::path by std::string_view in Files::getHash argument 2024-03-11 22:07:37 +01:00
elsid
79b73e45a1
Replace std::filesystem::path by std::string and std::string_view in nif code
It's used only for error reporting.
2024-03-11 22:07:37 +01:00
elsid
cd3c3ebadb
Use VFS::Path::Normalized for ResourceManager cache key 2024-03-11 22:07:36 +01:00
psi29a
b5b6744321 Merge branch 'hotfix_ui_update' into 'master'
Fix Lua UI updates

See merge request OpenMW/openmw!3936
2024-03-11 11:14:26 +00:00
psi29a
3cb8d05fe5 Merge branch 'vfs_normalized_path_4' into 'master'
Use VFS::Path::Normalized in few more places

See merge request OpenMW/openmw!3934
2024-03-11 07:29:55 +00:00
AnyOldName3
0730dc2ebb Get OSG to tell us the plugin filenames it's going to use
That way, we don't have issues like the checker getting false positives when the right plugins are present for the wrong OSG version or build config, or false negatives when we've generated the wrong filenames.
2024-03-10 18:04:38 +00:00
uramer
af8662daee Detach Lua Elements properly from their parent 2024-03-10 14:05:37 +01:00
uramer
0f60052bb8 Set Element state in Element::create 2024-03-09 22:27:10 +01:00
psi29a
6f9ceff3f3 Merge branch 'windows_build' into 'master'
Add option to disable precompiled headers

See merge request OpenMW/openmw!3933
2024-03-09 09:48:57 +00:00
elsid
cc35df9409
Use VFS::Path::Normalized for fx::Technique file path 2024-03-09 00:21:17 +01:00
elsid
ffbeb5ab98
Build localization path using VFS::Path::Normalized 2024-03-09 00:21:17 +01:00
elsid
84adb0a148
Make VFS::Path::Normalized constructor from std::string_view explicit 2024-03-09 00:21:16 +01:00
psi29a
a926f4a5a9 Merge branch 'alt_tab_fix' into 'master'
Do not treat Alt-Tab as resolution change

Closes #7866

See merge request OpenMW/openmw!3931
2024-03-08 08:41:55 +00:00
psi29a
f09f5c644c Merge branch 'update_setting_pages' into 'master'
Optimize setting group rendering

See merge request OpenMW/openmw!3929
2024-03-08 08:39:49 +00:00
AnyOldName3
e0b13f0858 Ensure default config values are present
Moving builtin.omwscripts out of the root openmw.cfg means we actually might need to use the defaults, so need to have some.
2024-03-08 01:44:47 +00:00
elsid
5859fd464c
Add option to disable precompiled headers
To be able to use ccache.

Also fix compilation errors appeared due to absence of precompiled
headers.
2024-03-08 02:11:51 +01:00
Andrei Kortunov
5dcac4c48f Do not treat Alt-Tab as resolution change (bug 7866) 2024-03-07 15:43:35 +04:00
AnyOldName3
36f5c819bb capitulate 2024-03-07 01:48:16 +00:00
AnyOldName3
243b5b6666 Hopefully convince the old MSVC version on GitLab CI to work
The old code was legal, and the things it did worked in other places, so should have worked here, too.

Hopefully just rearranging stuff convinces what I assume to be a compiler bug to not happen.
2024-03-06 23:52:16 +00:00
AnyOldName3
ed23f48754 Actually erase the things we're removing
Caused by bad copy and paste
2024-03-06 23:44:24 +00:00
uramer
9ae61f1932 Fix child UI Elements created in the same frame as parent 2024-03-06 23:16:02 +01:00
elsid
5acfb07850
Fix build with OSG_USE_UTF8_FILENAME 2024-03-06 20:51:48 +01:00
Evil Eye
1499dd2654 Add getCompositeSize and handle NPC data 2024-03-06 18:16:55 +01:00
AnyOldName3
bf24bb71b1 Explicitly use std::strong_ordering
Otherwise it's ambiguous how to build <=> from <, == and >
2024-03-06 01:23:51 +00:00
AnyOldName3
1ae2cc82a1 I do not know how this escaped formatting locally. 2024-03-06 00:46:01 +00:00
AnyOldName3
a130ca57a4 Track source of settings
This one's a biggie.

The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.

This had fairly wide-reaching implications.

The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.

Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.

Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.

One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
2024-03-06 00:36:13 +00:00
psi29a
231b5753e4 Merge branch 'launcher_help_version' into 'master'
Open matching version of documentation for Launcher Help

See merge request OpenMW/openmw!3909
2024-03-05 09:24:52 +00:00
psi29a
e340b06411 Merge branch 'get-glextensions-properly' into 'master'
Get the GLExtensions instance when a context is created

Closes #7351

See merge request OpenMW/openmw!3022
2024-03-04 15:05:23 +00:00
psi29a
61f5a13c02 Merge branch 'check-osg-plugins' into 'master'
Check for dynamic OSG plugins on launch

Closes #7736

See merge request OpenMW/openmw!3748
2024-03-04 08:00:16 +00:00
Evil Eye
cef59e8928 Replace fixed size writeHNT calls with decomposition 2024-03-03 19:39:19 +01:00
Evil Eye
958f70736f Implement auto calculated potion values 2024-03-02 12:45:48 +01:00
AnyOldName3
b8cb757ca4 Oopsie 2024-02-29 00:01:14 +00:00
AnyOldName3
9e1334cc09 Resync composing and path openmw.cfg settings with options.cpp 2024-02-28 23:49:55 +00:00
psi29a
be1e77c282 Merge branch 'fix-git-commit-updating' into 'master'
Fix git commit updating

See merge request OpenMW/openmw!3911
2024-02-28 20:37:28 +00:00
psi29a
03d5872a55 Merge branch 'drop_on_exit' into 'master'
Add a storage mode to drop section on game exit

See merge request OpenMW/openmw!3905
2024-02-28 20:36:40 +00:00
AnyOldName3
d111b4bbd9 Handle built-in content files in content model
There's also handling for files declared as originating from a lower-priority openmw.cfg, e.g. anything in the local config or any intermediate ones, as they can't be disabled or reordered.
There's no way to mark such files yet, but the logic's the same as built-in files, so everything will be fine once that's set up.
2024-02-28 00:58:30 +00:00
Andrei Kortunov
ddd0945645 Add a storage mode to drop section on game exit 2024-02-27 23:26:22 +04:00
Mads Buvik Sandvei
c82c111ee1 Use correct index for Athletics_SwimOneSecond 2024-02-27 19:28:51 +01:00
AnyOldName3
f476301670 There's no such thing as the global data directory
That's what resources/vfs is for.
2024-02-27 14:11:48 +00:00
AnyOldName3
7d28788aee data-local is already unquoted when it's read 2024-02-27 02:14:31 +00:00
AnyOldName3
dbdecfe94b Use approved safety comment for path escaping explanation
I thought I'd got this one already
2024-02-27 01:41:12 +00:00
AnyOldName3
90966ecc47 Handle replace= lines properly in the launcher 2024-02-27 01:39:49 +00:00
AnyOldName3
626f438dcc Make builtin.omwscripts actually mandatory
Previously it was quasi-mandatory - lots of things would add it, e.g. when running openmw through the CS, but it could technically be disabled.

Now it's treated like the resources/vfs directory and implicitly added by the engine etc.
2024-02-27 01:09:46 +00:00
Alexei Kotov
46f863a32e Merge branch 'help-i-cant-swim' into 'master'
Fix(editor): Don't save dirty water height values

Closes #7841

See merge request OpenMW/openmw!3881
2024-02-26 21:50:50 +00:00
psi29a
619ccf7107 Merge branch 'decomposition' into 'master'
Use decompose to remove more instances of pragma pack

See merge request OpenMW/openmw!3906
2024-02-26 11:23:17 +00:00
psi29a
f2039b35d0 Merge branch 'vfs_normalized_path_3' into 'master'
Use normalized path for correctSoundPath

See merge request OpenMW/openmw!3903
2024-02-26 11:21:33 +00:00