1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 21:29:56 +00:00
Commit graph

22167 commits

Author SHA1 Message Date
Zackhasacat
4ca13a9404 Verify the player 2024-04-06 18:17:51 -05:00
Zackhasacat
5856bc8a0e Add setCrimeLevel 2024-04-06 18:13:51 -05:00
Sam Hellawell
36cccef606 Fix formatting 2024-04-05 23:43:59 +01:00
psi29a
8e1d790919 Merge branch 'widgets_rework' into 'master'
Make widgets more vanilla-friendly

Closes #7875 and #7914

See merge request OpenMW/openmw!3941
2024-04-05 06:33:53 +00:00
Sam Hellawell
a51d560174 Move bone rename logic to ColladaDescriptionVisitor, undo formatting/refactoring 2024-04-05 01:59:40 +01:00
Alexei Kotov
f2e0129436 Convert water/ripple defines to camelCase 2024-04-04 21:12:47 +03:00
Sam Hellawell
ceabeab0fd Fix RotateController not updating skeleton 2024-04-04 00:11:15 +01:00
Sam Hellawell
2288a691d2 Replace osgAnimation bone underscore naming at load time, map bone instances, reset root bone transform each frame 2024-04-04 00:10:51 +01:00
Alexei Kotov
3380b806de Merge branch 'haggleraven' into 'master'
Remove superfluous Trading class

See merge request OpenMW/openmw!3996
2024-04-03 18:21:02 +00:00
Alexei Kotov
dfdd7aa684 Always queue movement even when there's none 2024-04-03 21:16:47 +03:00
Alexei Kotov
5e99545b9c Don't discard stagger/KO animation movement 2024-04-03 21:11:49 +03:00
uramer
3b930e4471 Restore !613 2024-04-03 07:12:53 +00:00
Andrei Kortunov
1b544b93d2 Do not allow to move resizable windows outside of game window 2024-04-02 11:40:21 +04:00
Andrei Kortunov
939760007e Resize console window on resolution change, not reset it 2024-04-02 11:40:21 +04:00
psi29a
99fa1278d2 Merge branch 'codenames' into 'master'
Make binding names layout-independent

See merge request OpenMW/openmw!3993
2024-04-02 07:36:45 +00:00
psi29a
b83ffdc357 Merge branch 'i-have-value-too' into 'master'
FIX(CS): Re-add gold value column for objects

See merge request OpenMW/openmw!3991
2024-04-02 07:34:51 +00:00
psi29a
46bf6c12b6 Merge branch 'equipunequipwhatsthedifference' into 'master'
Allow weapon equip/unequip animations to intersect (#7886)

Closes #7886

See merge request OpenMW/openmw!3951
2024-04-02 07:34:31 +00:00
psi29a
a7c6297240 Merge branch 'sorewaai' into 'master'
Expose AI stats to Lua

Closes #7860

See merge request OpenMW/openmw!3997
2024-04-01 20:49:38 +00:00
Dave Corley
7a291e5025 FIX(CS): Re-add gold value column for objects 2024-03-31 05:34:11 -05:00
Evil Eye
cb357997c9 Copy DIAL type to INFO when saving 2024-03-30 14:36:45 +01:00
psi29a
3da6b4f529 Merge branch 'more_stats' into 'master'
Report more stats in F4

See merge request OpenMW/openmw!3956
2024-03-30 08:41:29 +00:00
Evil Eye
d08e47bc40 Expose AI stats to Lua 2024-03-29 22:34:53 +01:00
Evil Eye
f70bf42a9e Remove superfluous Trading class 2024-03-29 21:50:45 +01:00
elsid
215404e126
Report more stats from caches 2024-03-29 14:25:39 +01:00
elsid
ae41ebfc83
Report CellPreloader stats 2024-03-29 14:05:26 +01:00
elsid
9a24e77d3f
Show F4 stats in pages 2024-03-29 14:05:25 +01:00
Andrei Kortunov
3d83585c46 Make binding names layout-independent (bug 7908) 2024-03-29 12:02:06 +04:00
Alexei Kotov
76105cc2d1 Make sunlight scattering and wobbly shores optional 2024-03-29 10:41:04 +03:00
Alexei Kotov
359600db83 Merge branch 'im-not-taking-you-anywhere' into 'master'
Fix #7901, make teleport fields non-interactive when mTeleport is false

Closes #7901

See merge request OpenMW/openmw!3986
2024-03-29 03:48:18 +00:00
psi29a
2056da358d Merge branch 'opencs-projectile-speed' into 'master'
OpenMW-CS: Editing and verifying of projectile speed for magic effects

See merge request OpenMW/openmw!3939
2024-03-28 09:04:50 +00:00
Dave Corley
b8a17b16f7 Cleanup(CS): Make TeleportColumn take flags as argument 2024-03-27 17:53:23 -05:00
Dave Corley
4e59246d2d Fix(columnimp.hpp): Use QVariant() constructor instead of UserType to
hide unused subs from view and make a member variable to tell if the
column is used for a door or a regular position
2024-03-27 17:53:23 -05:00
Dave Corley
1360eeb839 Fix #7901, make teleport fields non-interactive when mTeleport is false 2024-03-27 17:53:12 -05:00
AnyOldName3
47ef2d018f Always set userrole for archive list 2024-03-27 22:25:32 +00:00
psi29a
e8038d353f Merge branch 'esmstuff' into 'master'
Use more decomposition, string_view, and implicit sizes in ESM code

See merge request OpenMW/openmw!3975
2024-03-27 19:40:18 +00:00
psi29a
3fcf3aca77 Merge branch 'modalsettingsmodal' into 'master'
Reimplement the Settings window as a normal window (#7845, #7870)

Closes #7845 and #7870

See merge request OpenMW/openmw!3895
2024-03-27 17:59:41 +00:00
AnyOldName3
e735bf67e1 Brace-initialise SettingValue
Clang didn't like it otherwise
2024-03-27 14:04:08 +00:00
AnyOldName3
a98a824f80 Config paths to info log, not verbose 2024-03-27 13:58:36 +00:00
Sam Hellawell
e87c39eeb3 OpenCS: Editing and verifying of projectile speed for magic effects 2024-03-27 09:26:03 +00:00
psi29a
f7f7502d60 Merge branch 'i-said-it-was-unlocked-damn-you' into 'master'
Fix(CS): Actually allow unlocking doors ( #7899 )

Closes #7899

See merge request OpenMW/openmw!3982
2024-03-27 07:32:53 +00:00
Dave Corley
2e68786331 Fix(CS): Actually allow unlocking doors ( #7899 ) 2024-03-27 07:32:53 +00:00
psi29a
b70f1d86c5 Merge branch 'fix-sheathing-non-nifs' into 'master'
Fix weapon and shield sheathing for non-nif meshes

See merge request OpenMW/openmw!3985
2024-03-27 07:30:14 +00:00
AnyOldName3
59334f694d Don't forget to add path to UserRole 2024-03-26 23:11:54 +00:00
psi29a
58632218fb Merge branch 'you-can-only-grow-up-to-be-so-big' into 'master'
FIX(CS): Limit scale for references to TES3 values (Close #7898 )

Closes #7898

See merge request OpenMW/openmw!3981
2024-03-26 09:05:21 +00:00
psi29a
c8560c63eb Merge branch 'regressionfixesofdubiousauthenticity' into 'master'
Rendering regression fixes of dubious authenticity (#7587, #7720)

Closes #7587 and #7720

See merge request OpenMW/openmw!3979
2024-03-26 09:04:41 +00:00
Sam Hellawell
7897ff7ac9 Fix weapon sheathing for non-nif meshes 2024-03-25 21:03:59 +00:00
psi29a
012d10703f Merge branch 'spellcast-refactor' into 'master'
Spellcast related Lua API + spellcasting/activespell refactor

See merge request OpenMW/openmw!3922
2024-03-25 13:50:23 +00:00
Mads Buvik Sandvei
320d8ef014 Spellcast related Lua API + spellcasting/activespell refactor 2024-03-25 13:50:23 +00:00
psi29a
e62089d102 Merge branch 'lua_records_fix' into 'master'
Lua: Standardize record stores

See merge request OpenMW/openmw!3523
2024-03-25 13:46:24 +00:00
Zackhasacat
6d529835ae Lua: Standardize record stores 2024-03-25 13:46:23 +00:00
psi29a
628480357b Merge branch 'soumd_followup' into 'master'
Modify sound API permissions

See merge request OpenMW/openmw!3952
2024-03-25 13:45:37 +00:00
psi29a
ef5314c247 Merge branch 'herebedragons' into 'master'
Exterior cell naming corrections

See merge request OpenMW/openmw!3976
2024-03-25 13:45:12 +00:00
psi29a
666d2835ab Merge branch 'mgefverify' into 'master'
Use the right ID for magic effect verifier messages (#7894)

Closes #7894

See merge request OpenMW/openmw!3971
2024-03-25 13:44:38 +00:00
AnyOldName3
0e2f28156d Restore logging of openmw.cfg paths in launcher
Removed here https://gitlab.com/OpenMW/openmw/-/merge_requests/2650/diffs#be09c16519a3f26f4306b920c50e0e4215dffaee_329_328
2024-03-24 23:48:37 +00:00
Dave Corley
c59d097ab2 FIX(#7898): Limit scale for references TES3 values 2024-03-24 16:37:48 -05:00
Alexei Kotov
d7257e056c Merge branch 'remove-unused-regionmap-constructor' into 'master'
Minor cleanup: Remove unused regionmap CellDescription constructor

See merge request OpenMW/openmw!3973
2024-03-24 13:08:24 +00:00
Alexei Kotov
ba69e1737c Use the right shader for 360-degree screenshots
Doesn't fix #7720
2024-03-24 13:45:46 +03:00
Alexei Kotov
0f7b4fc6e6 Consistently avoid null pointer dereferencing in postprocessor (#7587) 2024-03-24 13:40:45 +03:00
Alexei Kotov
38eb741bfd Merge branch 'fix_global_iteration' into 'master'
Lua: Fix Global Variable Iteration

See merge request OpenMW/openmw!3835
2024-03-24 09:44:15 +00:00
jvoisin
79a62b3ad3 Merge branch 'enable_normals_for_all' into 'master'
Restructure colormasks at higher level

See merge request OpenMW/openmw!3970
2024-03-23 21:56:30 +00:00
Cody Glassman
a4dd9224df Restructure colormasks at higher level 2024-03-23 21:56:30 +00:00
Alexei Kotov
24913687cd Exterior cell naming corrections
Use the ID for anonymous regions
Try to use the name of the worldspace for ESM4
2024-03-23 17:24:33 +03:00
Evil Eye
5a0aed3a78 Use more decomposition, string_view, and implicit sizes in ESM code 2024-03-23 12:15:09 +01:00
Evil Eye
781e797810 Merge branch 'instanceselectionmode' into 'master'
Fix instance selection mode destruction (#7447)

Closes #7447

See merge request OpenMW/openmw!3945
2024-03-23 08:08:15 +00:00
Evil Eye
bf708acfac Merge branch 'goddamnit-there-are-more' into 'master'
Even more MSVC-specific warnings that evaded detection in CI

See merge request OpenMW/openmw!3968
2024-03-23 08:07:28 +00:00
Evil Eye
c92e63aaf2 Merge branch 'cleanup_includes' into 'master'
Cleanup includes

See merge request OpenMW/openmw!3916
2024-03-23 08:06:12 +00:00
Alexei Kotov
63276e0f1f Merge branch 'avoid_copy' into 'master'
Follow-up for YAML API

See merge request OpenMW/openmw!3961
2024-03-23 07:13:39 +00:00
AnyOldName3
7c85755950 Warning that doesn't fire with MSVC 2022
Hopefully this fixes it.
I've only tried MSVC 2022 locally, so can't verify this fix.
2024-03-23 02:34:57 +00:00
AnyOldName3
1aff88e6a3 Even more warning fixes 2024-03-23 00:33:50 +00:00
Zackhasacat
d6241dd1c5 Add back new_index 2024-03-22 17:41:12 -05:00
Sam Hellawell
c20a23b694 Remove unused regionmap CellDescription constructor 2024-03-22 03:13:04 +00:00
Alexei Kotov
79039f88df Use the right ID for magic effect verifier messages (#7894) 2024-03-22 04:34:38 +03:00
AnyOldName3
da8150e2e4 Even more MSVC-specific warnings that evaded detection in CI 2024-03-21 15:51:29 +00:00
elsid
37b695a0cf
Cleanup includes 2024-03-21 11:14:01 +01:00
psi29a
82bc6674dc Merge branch 'that-one-issue-sophie-keeps-nagging-about' into 'master'
Don't throw away user-provided shadow map resolutions

Closes #7891

See merge request OpenMW/openmw!3965
2024-03-21 07:45:26 +00:00
psi29a
af9f1b54da Merge branch 'lost-warnings' into 'master'
Fixes for a whole bunch of warnings

See merge request OpenMW/openmw!3950
2024-03-21 07:45:21 +00:00
AnyOldName3
0371791cce Break 2024-03-20 23:12:19 +00:00
AnyOldName3
b15f7857c0 currentDir.value is already canonicalised 2024-03-20 14:34:23 +00:00
AnyOldName3
f49d270c26 Don't throw away user-provided shadow map resolutions
Resolves https://gitlab.com/OpenMW/openmw/-/issues/7891

I think this is better than just adding 8192 as an allowed option as the vast majority of GPUs would be too slow given what we know about the cost if that setting (maybe that'll change if we get rid of the unconditional conditional discard I suspect is the cause of the slowness that's there for no good reason since the shadowsbin already moves most drawables to a known alpha-free stateset).
2024-03-20 00:54:12 +00:00
Alexei Kotov
974415addf Allow weapon equip/unequip animations to intersect (#7886) 2024-03-19 13:55:23 +03:00
psi29a
7dcd127295 Merge branch 'openmw-cs-regionmap-improvements' into 'master'
OpenMW CS: Minor region map fixes and improvements

See merge request OpenMW/openmw!3959
2024-03-19 09:24:48 +00:00
Andrei Kortunov
2d3a8ca0fc Do not use an inner namespace 2024-03-17 18:15:23 +04:00
Andrei Kortunov
2523afe9c2 Use namespace instead of static class 2024-03-16 22:06:28 +04:00
Andrei Kortunov
b657cb2e4c Simplify code 2024-03-16 22:06:28 +04:00
Andrei Kortunov
8037ad7f00 Remove unused includes 2024-03-16 22:06:15 +04:00
Sam Hellawell
a62da201e5 check for land index not -1, fix warning
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-16 09:02:47 +00:00
Sam Hellawell
5fca45565c Feature: display different brush for land vs water 2024-03-16 07:48:40 +00:00
Sam Hellawell
aa0c9fb4cb Fix: cannot drag region into map, map columns are rectangular 2024-03-16 07:48:40 +00:00
elsid
9ae7b542c6
Fix warning: -Wmaybe-uninitialized
In file included from apps/opencs/model/world/pathgrid.hpp:7,
                 from apps/opencs/model/world/idcollection.hpp:15,
                 from apps/opencs/model/world/idcollection.cpp:1:
In constructor ‘constexpr ESM::Pathgrid::Pathgrid(ESM::Pathgrid&&)’,
    inlined from ‘constexpr CSMWorld::Pathgrid::Pathgrid(CSMWorld::Pathgrid&&)’ at apps/opencs/model/world/pathgrid.hpp:24:12,
    inlined from ‘constexpr CSMWorld::Record<CSMWorld::Pathgrid>::Record(CSMWorld::Record<CSMWorld::Pathgrid>&&)’ at apps/opencs/model/world/record.hpp:39:12,
    inlined from ‘std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = CSMWorld::Record<CSMWorld::Pathgrid>; _Args = {CSMWorld::Record<CSMWorld::Pathgrid>}]’ at /usr/include/c++/13.2.1/bits/unique_ptr.h:1070:30,
    inlined from ‘std::unique_ptr<CSMWorld::RecordBase> CSMWorld::Record<ESXRecordT>::modifiedCopy() const [with ESXRecordT = CSMWorld::Pathgrid]’ at apps/opencs/model/world/record.hpp:92:116:
components/esm3/loadpgrd.hpp:19:12: warning: ‘<unnamed>.CSMWorld::Record<CSMWorld::Pathgrid>::mBase.CSMWorld::Pathgrid::<unnamed>.ESM::Pathgrid::mData’ may be used uninitialized [-Wmaybe-uninitialized]
   19 |     struct Pathgrid
      |            ^~~~~~~~
In file included from apps/opencs/model/world/idcollection.hpp:8:
apps/opencs/model/world/record.hpp: In member function ‘std::unique_ptr<CSMWorld::RecordBase> CSMWorld::Record<ESXRecordT>::modifiedCopy() const [with ESXRecordT = CSMWorld::Pathgrid]’:
apps/opencs/model/world/record.hpp:92:53: note: ‘<anonymous>’ declared here
   92 |         return std::make_unique<Record<ESXRecordT>>(Record<ESXRecordT>(State_ModifiedOnly, nullptr, &(this->get())));
      |                                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2024-03-16 02:34:50 +01:00
elsid
9b412bc802
Fix benchmark warning: -Wdeprecated-declarations
Example:

apps/benchmarks/settings/access.cpp: In function ‘void {anonymous}::localStatic(benchmark::State&)’:
apps/benchmarks/settings/access.cpp:43:37: warning: ‘typename std::enable_if<(std::is_trivially_copyable<_Tp>::value && (sizeof (Tp) <= sizeof (Tp*)))>::type benchmark::DoNotOptimize(const Tp&) [with Tp = float; typename std::enable_if<(std::is_trivially_copyable<_Tp>::value && (sizeof (Tp) <= sizeof (Tp*)))>::type = void]’ is deprecated: The const-ref version of this method can permit undesired compiler optimizations in benchmarks [-Wdeprecated-declarations]
   43 |             benchmark::DoNotOptimize(v);
      |             ~~~~~~~~~~~~~~~~~~~~~~~~^~~
2024-03-16 01:58:12 +01:00
AnyOldName3
ddb2c15bc9 Review 2024-03-15 16:31:02 +00:00
Andrei Kortunov
009ccca978 Modify sound API permissions 2024-03-15 19:48:43 +04:00
AnyOldName3
b5f61a119a min 2024-03-15 13:42:28 +00:00
psi29a
090e57b27c Merge branch 'esm3structs' into 'master'
Replace fixed size writeHNT calls with decomposition

See merge request OpenMW/openmw!3914
2024-03-15 11:02:42 +00:00
psi29a
d746918563 Merge branch 'yaml_parse' into 'master'
Load YAML files via Lua

Closes #7590

See merge request OpenMW/openmw!3924
2024-03-15 11:02:05 +00:00
AnyOldName3
dd18e17c97 And now Clang's noticed questionable type conversions 2024-03-15 00:47:09 +00:00
AnyOldName3
9638fbabb4 https://www.youtube.com/watch?v=2_6U9gkQeqY 2024-03-15 00:11:19 +00:00
AnyOldName3
ff3ffa13b6 Auto format 2024-03-14 23:54:22 +00:00
AnyOldName3
28131fd62b Fixes for a whole bunch of warnings
These warnings were always enabled, but we didn't see them due to https://gitlab.com/OpenMW/openmw/-/issues/7882.
I do not fully understand the cause of 7822 as I can't repro it in a minimal CMake project.

Some of these fixes are thought through.
Some are sensible best guesses.
Some are kind of a stab in the dark as I don't know whether there was a
possible bug the warning was telling me about that I've done nothing to
help by introducing a static_cast.

Nearly all of these warnings were about some kind of narrowing
conversion, so I'm not sure why they weren't firing with GCC and Clang,
which have -Wall -Wextra -pedantic set, which should imply -Wnarrowing,
and they can't have been affected by 7882.

There were also some warnings being triggered from Boost code.
The vast majority of library headers that do questionable things weren't
firing warnings off, but for some reason, /external:I wasn't putting
these Boost headers into external mode.

We need these warnings dealt with one way or another so we can switch
the default Windows CI from MSBuild (which doesn't do ccache) to Ninja
(which does).
I have the necessary magic for that on a branch, but the branch won't
build because of these warnings.
2024-03-14 23:39:33 +00:00
Andrei Kortunov
715efe892f Load YAML files via Lua (feature 7590) 2024-03-14 16:29:21 +04:00
Alexei Kotov
288a911ece Merge branch 'vfs_normalized_path_5' into 'master'
Use normalized path for NifFileManager::get

See merge request OpenMW/openmw!3944
2024-03-13 19:18:39 +00:00
Evil Eye
0fdc432eb2 Format probability 2024-03-12 20:09:04 +01:00
Evil Eye
c0578613af Remove superfluous members 2024-03-12 20:09:04 +01:00
Evil Eye
1d69d38081 Add an actual probability column 2024-03-12 20:09:04 +01:00
Evil Eye
f9da2b6b26 Roll for each region sound 2024-03-12 20:09:02 +01:00
Zackhasacat
59a25291f8 Fix errors 2024-03-12 07:29:48 -05:00
Zackhasacat
8b75932f50 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-03-12 06:54:15 -05:00
psi29a
df1be7102f Merge branch 'resolution_follow_up' into 'master'
Partially revert 5dcac4c48f

See merge request OpenMW/openmw!3940
2024-03-12 08:17:18 +00:00
Alexei Kotov
cdbe6adfc3 Fix instance selection mode destruction (#7447) 2024-03-12 03:39:14 +03: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
Alexei Kotov
6232b4f9e8 Reimplement the Settings window as a normal window (#7845, #7870) 2024-03-11 23:48:44 +03: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
Andrei Kortunov
f7e5ef74c6 Partially revert 5dcac4c48f 2024-03-10 14:53:55 +04:00
Alexei Kotov
30f314025a Log whether shaders or FFP are used for rendering 2024-03-10 04:53:30 +03: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
psi29a
ef8228f2f3 Merge branch 'fix/hardcoded-weather-meshes' into 'master'
Fix: hardcoded weather meshes, use settings instead

See merge request OpenMW/openmw!3880
2024-03-09 09:48:26 +00:00
psi29a
c3a44ca74a Merge branch 'mapped' into 'master'
Track map position using MWWorld::Cell

See merge request OpenMW/openmw!3932
2024-03-09 09:48:14 +00: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
Evil Eye
504a9e7d43 Address feedback 2024-03-08 17:09:49 +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
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
Evil Eye
b055367b3b Track map position using MWWorld::Cell 2024-03-07 21:36:21 +01:00
Andrei Kortunov
5dcac4c48f Do not treat Alt-Tab as resolution change (bug 7866) 2024-03-07 15:43:35 +04:00
Sam Hellawell
c6ee01b0be Apply fix to sky manager
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-07 04:49:48 +00:00
Sam Hellawell
bf7819f71d fix clang format 2024-03-07 02:28:14 +00:00
Sam Hellawell
f28b3f6601 Style tweak
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-07 02:28:14 +00:00
Sam Hellawell
af8c2a94df Fix: hardcoded weather meshes, use settings instead
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-07 02:28:14 +00:00
uramer
9ae61f1932 Fix child UI Elements created in the same frame as parent 2024-03-06 23:16:02 +01:00
AnyOldName3
7f1a6a8187 Fix file that's not used on Windows 2024-03-06 01:37:40 +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
effb4fc383 Merge branch 'whoanotouchy' into 'master'
Properly calculate touch spell hit position (#6156)

Closes #6156

See merge request OpenMW/openmw!3920
2024-03-05 09:24:35 +00:00
psi29a
9434f52c14 Merge branch 'fix/less-strict-ids' into 'master'
Fix(idvalidator): Allow any printable character in refIds

Closes #7721

See merge request OpenMW/openmw!3896
2024-03-05 09:23:44 +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
Alexei Kotov
1f629b1368 Account for Hrnchamd's research in touch effect hit position calculation 2024-03-04 00:00:16 +03:00
Evil Eye
cef59e8928 Replace fixed size writeHNT calls with decomposition 2024-03-03 19:39:19 +01:00
Alexei Kotov
828bf3d11a Merge branch 'imperfectoil' into 'master'
Implement auto calculated potion values

Closes #7859

See merge request OpenMW/openmw!3918
2024-03-03 14:50:03 +00:00
Alexei Kotov
7a84f27eeb Properly calculate touch spell hit position (#6156)
Reorganize hit contact logic and remove dead code (distance checks, melee hit contact-relevant stuff)
2024-03-03 13:22:58 +03:00
psi29a
d168466034 Merge branch 'raciallybound' into 'master'
Expose races to Lua

See merge request OpenMW/openmw!3863
2024-03-02 20:14:27 +00:00
Evil Eye
958f70736f Implement auto calculated potion values 2024-03-02 12:45:48 +01:00
Evil Eye
e54decc830 Remove redundant is_automagicals 2024-03-01 12:24:36 +01:00
psi29a
e6f64f5e71 Merge branch 'fullhelp' into 'master'
Move full help text after everything else (#7623)

Closes #7623

See merge request OpenMW/openmw!3907
2024-02-29 18:23:20 +00:00
AnyOldName3
1af59c3a43 Tooltips for data-local and resources/vfs 2024-02-29 00:48:03 +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
Evil Eye
0519e1215f Unify the creation of RefId tables 2024-02-28 17:20:46 +01:00
AnyOldName3
322a378907 Load correct config files in the wizard 2024-02-28 00:49:15 +00:00
Alexei Kotov
27b1434f5b Use string_view for full help text 2024-02-28 01:06:42 +03:00
Evil Eye
cd118ee263 Expose races to Lua 2024-02-27 21:50:57 +01:00