mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 10:45:34 +00:00
Code Issues Releases Wiki Activity
34511 commits 109 branches 66 tags 134 MiB
Commit graph

22450 commits

Author SHA1 Message Date
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
Cody Glassman
098396822f add choice widget type to postprocessing uniforms 2024-03-21 17:48:30 -07: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
Andrei Kortunov
ddd0945645 Add a storage mode to drop section on game exit 2024-02-27 23:26:22 +04: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
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
psi29a
051f3dcd56 Merge branch 'fps_independent_water_ripples' into 'master' 
Make water ripples simulation FPS independent (#7687)

Closes #7687

See merge request OpenMW/openmw!3885
 2024-02-26 11:21:13 +00:00
AnyOldName3
357bf3db61 Load all config files 2024-02-25 14:01:20 +00:00
Alexei Kotov
01e0b25fd3 Merge branch 'coverity' into 'master' 
Fix some Coverity complaints

See merge request OpenMW/openmw!3904
 2024-02-24 20:25:58 +00:00
Alexei Kotov
65aa222efa Move full help text after everything else (#7623) 2024-02-24 23:05:27 +03:00
Evil Eye
7d7e8939ab Use ESM::decompose to handle WPDTstruct 2024-02-24 16:55:58 +01:00
Evil Eye
ec1c6ee171 Use ESM::decompose to handle ENAMstruct 2024-02-24 14:03:24 +01:00
elsid
ec9c829021
Use normalized path for correctSoundPath 2024-02-24 12:42:36 +01:00
elsid
92d57d6e46
Make Normalized constructor from const char* explicit 2024-02-24 12:42:02 +01:00
Evil Eye
595e42ae43 Merge branch 'lua_death_finished' into 'master' 
Add a Lua function to check if actor's death is finished

See merge request OpenMW/openmw!3901
 2024-02-24 10:31:15 +00:00
Andrei Kortunov
cf6b6020a0 Move local variables 2024-02-23 17:10:55 +04:00
Andrei Kortunov
1126f38a1e Do not copy the whole attributes store 2024-02-23 17:02:40 +04:00
psi29a
f307e7acc7 Merge branch 'well-that-was-really-dumb' into 'master' 
Actually use the plane distances we just computed

Closes #7844

See merge request OpenMW/openmw!3898
 2024-02-23 08:14:55 +00:00
psi29a
717f1c9870 Merge branch 'floatingpoint' into 'master' 
CharacterController: rework movement queueing logic (#7835)

Closes #7835

See merge request OpenMW/openmw!3875
 2024-02-23 08:14:43 +00:00
AnyOldName3
53afa6b185 Appease clang-format by changing something I didn't touch 2024-02-23 00:15:23 +00:00
AnyOldName3
36a75cdb29 Get the GLExtensions instance when a context is created 2024-02-23 00:15:23 +00:00
psi29a
e4a9e83609 Merge branch 'disable-shadows-properly-properly' into 'master' 
Affect correct texture units when disabling shadows for stateset

Closes #7838

See merge request OpenMW/openmw!3891
 2024-02-22 18:05:48 +00:00
psi29a
a6c9e63520 Merge branch 'nojumpallowed' into 'master' 
Reduce false-positive jumping events (#7833)

Closes #7833

See merge request OpenMW/openmw!3869
 2024-02-22 18:05:07 +00:00
Andrei Kortunov
7c4b42ab2a Add a Lua function to check if actor's death is finished 2024-02-22 19:06:15 +04:00
Dave Corley
ce2787e15e Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub 2024-02-22 03:26:17 -06:00
Dave Corley
b2b1c98396 fix(esmtool): Don't try to log a variable that doesn't exist 2024-02-22 03:01:29 -06:00
Dave Corley
bb35f0366a Fix(loadcell): Save water height regardless of value, if the user actually adjusted it 2024-02-22 03:01:28 -06:00
Dave Corley
090a389feb Cleanup(idvalidator): Just don't use isValid function and instead 
directly check if input is a printable char
 2024-02-22 02:52:58 -06:00
psi29a
99d0fc6f75 Merge branch 'fix_controller_controls_cam' into 'master' 
Fix player looking/controls via controller

See merge request OpenMW/openmw!3890
 2024-02-22 08:10:01 +00:00
psi29a
518f34c869 Merge branch 'bsa_archive' into 'master' 
Cleanup and optimize BSA archives code

See merge request OpenMW/openmw!3876
 2024-02-22 08:02:12 +00:00
AnyOldName3
f27564ec78 Actually use the plane distances we just computed 
We don't get any of the speedup if we don't do this.

We also forget about any objects nearer the camera than the previous value except the groundcover we're just about to deal with.

Fixes https://gitlab.com/OpenMW/openmw/-/issues/7844
 2024-02-22 00:16:41 +00:00
Dave Corley
9fc66d5de6 Fix(idvalidator): Allow any printable character in refIds 2024-02-21 15:25:13 -06:00
psi29a
7a8b27736e Merge branch 'fix_benchmark_warning' into 'master' 
Update google benchmark to 1.8.3 and fix related warnings

See merge request OpenMW/openmw!3877
 2024-02-21 10:22:01 +00:00
Alexei Kotov
93bb67a08f Merge branch 'launcher_fixes' into 'master' 
Minor launcher improvements

Closes #7843

See merge request OpenMW/openmw!3887
 2024-02-21 05:51:27 +00:00
AnyOldName3
535c5e328a Affect correct texture units when disabling shadows for stateset 
Knowing which are right required making the function non-static, so the shadow manager had to become a singleton as the results of passing it around to where it's needed were hellish.

I'm seeing a bunch of OpenGL errors when actually using this, so I'll investigate whether they're happening on master.
I'm hesitant to look into it too much, though, as I'm affected by https://gitlab.com/OpenMW/openmw/-/issues/7811, and also have the Windows setting enabled that turns driver timeouts into a BSOD so a kernel dump is collected that I can send to AMD.
 2024-02-20 21:02:31 +00:00
Zackhasacat
b4c5a2777a Rename var 2024-02-20 13:20:09 -06:00
Zackhasacat
ccb506385f Fix player looking/controls 2024-02-20 13:07:44 -06:00
Zackhasacat
d73c1c8590 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-02-20 12:07:23 -06:00
Zackhasacat
873877795a Move gamepad controls to lua interface 2024-02-20 12:06:19 -06:00
Andrei Kortunov
3971abf5e6 Minor launcher improvements (feature 7843) 2024-02-20 14:02:59 +04:00
psi29a
8c8fffc2c6 Merge branch 'fix_shared_library_build' into 'master' 
Build fixes related to shared libraries and position independent code

See merge request OpenMW/openmw!3878
 2024-02-20 08:47:14 +00:00
Alexei Kotov
15a42f26a7 Merge branch 'fix_distance_spinbox' into 'master' 
Fix viewing distance spinbox in the launcher

Closes #7840

See merge request OpenMW/openmw!3882
 2024-02-20 08:38:01 +00:00
Alexei Kotov
592081d3cb Merge branch 'addcarry' into 'master' 
Add missing lua function types.Item.isCarriable

See merge request OpenMW/openmw!3879
 2024-02-20 08:36:46 +00:00
elsid
c9b4c8632a
Update ripples surface only when there is need to do so 
This depends on the difference between FPS which is dynamic and ripples update
frequency which is contant. If FPS > ripples update frequency, some frames do
nothing. If FPS <= ripples update frequency each frame runs shaders once. Update
offset, possitions shader uniforms only when it will be run.
 2024-02-20 00:44:39 +01:00
elsid
3b01e209b1
Use proper names for static members 2024-02-19 23:13:12 +01:00
elsid
56e69cf7a2
Make some RipplesSurface members private 2024-02-19 23:13:12 +01:00
elsid
dc5371d157
Remove unused RipplesSurface::State::mOffset 2024-02-19 23:13:11 +01:00
Andrei Kortunov
6f1710dee1 Fix viewing distance spinbox in the launcher (bug 7840) 2024-02-19 16:14:52 +04:00
psi29a
3369184c19 Merge branch 'lesspragmaticpackages' into 'master' 
Use decompose to handle AI packages and data

See merge request OpenMW/openmw!3856
 2024-02-19 09:59:59 +00:00
Zackhasacat
fed62a8517 Remove unneeded line 2024-02-18 15:58:18 -06:00
Zackhasacat
92242a3d54 Simplify 2024-02-18 13:20:58 -06:00
Zackhasacat
731095831d Add missing function types.Item.isCarriable() 2024-02-18 13:15:56 -06:00
elsid
e9c672b297
Fix build with cmake flag BUILD_SHARED_LIBS=ON 
Always build opencs-lib as static library instead of BUILD_SHARED_LIBS deciding
whether it's static or shared library.
 2024-02-18 19:35:32 +01:00
elsid
cc9f9b53ba
Convert BsaVersion to enum class 2024-02-18 14:54:51 +01:00
elsid
df077a2524
Simplify and reduce code duplication for BSA archive creation 2024-02-18 14:54:14 +01:00
elsid
da5ab2b2c9
Fix benchmark warning: -Wdeprecated-declarations 
/home/elsid/dev/openmw/apps/benchmarks/detournavigator/navmeshtilescache.cpp: In function ‘void {anonymous}::getFromFilledCache(benchmark::State&)’:
/home/elsid/dev/openmw/apps/benchmarks/detournavigator/navmeshtilescache.cpp:186:37: warning: ‘typename std::enable_if<((! std::is_trivially_copyable<_Tp>::value) || (sizeof (Tp) > sizeof (Tp*)))>::type benchmark::DoNotOptimize(const Tp&) [with Tp = DetourNavigator::NavMeshTilesCache::Value; 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]
  186 |             benchmark::DoNotOptimize(result);
      |             ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
In file included from /home/elsid/dev/openmw/apps/benchmarks/detournavigator/navmeshtilescache.cpp:1:
/home/elsid/dev/benchmark/build/gcc/release/install/include/benchmark/benchmark.h:507:5: note: declared here
  507 |     DoNotOptimize(Tp const& value) {
      |     ^~~~~~~~~~~~~
 2024-02-18 14:25:03 +01:00
Alexei Kotov
41d41780a8 CharacterController: rework movement queueing logic (#7835) 2024-02-18 14:01:10 +03:00
psi29a
f9820e2061 Merge branch 'debugdrawdebugged' into 'master' 
Try to uncursify debug primitive drawer (#7767)

Closes #7767

See merge request OpenMW/openmw!3852
 2024-02-17 18:56:21 +00:00
psi29a
8545fb920e Merge branch '9-ancestral-tenets' into 'master' 
Fix(CS): Scale actors according to their race's stats

Closes #7753

See merge request OpenMW/openmw!3714
 2024-02-17 11:57:20 +00:00
jvoisin
0db730825d Merge branch 'drainmaximummagicka' into 'master' 
Hide magnitude for Fortify Maximum Magicka when requested as well (#7832)

Closes #7832

See merge request OpenMW/openmw!3868
 2024-02-16 23:02:52 +00:00
Alexei Kotov
aae74224e8 Prevent swim upward correction from causing false-positive jumping events (#7833) 2024-02-16 14:28:43 +03:00
Alexei Kotov
7873714103 Restore vertical movement reset for various movement states (#7833) 
Note getJump already handles incapacitation states (dead/paralyzed/KO)
 2024-02-16 13:37:11 +03:00
Alexei Kotov
6e81927d60 Make extra sure to ignore movement input for scripted animations (#7833) 2024-02-16 13:37:11 +03:00
Dave Corley
54f4c69d37 Cleanup(columnimp): Use std::clamp to limit race scaling 2024-02-15 21:25:29 -06:00
psi29a
1280345296 Merge branch 'copy_qtbase' into 'master' 
Copy qtbase translations

See merge request OpenMW/openmw!3840
 2024-02-15 09:26:42 +00:00
psi29a
2ae137f709 Merge branch 'lua_element_crash' into 'master' 
Fix crash when throwing in index meta methods

Closes #7711

See merge request OpenMW/openmw!3862
 2024-02-15 09:15:45 +00:00
Andrei Kortunov
9a7b9572fd Deploy base Qt translations when needed 2024-02-15 09:26:14 +04:00
Dave Corley
54e90b4ac2 Legacy(columnimp): Add TESCS limits for race weight/height scaling 2024-02-14 20:00:22 -06:00
Alexei Kotov
c1b9beb763 Merge branch 'deadanimation' into 'master' 
Remove dead code

See merge request OpenMW/openmw!3866
 2024-02-15 00:57:59 +00:00
Dave Corley
1b1f0c4971 Switch height/weight in names and make the stats a simple struct instead 2024-02-14 18:01:31 -06:00
Alexei Kotov
a0ba0d781a Hide magnitude for Fortify Maximum Magicka when requested as well (#7832) 2024-02-15 01:50:49 +03:00
Dave Corley
98ad059806 Cleanup(actoradapter): Use more explicit names & vec2 for racial height/weight 2024-02-14 16:42:27 -06:00
Dave Corley
049550d73e Cleanup(Actoradapter.cpp): Create new struct for race stats, use 
std::pair instead
 2024-02-14 16:42:27 -06:00
Dave Corley
b31664a78f Fix(CS): Scale actors according to their race's stats 2024-02-14 16:42:27 -06:00
uramer
08b7ee8a44 Test LuaUtil::safeGet preventing crash 2024-02-14 09:49:32 +01:00
psi29a
ec1cf46ec7 Merge branch 'lua_keybinds' into 'master' 
Lua Implement mouse input engine handlers, improve inputBinding renderer

See merge request OpenMW/openmw!3855
 2024-02-14 08:30:38 +00:00
psi29a
29c2042432 Merge branch 'lua_callback_crash' into 'master' 
Lua Fix crash when passing a non-callback table to a callback argument

Closes #7827

See merge request OpenMW/openmw!3861
 2024-02-14 08:29:58 +00:00
psi29a
fda47a6ebe Merge branch 'flying-fish-straight-to-jail' into 'master' 
Groundcover should ignore non-geometry Drawables

Closes #7633

See merge request OpenMW/openmw!3859
 2024-02-14 08:29:28 +00:00
Evil Eye
8f88838ff5 Remove dead code 2024-02-13 19:30:32 +01:00
psi29a
744cd50520 Merge branch 'decoupled-audio' into 'master' 
Add option to use camera as sound listener

Closes #5944

See merge request OpenMW/openmw!3836
 2024-02-13 09:18:18 +00:00
Epoch
6486f3f2cf Add option to use camera as sound listener 2024-02-13 09:18:18 +00:00
psi29a
50ea852928 Merge branch 'STOP_IGNORING_ME_AND_LOOK_ME_IN_THE_EYES' into 'master' 
add ignore list to raycasts (#7788)

See merge request OpenMW/openmw!3848
 2024-02-13 09:15:49 +00:00
psi29a
9fb28a250c Merge branch 'a2c-grammar' into 'master' 
Fix grammar for A2C checkbox

See merge request OpenMW/openmw!3858
 2024-02-13 09:15:17 +00:00
psi29a
9e1cdaceff Merge branch 'markers' into 'master' 
Fix ESM4 marker model hiding hack

See merge request OpenMW/openmw!3853
 2024-02-13 09:13:56 +00:00
uramer
851e291501 Simplify and fix the storage subscribe test 2024-02-13 00:56:14 +01:00
Evil Eye
1523a067c9 Use concepts and aggregate initialization 2024-02-12 17:32:43 +01:00
Cody Glassman
56b31ceaf5 add ignore list to raycasts 2024-02-12 07:52:47 -08:00
psi29a
c889026b71 Merge branch 'cleanup_physics_callbacks' into 'master' 
Cleanup physics callbacks

See merge request OpenMW/openmw!3831
 2024-02-12 14:16:26 +00:00
psi29a
8d0a670f94 Merge branch 'vfs_normalized_path_2' into 'master' 
Use normalized path for file archives indices

See merge request OpenMW/openmw!3830
 2024-02-12 14:14:50 +00:00
psi29a
1c2fc59a6f Merge branch 'water' into 'master' 
Refraction fog based on water depth

See merge request OpenMW/openmw!3842
 2024-02-12 14:13:48 +00:00
psi29a
e9c97b835e Merge branch 'acertainsign' into 'master' 
Expose birth signs to Lua

See merge request OpenMW/openmw!3850
 2024-02-12 14:11:29 +00:00
psi29a
a060a7297c Merge branch 'dehardcode-skillprogression' into 'master' 
Lua: Dehardcode skill and level progression

See merge request OpenMW/openmw!3779
 2024-02-12 14:10:51 +00:00
psi29a
d36583bdec Merge branch 'nevercruelorcowardly' into 'master' 
Correct activation behavior for actors in combat (#7794)

Closes #7794

See merge request OpenMW/openmw!3822
 2024-02-12 14:10:08 +00:00
AnyOldName3
8c591a0b44 Groundcover should ignore non-geometry Drawables 
Fix https://gitlab.com/OpenMW/openmw/-/issues/7633

Untested - the issue didn't link to a mod using the mesh and I couldn't be bothered setting one up manually.
 2024-02-12 01:16:49 +00:00
AnyOldName3
3149761c85 Fix grammar for A2C checkbox 
An alternative would be *Anti-alias alpha testing*.

The original was wrong because anti-alias is a verb acting on alpha testing, but it treated the whole thing as a noun phrase.
 2024-02-11 23:49:18 +00:00
uramer
63a1bbb88d Enable Lua mouse engine handlers while in UI 2024-02-11 23:49:26 +01:00
BPengu1n
4cdb76975a added force PPL checkbox 2024-02-11 16:39:16 -06:00
Evil Eye
75d0b6e355 Use decompose to handle AI packages and data 2024-02-11 22:06:58 +01:00
Alexei Kotov
887d09e051 Fix ESM4 marker model hiding hack 2024-02-11 04:02:01 +03:00
uramer
c68dee214e Mouse input engine handlers 2024-02-10 22:56:46 +01:00
Alexei Kotov
3301ebb2cb Merge branch 'localize_screenshot' into 'master' 
Localize screenshot messages

See merge request OpenMW/openmw!3843
 2024-02-10 13:54:05 +00:00
Alexei Kotov
a54d97669f Merge branch 'imnotyourpalbuddy' into 'master' 
Reset friendly hits at the end of combat and don't count hits while in combat

Closes #5755

See merge request OpenMW/openmw!3839
 2024-02-09 21:28:04 +00:00
Alexei Kotov
0d1da08493 Set node mask on DebugDrawer 
Fixes primitive drawing in exteriors/quasiexteriors
 2024-02-09 20:50:33 +03:00
Alexei Kotov
f9498e6ea4 Make DebugDrawer a LightManager child, don't use VAO for lines 
Fixes terrain lighting but currently breaks non-line primitive rendering in exteriors
 2024-02-09 20:50:33 +03:00
Alexei Kotov
38ab09a52e Try to uncursify DebugDrawer scene representation 2024-02-09 20:49:40 +03:00
Zackhasacat
86666761a3 Requested changes 2024-02-08 21:51:54 -06:00
Evil Eye
7586acc18b Remove Core from functions that aren't in openmw.core 2024-02-08 16:53:48 +01:00
Andrei Kortunov
525dee00f1 Refraction fog based on water depth (feature 5926) 2024-02-08 18:07:48 +04:00
psi29a
ff7f2217f1 Merge branch 'update_next_tile_id' into 'master' 
Update next tile_id when there is a duplicate in navmeshdb

See merge request OpenMW/openmw!3849
 2024-02-08 12:13:27 +00:00
elsid
a6657c18cc
Use normalized path for file archives indices 2024-02-08 11:48:59 +01:00
elsid
062d3e9c00
Add NormalizedView for normalized paths 2024-02-08 11:48:57 +01:00
elsid
1689c59546
Add tests for VFS::Path::Normalized 2024-02-08 11:42:28 +01:00
Alexei Kotov
0178c5aaef Remove Open action fallback for Tribunal NPC companions 2024-02-08 12:38:20 +03:00
Andrei Kortunov
6760fa4945 Localize screenshot messages 2024-02-08 12:50:12 +04:00
Alexei Kotov
c5564323e4 Correct activation behavior for actors in combat (#7794) 
Stop battle music upon death animation end
 2024-02-08 11:47:35 +03:00
Alexei Kotov
6be6f47503 Merge branch 'lua_enchantment_charge_nil' into 'master' 
Lua Use nil instead of -1 for default enchantment charge

See merge request OpenMW/openmw!3845
 2024-02-08 08:25:15 +00:00
Zackhasacat
4700fdcfc2 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-07 22:06:34 -06:00
elsid
506824cb9d
Cleanup physics callbacks 
* Do not copy with allocations.
* Remove unused DeepestNotMeContactTestResultCallback.
* Avoid using pointers which should not be nullptr.
* Move constructors implementation to headers.
* Move types defined in .cpp are to unnamed namespace.
* Comment unused arguments.
* Avoid C-style casts.
 2024-02-07 22:04:34 +01:00
Evil Eye
5715e6428a Merge branch 'lua_separate_owner' into 'master' 
Group owner bindings into a table

See merge request OpenMW/openmw!3841
 2024-02-07 19:06:18 +00:00
Evil Eye
f114d409c8 Add get and set birth sign 2024-02-07 19:35:26 +01:00
Evil Eye
f7aa9f8d94 Expose birth signs to Lua 2024-02-07 18:08:06 +01:00
elsid
a7da604332
Update next tile_id when there is a duplicate in navmeshdb 
Disable writes on failure to update next tile_id to avoid further errors.
 2024-02-07 11:28:34 +01:00
psi29a
557e83d502 Merge branch 'more_move' into 'master' 
Move action argument

See merge request OpenMW/openmw!3844
 2024-02-07 09:18:34 +00:00
uramer
b1773d7e9f Use nil instead of -1 for default enchantment charge 2024-02-06 17:30:48 +01:00
Andrei Kortunov
a8c219f07c Move action argument 2024-02-06 14:18:08 +04:00
psi29a
7793a6d0d9 Merge branch 'modelviewbutnocontroller' into 'master' 
Collect string_views when deciding what to preload

See merge request OpenMW/openmw!3816
 2024-02-06 09:06:57 +00:00
Zackhasacat
c8eaa5976a Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-05 15:01:59 -06:00
uramer
6792cf02b2 Group owner bindings into a table 2024-02-05 18:48:53 +01:00
Andrei Kortunov
66b2d428c8 Merge branch 'qt_localization' into 'master' 
Localize Launcher and Wizard

See merge request OpenMW/openmw!3571
 2024-02-05 15:11:42 +00:00
psi29a
76842c3ba1 Merge branch 'more_move' into 'master' 
Address Coverity Scan complaints left

See merge request OpenMW/openmw!3837
 2024-02-05 13:22:14 +00:00
jvoisin
cdd73a1a19 Merge branch 'fix_far_away_navmesh_crash' into 'master' 
Limit navmesh vertices coordinates values (#6574)

Closes #6574

See merge request OpenMW/openmw!3825
 2024-02-05 09:49:24 +00:00
jvoisin
838785d5a3 Merge branch 'sworc' into 'master' 
Make StartCombat a no-op for dead targets and don't always play attack lines

Closes #7769 and #5413

See merge request OpenMW/openmw!3803
 2024-02-05 09:48:20 +00:00
Alexei Kotov
a5d88d489b Merge branch 'menu_fixes' into 'master' 
Follow up fixes for Lua Menu MR !3464

See merge request OpenMW/openmw!3834
 2024-02-05 00:41:11 +00:00
Evil Eye
6c2ddc635d Reset friendly hits at the end of combat and don't count hits while in combat 2024-02-04 21:41:03 +01:00
uramer
02accd7a49 Fix statemanager cleanup setting game state to ended by accident 2024-02-04 11:12:12 +01:00
uramer
8c6a1ae8c0 Allow menu scripts to send global events while a game is loaded 2024-02-04 11:12:11 +01:00
Alexei Kotov
62f2f4a011 Merge branch 'clear_lua_actions' into 'master' 
Fix quickload causing a crash with certain Lua queued actions

Closes #7801

See merge request OpenMW/openmw!3833
 2024-02-04 07:25:39 +00:00
Andrei Kortunov
292879d0fb Address Coverity Scan complaints left 2024-02-04 08:56:25 +04:00
Zackhasacat
5f9acbd0f0 Add function to replace duplicated code 2024-02-03 13:03:23 -06:00
Zackhasacat
97203f2706 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-03 12:31:34 -06:00
elsid
e6196c782d
Limit navmesh vertices coordinates values 
Float values with more than 22 significant fraction bits may cause out of bounds
access in recastnavigation on triangles rasterization. Prevent passing such
values there.
 2024-02-03 18:48:42 +01:00
Alexei Kotov
8b47381162 Merge branch 'more_move' into 'master' 
Fix some Coverity Scan complaints

See merge request OpenMW/openmw!3829
 2024-02-03 17:24:53 +00:00
Zackhasacat
9daf10c305 Remove comment 2024-02-03 10:45:24 -06:00
Zackhasacat
55285b5e57 Fix Global Iteration 2024-02-03 10:43:38 -06:00
uramer
a1970857fd Queue quick loads 2024-02-03 15:18:34 +01:00
Zackhasacat
1338e884a9 Merge branch 'menuscripts' into 'master' 
Add new Lua context: menu scripts

Closes #7805 and #7648

See merge request OpenMW/openmw!3464
 2024-02-02 21:46:22 +00:00
uramer
784459a652 Clean up the cleanup code 2024-02-02 22:07:58 +01:00
jvoisin
720573115d Merge branch 'references' into 'master' 
Pass some arguments by references

See merge request OpenMW/openmw!3824
 2024-02-02 16:35:40 +00:00
Andrei Kortunov
69936f3537 Move TextureData 2024-02-02 09:45:42 +04:00
Andrei Kortunov
225e834b88 Fix some Coverity Scan complaints 2024-02-02 09:28:19 +04:00
uramer
b988db9bda Merge branch 'master' into menuscripts 2024-02-01 20:11:02 +01:00
Mads Buvik Sandvei
a59981e3fa Initialize mScripted again. 2024-02-01 20:00:10 +01:00
Andrei Kortunov
66d1e036d2 Pass some arguments by references 2024-02-01 10:02:15 +04:00
Andrei Kortunov
7e345436f4 Localize Launcher and Wizard 2024-02-01 09:47:25 +04:00
Zackhasacat
c7fcd1c31b Fix formatting 2024-01-31 17:00:33 -06:00
psi29a
6136e3d8fc Merge branch 'csspellarg' into 'master' 
Editor: Reset effect arguments when the effect ID changes (#7785)

Closes #7785

See merge request OpenMW/openmw!3802
 2024-01-31 10:52:13 +00:00
psi29a
c9489bad9b Merge branch 'cleanup_esm3_readers_cache' into 'master' 
Remove stateless encoder from ReadersCache

See merge request OpenMW/openmw!3823
 2024-01-31 10:49:53 +00:00
Alexei Kotov
b6b497c76b Merge branch 'esmtool_output' into 'master' 
Improve esmtool output

Closes #7669

See merge request OpenMW/openmw!3801
 2024-01-30 23:18:59 +00:00
uramer
47d5868e2c creationTime field in save info 2024-01-30 22:09:12 +01:00
Mads Buvik Sandvei
e0e968a082 rebase errors 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
055e9a5055 clang'd 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
264a8c0669 Remove the now unused npcstats methods useSkill and increaseSkill 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
9f15f3b431 Add engine handler for skill levelup, to dehardcode the book/trainer case. 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
e1a22242d9 skillGain as a table 2024-01-30 21:25:38 +01:00
Mads Buvik Sandvei
80e9631abd Use ESM::Class::Specialization for parameters to npcstats 2024-01-30 21:25:38 +01:00
Mads Buvik Sandvei
011d9d6493 Dehardcode skill and level progression 2024-01-30 21:25:36 +01:00
uramer
76915ce6e9 Queue auto started scripts until next update 2024-01-30 18:58:34 +01:00
uramer
ad8a05e2a1 Trigger a game ended state handler before loading to allow menu scripts to do cleanup 2024-01-30 18:58:15 +01:00
Alexei Kotov
9350222e1a Merge branch 'deserializeinventory' into 'master' 
Use deserializeText for find and countOf

See merge request OpenMW/openmw!3817
 2024-01-30 04:24:50 +00:00
Alexei Kotov
c86ca0ef01 Merge branch 'cast-fix' into 'master' 
Fix bad cast of loop count in animation bindings.

See merge request OpenMW/openmw!3819
 2024-01-30 04:18:03 +00:00
Evil Eye
340d1423c6 Optimize AI package target comparisons 2024-01-29 22:25:39 +01:00
Evil Eye
8ed7a5319d Exclude deleted actors, prevent copies, and try to avoid a second getActorsSidingWith call 2024-01-29 22:08:00 +01:00
psi29a
4ebedaca99 Merge branch 'npc_model_lua' into 'master' 
Add model to NPC lua record

See merge request OpenMW/openmw!3818
 2024-01-29 11:58:04 +00:00
elsid
f9b69623d3
Remove stateless encoder from ReadersCache 
It was added by https://gitlab.com/OpenMW/openmw/-/merge_requests/2804 without a
good reason. There is already encoder available in the used context.
 2024-01-29 11:09:29 +01:00
psi29a
be6d063b94 Merge branch 'pointlessinisettings' into 'master' 
Support Timescale Clouds and MaxNumberRipples INI settings (#7792, #7795)

Closes #7792 and #7795

See merge request OpenMW/openmw!3812
 2024-01-28 22:13:45 +00:00
psi29a
435a4cb9ec Merge branch 'minusputback' into 'master' 
Parse special characters that have been put back as names too

See merge request OpenMW/openmw!3804
 2024-01-28 22:12:11 +00:00
psi29a
f656d2e380 Merge branch 'shutupverifier' into 'master' 
Editor: Silence some verifier warnings

See merge request OpenMW/openmw!3814
 2024-01-28 21:42:06 +00:00
psi29a
7450b11402 Merge branch 'vfs_normalized_path_1' into 'master' 
Use normalized path for VFS manager and RecursiveDirectoryIterator

See merge request OpenMW/openmw!3806
 2024-01-28 21:34:01 +00:00
psi29a
b1a72330a4 Merge branch 'allow_muliselect_in_archives_tab' into 'master' 
Allow multiselect in the archives tab (#7606)

Closes #7606

See merge request OpenMW/openmw!3773
 2024-01-28 21:33:10 +00:00
Yury Stepovikov
c90ebcc86b Allow multiselect in the archives tab (#7606) 2024-01-28 21:33:10 +00:00
Mads Buvik Sandvei
fbffecfd13 ~0ul -> std::numeric_limits<uint32_t>::max() 2024-01-28 21:02:06 +01:00
Mads Buvik Sandvei
0ed94ead4e Check that count is non-zero before decrementing it. 2024-01-28 17:34:22 +01:00
Mads Buvik Sandvei
24a0a0c3bf size_t -> uint32_t 2024-01-28 16:34:44 +01:00
Mads Buvik Sandvei
993cea7d65 MR Comments 2024-01-28 16:31:01 +01:00
Mads Buvik Sandvei
36e1bdab10 Use a smaller integer type instead of dealing with casting issues. 2024-01-28 14:48:49 +01:00
Alexei Kotov
b83b30f0dc Editor: Reset effect arguments when the effect ID changes (#7785) 2024-01-28 15:37:53 +03:00
Alexei Kotov
bd84200d4e Merge branch 'bumpbump' into 'master' 
Base GetColliding script functions on collisions detected by the movement solver

Closes #7053

See merge request OpenMW/openmw!3794
 2024-01-28 10:18:02 +00:00
Alexei Kotov
df6e104e6f Merge branch 'tastytastyenchantments' into 'master' 
Use the correct id to absorb enchantments

Closes #7796

See merge request OpenMW/openmw!3813
 2024-01-28 10:15:55 +00:00
Zackhasacat
4fcacd59aa Add model to NPC lua 2024-01-27 12:02:56 -06:00
Zackhasacat
c2782426fc Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-01-27 10:25:05 -06:00
Evil Eye
1288ec5cea Use deserializeText for find and countOf 2024-01-27 16:49:20 +01:00
Evil Eye
4ef68a8938 Split Class::getModel into Class::getCorrectedModel and Class::getModel so preloading can use string_view 2024-01-27 16:26:31 +01:00
uramer
9cce2e39ba Merge branch 'master' into menuscripts 2024-01-27 15:45:31 +01:00
Alexei Kotov
093d86353f Merge branch 'lua_mwscript_nilvar' into 'master' 
#7791: Require local variables to exist for lua mwscript local variables

Closes #7791

See merge request OpenMW/openmw!3811
 2024-01-27 13:57:26 +00:00
Zackhasacat
cfd67f3ce7 #7791: Require local variables to exist for lua mwscript local variables 2024-01-27 13:57:26 +00:00
uramer
ad5d594c28 Let menu scripts clean up before loading a game 2024-01-27 14:47:22 +01:00
Evil Eye
1d1ce2de7b Use the correct id to absorb enchantments 2024-01-27 12:12:39 +01:00
Mads Buvik Sandvei
a94add741e Lua: Animation bindings 2024-01-26 21:39:33 +00:00
Alexei Kotov
d1e79028e9 Merge branch 'lua-fix-active-spells-pairs-iterator-return' into 'master' 
Lua: Fix return value for `Actor.ActiveSpells` iterator

See merge request OpenMW/openmw!3808
 2024-01-26 20:38:13 +00:00
Alexei Kotov
30d637f5f6 Merge branch 'lua_water_level' into 'master' 
Lua: Add water level to Core.Cell

See merge request OpenMW/openmw!3766
 2024-01-26 20:37:04 +00:00
Zackhasacat
daa9c5f0e1 Lua: Add water level to Core.Cell 2024-01-26 20:37:04 +00:00
Evil Eye
aa9a99bde5 Merge branch 'magic_effects_fix' into 'master' 
Fix magic effects in the editor

Closes #7481

See merge request OpenMW/openmw!3798
 2024-01-26 16:33:51 +00:00
Evil Eye
ed22b91bf2 Merge branch 'kftest' into 'master' 
Support parsing KF files in niftest

See merge request OpenMW/openmw!3807
 2024-01-26 16:24:55 +00:00
Alexei Kotov
70a0b7ea9c Editor: Drop zero attribute warnings 2024-01-26 19:23:03 +03:00
Evil Eye
f62e4f5707 Merge branch 'more_move' into 'master' 
Use std::move() in /apps/openmw

See merge request OpenMW/openmw!3805
 2024-01-26 16:21:00 +00:00
Alexei Kotov
48bbf0b637 Editor: Don't complain about body part references in Verify 2024-01-26 19:14:18 +03:00
Alexei Kotov
23e30eaaa5 Support MaxNumberRipples setting (#7795) 2024-01-26 17:18:50 +03:00
Alexei Kotov
2ea4013382 Correct base cloud speed, support Timescale Clouds fallback setting (#7792) 2024-01-26 17:18:50 +03:00
Pharis
3b0d654a3f Return active spell id from pairs 2024-01-25 18:10:10 -06:00
Evil Eye
a8ee3dfae8 Move the caching getActorsSidingWith to its own type 2024-01-25 20:44:18 +01:00
Evil Eye
bdc6119b31 Bring attack voice lines in line with research 
Only play them when starting combat when not in combat or not in combat
with one of the target's allies.
Don't play them when casting spells whose first effect isn't ranged.
 2024-01-25 19:36:41 +01:00
Alexei Kotov
29a40c212f Support parsing KF files in niftest 
Mention BA2 support in help messages
 2024-01-25 15:53:24 +03:00
Andrei Kortunov
9e55425b71 Use std::move() in /apps/openmw 2024-01-25 09:03:30 +04:00
Zackhasacat
3ef2f71062 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-01-24 15:50:46 -06:00
psi29a
cdf2459ed8 Merge branch 'constpreload' into 'master' 
Make cell models preloading a const operation

See merge request OpenMW/openmw!3777
 2024-01-24 21:35:05 +00:00
elsid
70061329a1
Return Path::Normalized from RecursiveDirectoryIterator 2024-01-24 22:19:03 +01:00
Evil Eye
54429cd23b Parse special characters that have been put back as names too 2024-01-24 18:31:04 +01:00
jvoisin
9616b03e7f Merge branch 'savegame_error' into 'master' 
Fix error message about savegame format

See merge request OpenMW/openmw!3796
 2024-01-23 21:00:39 +00:00
jvoisin
ec6ac8058b Merge branch 'vfs_normalized_path' into 'master' 
Add type for normalized VFS path and use for VFS::Manager file map key

See merge request OpenMW/openmw!3781
 2024-01-23 20:42:48 +00:00
Evil Eye
4dfe6078c8 Make StartCombat a no-op for dead targets and don't play an attack line when already in combat 2024-01-22 22:07:49 +01:00
psi29a
76ad680549 Merge branch 'tools' into 'master' 
Use move semantics for tools

See merge request OpenMW/openmw!3795
 2024-01-22 12:18:36 +00:00
Andrei Kortunov
2575801ba2 Improve esmtool output 2024-01-22 09:52:32 +04:00
Andrei Kortunov
a6ca726c3a Fix error message about savegame format 2024-01-21 21:02:59 +04:00
Andrei Kortunov
737d3b499b Use move semantics for tools 2024-01-21 20:20:37 +04:00
Andrei Kortunov
e01e2f1ae0 Fix magic effects in the editor 2024-01-21 17:50:45 +04:00
Andrei Kortunov
251d01304f Use move semantics for osg::ref_ptr 2024-01-21 13:48:33 +04:00
psi29a
a41259cca8 Merge branch 'tooltips_fix' into 'master' 
Fix tooltips in the main menu

See merge request OpenMW/openmw!3789
 2024-01-20 15:53:40 +00:00
Evil Eye
467220e6d7 Base GetColliding script functions on collisions detected by the movement solver 2024-01-20 16:50:51 +01:00
psi29a
6b35ee68e1 Merge branch 'holdstill' into 'master' 
Make scripted animations shut down pathfinding (bug #5065)

Closes #5065

See merge request OpenMW/openmw!3711
 2024-01-20 11:57:36 +00:00
psi29a
c23cd8e544 Merge branch 'umlautontherocks' into 'master' 
Convert strings in nif files to utf8

Closes #7780

See merge request OpenMW/openmw!3783
 2024-01-20 11:56:59 +00:00
Mads Buvik Sandvei
1f416d7c8a Lua: Creature skill bindings 2024-01-20 11:56:36 +00:00
Andrei Kortunov
b37aee21e3 Fix tooltips in the main menu 2024-01-19 15:16:46 +04:00
psi29a
6ead5f9321 Merge branch 'touch_record' into 'master' 
Fix Touch command

See merge request OpenMW/openmw!3778
 2024-01-19 08:32:03 +00:00
psi29a
7c14bac7c2 Merge branch 'load_save_composites' into 'master' 
Write AiSequence and Script data field by field via decompose function

See merge request OpenMW/openmw!3770
 2024-01-19 08:31:43 +00:00
psi29a
c84386aa4b Merge branch 'fix_navigator_update' into 'master' 
Fix navmesh update on player changing tile

See merge request OpenMW/openmw!3756
 2024-01-19 08:30:22 +00:00
psi29a
6b9fd12ab7 Merge branch 'fix_ubsan_warnings' into 'master' 
Fix ubsan warnings

See merge request OpenMW/openmw!3772
 2024-01-19 08:29:23 +00:00
psi29a
639b7b0b17 Merge branch 'light_settings' into 'master' 
Enhance light settings tweaking

See merge request OpenMW/openmw!3782
 2024-01-19 08:28:23 +00:00
psi29a
6ced0ab397 Merge branch 'sundirection' into 'master' 
Fix exterior sun direction/position (bug #4898)

Closes #4898

See merge request OpenMW/openmw!3733
 2024-01-19 08:27:50 +00:00
Evil Eye
fba4055877 Move return comments to a new line 2024-01-18 22:32:46 +01:00
Cody Glassman
3cdb9496c4 dont clear empty FBOs, fix doc example 2024-01-18 07:15:35 -08:00
elsid
35d9b18b4c
Add type for normalized VFS path and use for VFS::Manager file map key 
This will reduce the number of path normalizations while more places will use
this type. In some cases it also will reduce number of temporary allocations for
new strings.

For now make conversion from and to std::string_view implicit to allow gradual
migration to this type.
 2024-01-18 00:03:06 +01:00
Evil Eye
68c280a493 Merge branch 'streammusic_fade' into 'master' 
Add a table with fadeOut argument for streamMusic

See merge request OpenMW/openmw!3774
 2024-01-17 19:26:07 +00:00
Evil Eye
0f6133b040 Merge branch 'move_editor' into 'master' 
Move local variables in the editor

See merge request OpenMW/openmw!3771
 2024-01-17 17:21:05 +00:00
Evil Eye
48db113149 Address feedback 2024-01-17 18:10:42 +01:00
Evil Eye
27fa411f4f Convert strings in nif files to utf8 2024-01-16 20:56:58 +01:00
Andrei Kortunov
a340b49cbc Enhance light settings tweaking 2024-01-16 10:23:13 +04:00
elsid
a2147d70cc
Use forward declaration for some VFS types 
This will allow to save on preprocessed code size in the future changes.
 2024-01-16 01:32:11 +01:00
Evil Eye
5ae878c248 Merge branch 'blocksound' into 'master' 
Play shield hit sound for the shield that was hit (#7774)

Closes #7774

See merge request OpenMW/openmw!3776
 2024-01-15 16:06:01 +00:00
psi29a
39a1a7b2f1 Merge branch 'rework_launcher_tabs' into 'master' 
Rework launcher tabs

See merge request OpenMW/openmw!3775
 2024-01-15 11:31:28 +00:00
elsid
6451750890
Write AiSequence and Script data field by field via decompose function 
Use the same function to load and save to have single place with field order
definition. Use concepts for overload over different types.
 2024-01-14 23:04:56 +01:00
Andrei Kortunov
a91e557c68 Fix Touch command (bug 7765) 2024-01-14 22:10:18 +04:00
psi29a
2836ca2d91 Merge branch 'dynamic_casts' into 'master' 
Check dynamic cast results

See merge request OpenMW/openmw!3761
 2024-01-14 17:23:13 +00:00
uramer
0a2adfee16 SaveInfo.timePlayed field 2024-01-14 17:47:27 +01:00
Evil Eye
6ff14e19d1 Make cell models preloading a const operation 2024-01-14 16:41:55 +01:00
Andrei Kortunov
6cefe2c118 Rework launcher tabs 2024-01-14 14:05:14 +04:00
Alexei Kotov
1a629cbf07 Play shield hit sound for the shield that was hit (#7774) 2024-01-14 10:33:21 +03:00
Andrei Kortunov
98b281e4ad Add a missing assertion 2024-01-14 10:59:39 +04:00
Andrei Kortunov
f8c1d48c0b Get rid of redundant casts 2024-01-14 10:54:51 +04:00
Andrei Kortunov
14e6af8bea Add a table with fadeOut argument for streamMusic 2024-01-13 15:42:17 +04:00
psi29a
51426eb754 Merge branch 'topiccoloring' into 'master' 
Properly redraw the topics list when disposition bar state changes

See merge request OpenMW/openmw!3765
 2024-01-13 09:52:20 +00:00
uramer
b9afd7245c Create separate UI api tables for menu and player contexts 2024-01-13 10:13:13 +01:00
elsid
384a1dd13a
Update PrecipitationOccluder only when there is precipitation 2024-01-13 01:08:57 +01:00
AnyOldName3
c2d1a4c861 Initial stab at OSG plugin checker 
It doesn't work yet due to osgDB::listAllAvailablePlugins returning a list of paths to dynamic libraries.
That means:
* the check fails when the required plugin is linked statically.
* we're going to have to do something to slice up the filenames.
* there'll probably be unicode errors when the OpenMW installation path isn't representable by the current eight-bit code page on Windows.

Alternatively, we can switch to listing the required file extension support, and use osgDB::Registry::instance()->getReaderWriterList() and each element's supportedExtensions() function, but I don't think we've actually got that list of extensions anywhere and it might get desynced with the existing list of plugins if we add more.
 2024-01-12 23:43:14 +00:00
uramer
dd09c9b362 Don't save global storage if global scripts didn't run 2024-01-13 00:42:55 +01:00
jvoisin
99164b3a0e Merge branch 'cicontent' into 'master' 
Use ciEqual to detect missing content files

See merge request OpenMW/openmw!3767
 2024-01-12 19:19:02 +00:00
Zackhasacat
f3229f8674 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-01-12 12:01:44 -06:00
elsid
3592dc4c88
Add tests for saving and loading AiSequence::AiWander 2024-01-12 12:31:40 +01:00
psi29a
53e3dd0a70 Merge branch 'ondeath' into 'master' 
Handle running stats extensions on non-actors gracefully (#7770)

Closes #7770

See merge request OpenMW/openmw!3760
 2024-01-12 07:55:49 +00:00
Andrei Kortunov
074ab682ab Move local variables in the editor 2024-01-12 10:10:27 +04:00
Evil Eye
1880894f4a Use ciEqual to detect missing content files 2024-01-11 19:05:37 +01:00
psi29a
4c88ab5e07 Merge branch 'thunderstorm' into 'master' 
Interrupt thunder SFX indoors (bug #6402)

Closes #6402

See merge request OpenMW/openmw!3741
 2024-01-11 16:23:16 +00:00
psi29a
d458a8e43b Merge branch 'readonly_properties' into 'master' 
Refactor Lua properties

See merge request OpenMW/openmw!3762
 2024-01-11 09:32:30 +00:00
AnyOldName3
e6e24e1b6c Merge branch 'fix_mac_os_current_path' into 'master' 
Set MacOS current_path before reading configuration files [#7706]

See merge request OpenMW/openmw!3739
 2024-01-11 00:59:27 +00:00
Yury Stepovikov
52623ddd7d Set MacOS current_path before reading configuration files [#7706] 2024-01-11 00:59:27 +00:00
Alexei Kotov
c4ed812567 Properly redraw the topics list when disposition bar state changes 2024-01-11 03:28:34 +03:00
uramer
dd6017e81e Avoid making engine handler methods public 2024-01-11 00:55:29 +01:00
uramer
4ed2af7666 Merge branch 'master' into menuscripts 2024-01-10 23:21:42 +01:00
uramer
1092d2058d Load Lua storage before menu scripts might use it 2024-01-10 23:13:27 +01:00
uramer
1afc7ecd58 Test Lua widgets for text inputs correctly 2024-01-10 23:13:27 +01:00
uramer
79deb5f559 Remove settings pages in Lua 2024-01-10 23:13:27 +01:00
uramer
82a125fb6a Replace onUpdate with onFrame for menu scripts 2024-01-10 23:13:27 +01:00
uramer
2107bbc01d Reuse input engine handlers in menu scripts 2024-01-10 23:13:23 +01:00
uramer
962ecc4329 Allow menu scripts to read global sections while a game is loaded 2024-01-10 22:28:57 +01:00
Alexei Kotov
ccbc02abc3 Handle running stats extensions on non-actors gracefully (#7770) 2024-01-10 22:41:11 +03:00
psi29a
a6e07dd33a Merge branch 'paging' into 'master' 
Unbreak un-paging (#7768)

Closes #7768

See merge request OpenMW/openmw!3754
 2024-01-10 19:06:43 +00:00
psi29a
f56198c2c1 Merge branch 'static_npc_parts' into 'master' 
Use single global static variable in Npc::getSoundIdFromSndGen for all parts

See merge request OpenMW/openmw!3757
 2024-01-10 19:05:53 +00:00
psi29a
a0890259e1 Merge branch 'move' into 'master' 
Move local variables in GUI code

See merge request OpenMW/openmw!3758
 2024-01-10 19:05:01 +00:00
Andrei Kortunov
e67d6c6ebf Refactor Lua properties 2024-01-10 12:37:14 +04:00
psi29a
60d1262d61 Merge branch 'askloadnotreallyrecent' into 'master' 
Replicate recent save loading prompt behavior (bug #7617)

Closes #7617

See merge request OpenMW/openmw!3710
 2024-01-10 08:23:41 +00:00
psi29a
ce151692e9 Merge branch 'editor_shortcut_settings' into 'master' 
Use settings values to declare shortcut settings (#6876)

See merge request OpenMW/openmw!3753
 2024-01-10 08:23:10 +00:00
Alexei Kotov
78d8cf86c3 Merge branch 'pickme' into 'master' 
Override launcher file info with higher priority info

Closes #7733 and #7103

See merge request OpenMW/openmw!3743
 2024-01-09 21:42:45 +00:00
Alexei Kotov
778fe606b8 Merge branch 'beastly' into 'master' 
Restore beast race animations

See merge request OpenMW/openmw!3752
 2024-01-09 21:42:20 +00:00
Evil Eye
ff78c13903 Merge branch 'unused_hrtf' into 'master' 
Remove unused code

See merge request OpenMW/openmw!3750
 2024-01-09 18:18:16 +00:00
Evil Eye
672cefd594 Track checked EsmFile pointers instead of full paths 2024-01-09 17:40:14 +01:00
Andrei Kortunov
fbd99583ca Move local variables in GUI code 2024-01-09 16:11:44 +04:00
elsid
ad0ad625e5
Use single global static variable in Npc::getSoundIdFromSndGen for all parts 
To eliminate checks for local static variable initialization.
 2024-01-09 10:25:22 +01:00
psi29a
a0c0509e3f Merge branch 'rm_unused_apps_includes' into 'master' 
Use "" to quote apps/openmw includes and remove unused

See merge request OpenMW/openmw!3727
 2024-01-09 08:59:23 +00:00
psi29a
5bd2020c23 Merge branch 'inactiveeffects' into 'master' 
Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs

Closes #7440

See merge request OpenMW/openmw!3735
 2024-01-09 08:58:42 +00:00
elsid
69cf507db8
Fix navmesh update on player changing tile 
In cases when objects are not present on the scene (e.g. generated exterior
cells) navmesh is not updated because area that suppose to be covered with it
was not updated. It was updated only during cell change. This is a regression
from d15e1dca84.

Set TileCachedRecastMeshManager range on NavMeshManager update to make sure it
always covers correct area around player.

Return a union of objects, heightfields and water ranges from
getLimitedObjectsRange intersected with range provided above.
 2024-01-09 01:18:45 +01:00
uramer
539dc1ee43 Remove confusing addPlayerQuestBindings method 2024-01-08 21:57:59 +01:00
Alexei Kotov
9e3b427a98 Unbreak un-paging (#7768) 2024-01-08 23:41:51 +03:00
elsid
66f5d70550
Use settings values to declare shortcut settings 2024-01-08 21:09:12 +01:00
Evil Eye
164b6309a7 Improve legibility 2024-01-08 18:08:17 +01:00
Alexei Kotov
5043e67e06 Replicate recent save loading prompt behavior (bug #7617) 2024-01-08 19:53:52 +03:00
Evil Eye
97dee00263 Merge branch 'remove_klass' into 'master' 
Replace 'klass' by meaningful names

See merge request OpenMW/openmw!3745
 2024-01-08 16:50:40 +00:00
Evil Eye
64673ea21f Merge branch 'editor_colour_settings' into 'master' 
Use settings values to declare colour settings (#6876)

See merge request OpenMW/openmw!3747
 2024-01-08 16:48:18 +00:00
Evil Eye
6756b8613d Restore beast race animations 2024-01-08 17:18:08 +01:00
Andrei Kortunov
9102fd4d57 Remove unused code 2024-01-08 15:57:18 +04:00
jvoisin
57066bcac1 Merge branch 'more_cleanup' into 'master' 
Code cleanup

See merge request OpenMW/openmw!3746
 2024-01-08 11:35:24 +00:00
Alexei Kotov
3af28439d6 Interrupt thunder SFX indoors (bug #6402) 2024-01-08 12:06:51 +03:00
psi29a
1bccd8483f Merge branch 'cs-icon-fix' into 'master' 
Add OpenMW-CS RC file to app rather than static lib

See merge request OpenMW/openmw!3740
 2024-01-08 08:00:06 +00:00
psi29a
7019405278 Merge branch 'rainloop' into 'master' 
Support playing ambient and rain weather SFX at the same time (bug #7761)

Closes #7761

See merge request OpenMW/openmw!3738
 2024-01-08 07:59:55 +00:00
uramer
a6e2ceebb8 Don't clear menu UI on game load 2024-01-07 23:29:20 +01:00
uramer
d1268acf95 Merge branch 'master' into menuscripts 2024-01-07 23:15:21 +01:00
elsid
067957f57b
Use "" to quote apps/openmw includes and remove unused 
Using "" makes clangd to find unused includes which makes it quite easy to
remove them.
 2024-01-07 17:57:11 +01:00
elsid
cc0b00a0d2
Use settings values to declare colour settings 2024-01-07 17:32:50 +01:00
Andrei Kortunov
084fc80efd Use string_view for readonly string properties 2024-01-07 19:21:45 +04:00
Andrei Kortunov
8879d89e4a Replace 'klass' by meaningful names 2024-01-07 19:12:49 +04:00
Andrei Kortunov
4f65b7167a Do not copy vector for every door marker 2024-01-07 18:53:07 +04:00
Andrei Kortunov
828c40c710 Do not copy due to auto misuse 2024-01-07 18:52:10 +04:00
psi29a
eedb96863e Merge branch 'editor_enum_settings' into 'master' 
Use settings values to declare enum settings (#6876)

See merge request OpenMW/openmw!3724
 2024-01-07 10:14:07 +00:00
Alexei Kotov
9b8d685578 Expose requested apparent sun position (not normalized) to post-processing 2024-01-07 04:57:02 +03:00
Alexei Kotov
1f26485c47 Fix exterior sun direction/position (bug #4898) 2024-01-07 04:57:02 +03:00
Alexei Kotov
ed31a0354a Support playing ambient and rain weather SFX at the same time (bug #7761) 2024-01-07 04:56:36 +03:00
Alexei Kotov
01dcca3363 Make scripted animations shut down pathfinding (bug #5065) 2024-01-07 04:55:49 +03:00
Alexei Kotov
c1c774e11d Update the spells window when constant effects are added/removed (bug #7475) 2024-01-07 04:55:29 +03:00
Alexei Kotov
961c53f1c4 Merge branch 'clickcrash' into 'master' 
Don't crash when clicking the logo video

See merge request OpenMW/openmw!3736
 2024-01-07 01:21:56 +00:00
Alexei Kotov
dfc29974d0 Merge branch 'water_walking_cost' into 'master' 
Use walking speed for swimming actor with water walking for pathfinding (#7758)

Closes #7758

See merge request OpenMW/openmw!3732
 2024-01-07 01:19:43 +00:00
Alexei Kotov
8fff7215f4 Merge branch 'i-dont-have-a-type' into 'master' 
Selection Groups Cleanup

Closes #7759

See merge request OpenMW/openmw!3731
 2024-01-07 01:18:26 +00:00
AnyOldName3
6d37618301 Add OpenMW-CS RC file to app rather than static lib 
Static libraries on Windows can't have embedded resources, so this mean the icon for the CS wasn't used.
This could have also been resolved by explicitly requesting the library type as OBJECT rather than letting it default to STATIC (as object libraries aren't a thing on-disk and are just an abstraction in CMake so you can use the same object files in different targets), but this seemed less invasive.

I also made it Win32-only as a Windows .rc file is meaningless on Unix, but it shouldn't be MSVC-only as MinGW can consume them.
 2024-01-06 16:56:52 +00:00
Evil Eye
72c382aca6 Don't crash when clicking the logo video 2024-01-06 14:23:08 +01:00
Evil Eye
74a6c81d53 Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs 2024-01-06 14:14:29 +01:00
psi29a
c3c8fa1e61 Merge branch 'sceneleak' into 'master' 
Set paged refs' base node to null (#6335)

Closes #6335

See merge request OpenMW/openmw!3715
 2024-01-06 11:07:07 +00:00
Dave Corley
c563219b61 Cleanup(CS): Pass const ref when applicable for selection groups 2024-01-05 19:39:53 -06:00
Dave Corley
3ff1bae372 Cleanup(CS): More consistent names for selection group configs 2024-01-05 19:39:53 -06:00
Dave Corley
c93b6dca0a Fix(CS): Add record type to selection groups to fix #7759 2024-01-05 19:39:53 -06:00
elsid
903299ce50
Avoid recomputing navigator flags when getting area costs 2024-01-06 02:39:42 +01:00
elsid
594bd6e136
Use walking speed for swimming actor with water walking for pathfinding 
This will make them find shorter paths nearby shores.
 2024-01-06 02:39:40 +01:00
jvoisin
689efa6d69 Merge branch 'mapnotes' into 'master' 
Shorten global map marker notes like vanilla (bug #7619)

Closes #7619

See merge request OpenMW/openmw!3719
 2024-01-05 13:05:56 +00:00
jvoisin
5837f97b99 Merge branch 'nonexclusivesettings' into 'master' 
Downgrade Settings GUI mode to a modal (bug #6758)

Closes #6758

See merge request OpenMW/openmw!3720
 2024-01-05 13:04:20 +00:00
Alexei Kotov
19a7d50a3f Merge branch 'error_codes' into 'master' 
Use error messages instead of unhandled exceptions

See merge request OpenMW/openmw!3723
 2024-01-04 20:35:37 +00:00
Alexei Kotov
c5a3b516d6 Merge branch 'init_variables' into 'master' 
Add missing initialization

See merge request OpenMW/openmw!3722
 2024-01-04 20:31:55 +00:00
elsid
72fa4924dc
Use settings values to declare enum settings 2024-01-03 22:55:00 +01:00
Andrei Kortunov
7ffb2bc3c4 Use error messages instead of unhandled exceptions 2024-01-03 21:48:25 +04:00
Andrei Kortunov
8d3efd27ba Add missing initialization 2024-01-03 19:25:33 +04:00
Alexei Kotov
febfccb356 Merge branch 'move_class_text' into 'master' 
Avoid redundant string copies

See merge request OpenMW/openmw!3718
 2024-01-03 15:24:22 +00:00
Alexei Kotov
b132fd4373 Merge branch 'lua_action_fixes' into 'master' 
Lua Action fixes

See merge request OpenMW/openmw!3717
 2024-01-03 15:19:18 +00:00
Alexei Kotov
7310418984 Downgrade Settings GUI mode to a modal (bug #6758) 2024-01-02 22:32:52 +03:00
Alexei Kotov
19a6fd4e1b Merge branch 'display_esm_version' into 'master' 
Improve format version in content selector

See merge request OpenMW/openmw!3709
 2024-01-02 17:32:21 +00:00
Alexei Kotov
14942d7541 Shorten global map marker notes like vanilla (bug #7619) 2024-01-02 18:50:32 +03:00
Andrei Kortunov
fb16871c80 Avoid redundant string copies 2024-01-02 18:30:35 +04:00
uramer
e9b48e35c0 Coverity defects 2024-01-02 13:54:02 +01:00
Alexei Kotov
2ff2e3c2ef Merge branch 'raceless' into 'master' 
Replace missing NPC races and default animations

Closes #6754

See merge request OpenMW/openmw!3703
 2024-01-02 12:37:03 +00:00
Alexei Kotov
2fbdde34c6 Set paged refs' base node to null (#6335) 2024-01-02 02:31:47 +03:00
jvoisin
29c20cdb41 Merge branch 'fix_universal_id' into 'master' 
Add missing UniversalId::mClass initialization

See merge request OpenMW/openmw!3707
 2024-01-01 23:05:57 +00:00
Andrei Kortunov
93e50cc7aa Improve format version in content selector 2024-01-01 18:16:58 +04:00
Evil Eye
ef4e5b45e3 Don't add custom anim source if it's a default animation but keep the skeleton 2024-01-01 15:06:32 +01:00
Evil Eye
03c791e61a Move animation handling to NpcAnimation 2024-01-01 13:58:55 +01:00
Evil Eye
84c15344ee Address feedback 2024-01-01 13:07:43 +01:00
Evil Eye
4636ab3f3e Update cmakelists 2024-01-01 13:07:43 +01:00
Evil Eye
5bd5c84018 Replace missing NPC races and default animations 2024-01-01 13:07:43 +01:00
elsid
94409ce172
Add missing UniversalId::mClass initialization 2024-01-01 01:12:19 +01:00
Alexei Kotov
78459314bf Merge branch 'impartialplayerbelike' into 'master' 
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us

Closes #7645

See merge request OpenMW/openmw!3650
 2023-12-31 17:33:08 +00:00
jvoisin
31ac993374 Merge branch 'allthatglitters' into 'master' 
Use NAM9 for stack count

Closes #2566

See merge request OpenMW/openmw!3698
 2023-12-31 17:12:46 +00:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +00:00
jvoisin
6180ad0e51 Merge branch 'sunlighting' into 'master' 
Fix interior sun direction (bug #7585)

Closes #7585

See merge request OpenMW/openmw!3699
 2023-12-31 17:12:32 +00:00
Evil Eye
c97d0b5252 Merge branch 'weather' into 'master' 
Make rain and snow ripple settings global rather than per-weather (#7748)

See merge request OpenMW/openmw!3706
 2023-12-31 11:01:14 +00:00
Alexei Kotov
7e162a0d7c Merge branch 'lua_real_frame_time' into 'master' 
Pass real frame duration to onFrame

See merge request OpenMW/openmw!3621
 2023-12-31 01:21:41 +00:00
Alexei Kotov
0f9eb3d85a Merge branch 'editor_double_settings' into 'master' 
Use settings values to declare double settings (#6876)

See merge request OpenMW/openmw!3701
 2023-12-30 15:20:25 +00:00
Alexei Kotov
8a91e7057f Merge branch 'ref_id_universal_id' into 'master' 
Fix RefId based UniversalId (#7747)

Closes #7747

See merge request OpenMW/openmw!3702
 2023-12-30 10:59:03 +00:00
psi29a
7647af6e4e Merge branch 'friendlyhit' into 'master' 
Correct friendly fire reaction for different damage sources (bug #7646)

Closes #7646

See merge request OpenMW/openmw!3694
 2023-12-30 09:43:19 +00:00
psi29a
67955ac55f Merge branch 'treejunk' into 'master' 
Discard additional tokens in non-expression contexts

See merge request OpenMW/openmw!3700
 2023-12-30 09:42:26 +00:00
psi29a
cb24475662 Merge branch 'what-a-selection-you-have' into 'master' 
Feat(CS): Add More Selection Controls

See merge request OpenMW/openmw!3674
 2023-12-30 09:40:29 +00:00
Alexei Kotov
640fa53bb8 Make rain and snow ripple settings global rather than per-weather (#7748) 2023-12-30 04:24:18 +03:00
Evil Eye
01eb333fad Merge branch 'generic_object_cache' into 'master' 
Refactor GenericObjectCache and add unit tests

See merge request OpenMW/openmw!3689
 2023-12-29 21:22:30 +00:00
psi29a
e9f3e5c6d1 Merge branch 'lua_actions_electric_boogaloo' into 'master' 
Lua actions take 3

See merge request OpenMW/openmw!2628
 2023-12-29 18:56:59 +00:00
uramer
0e2e386dc9 Lua actions take 3 2023-12-29 18:56:59 +00:00
Evil Eye
3f6c3e24f4 Merge branch 'autoequipcrash' into 'master' 
Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll (#7744)

Closes #7744

See merge request OpenMW/openmw!3697
 2023-12-29 14:30:49 +00:00
elsid
39dd73263d
Avoid converting UniversalId to a different type via string 2023-12-29 14:15:28 +01:00
elsid
7b5310b569
Write StringRefId as is when converting UniversalId to string 
To avoid adding quotes which on conversion ESM::StringRefId -> UniversalId ->
std::string -> UniversalId changes the string value adding quotes.
 2023-12-29 14:12:36 +01:00
psi29a
2fde1ef3d8 Merge branch 'bodypartanimation' into 'master' 
NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822)

Closes #4822

See merge request OpenMW/openmw!3653
 2023-12-29 13:09:56 +00:00
elsid
0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId 2023-12-29 13:10:13 +01:00
Alexei Kotov
abbbd8cf69 Fix interior sun direction (bug #7585) 2023-12-29 02:21:39 +03:00
elsid
088d4ee5ce
Use settings values to declare double settings 2023-12-28 22:08:04 +01:00
elsid
fd2fc63dd3
Support heterogeneous lookup in GenericObjectCache 2023-12-28 21:58:41 +01:00
elsid
56401a90a1
Merge GenericObjectCache update and remove functions 
They are always called together. Single iteration over the items is more
efficient along with locking the mutex only once.
 2023-12-28 21:58:33 +01:00
Evil Eye
02775c490b Discard additional tokens in non-expression contexts 2023-12-28 21:49:25 +01:00
jvoisin
c9d4ca5320 Merge branch 'editor_string_settings' into 'master' 
Use settings values to declare string settings (#6876)

See merge request OpenMW/openmw!3695
 2023-12-28 14:51:09 +00:00
AnyOldName3
647bd2b572 Merge branch 'revert-78a8f9d6' into 'master' 
Revert "Merge branch 'skating-olympics' into 'master'"

See merge request OpenMW/openmw!3696
 2023-12-28 00:59:07 +00:00
jvoisin
dcb403c114 Merge branch 'training' into 'master' 
Use modified value for governing attribute training limit (#7742)

Closes #7742

See merge request OpenMW/openmw!3692
 2023-12-27 22:49:23 +00:00
Alexei Kotov
30cff6f6ee Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll 2023-12-28 01:49:18 +03:00
Mads Buvik Sandvei
9d3ede7575 Revert "Merge branch 'skating-olympics' into 'master'" 
This reverts merge request !3631
 2023-12-27 19:11:49 +00:00
Alexei Kotov
f1782ad8df Merge branch 'rm_unused_vfs' into 'master' 
Remove unused vfs argument from correctMeshPath

See merge request OpenMW/openmw!3691
 2023-12-27 17:23:16 +00:00
Alexei Kotov
ca5e7d1ccb Merge branch 'fix_fallout3' into 'master' 
Make traits and base data optional for ESM4 NPC

See merge request OpenMW/openmw!3682
 2023-12-27 17:10:13 +00:00
Alexei Kotov
d5428b23d8 Disable voiced responses to magical friendly hits (bug #7646) 
Disable ranged friendly fire
 2023-12-27 20:05:08 +03:00
Alexei Kotov
94c052dfef Classify the damage passed to Class::onHit 2023-12-27 20:05:08 +03:00
Evil Eye
c6e5a28241 Merge branch 'crime_disposition' into 'master' 
Implement crime disposition modifier

Closes #4683

See merge request OpenMW/openmw!3448
 2023-12-27 11:53:56 +00:00
elsid
13c8e04b27
Make traits and base data optional for ESM4 NPC 
Fallout 3 is not fully supported and it causes failures to load NPCs. Log errors
and make sure there is no nullptr dereference.
 2023-12-27 10:07:48 +01:00
jvoisin
291d19af48 Merge branch 'rm_ref_ptr' into 'master' 
Avoid using osg::ref_ptr when reference is enough

See merge request OpenMW/openmw!3690
 2023-12-27 08:03:16 +00:00
elsid
6a16686107
Use settings values to declare string settings 2023-12-27 00:33:45 +01:00
Alexei Kotov
1834597361 Move friendly fire logic to onHit 2023-12-27 01:03:23 +03:00
Alexei Kotov
1b594d874e Use modified value for governing attribute training limit (#7742) 2023-12-26 21:53:49 +03:00
AnyOldName3
a497d40689 Merge branch 'vfs_string_view' into 'master' 
Use string_view for VFS (#6125)

See merge request OpenMW/openmw!3688
 2023-12-26 18:40:25 +00:00
Cody Glassman
8f85c9194d lua - add bindings to get frame duration 2023-12-26 09:15:55 -08:00
psi29a
a2c6009352 Merge branch 'editor_bool_settings' into 'master' 
Use settings values to declare bool settings (#6876)

See merge request OpenMW/openmw!3679
 2023-12-26 15:31:14 +00:00
jvoisin
f80ba4e28c Apply 1 suggestion(s) to 1 file(s) 2023-12-26 13:54:23 +00:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath 2023-12-26 14:14:52 +01:00
elsid
145f7b5672
Avoid using osg::ref_ptr when reference is enough 2023-12-26 11:35:03 +01:00
psi29a
5d53eb7566 Merge branch 'russianroulette' into 'master' 
BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children

See merge request OpenMW/openmw!3634
 2023-12-26 10:33:20 +00:00
psi29a
ff514df5a1 Merge branch 'distortion' into 'master' 
Distortion

See merge request OpenMW/openmw!3536
 2023-12-26 10:31:51 +00:00
psi29a
f80bbd4e39 Merge branch 'these-are-the-datas-youre-looking-for' into 'master' 
Add game-independent VFS directory to CS' VFS

See merge request OpenMW/openmw!3683
 2023-12-26 10:21:58 +00:00
Andrei Kortunov
ffffb427f5 Implement crime disposition modifier (bug 4683) 2023-12-26 14:04:23 +04:00
jvoisin
b39a6ae9cd Merge branch 'smoothbraincriminal' into 'master' 
End pursue package if the target doesn't have a bounty

See merge request OpenMW/openmw!3677
 2023-12-26 09:59:24 +00:00
elsid
851bad4262 Merge branch 'precipitationripples' into 'master' 
Use fallback weather ripple settings (bug #7292)

Closes #7292

See merge request OpenMW/openmw!3671
 2023-12-26 09:51:23 +00:00
elsid
dc8c979d1a Merge branch 'avoid_duplication' into 'master' 
Store generated UI by pointer to avoid redundant processing

See merge request OpenMW/openmw!3680
 2023-12-26 09:39:47 +00:00
elsid
71e33cf8b2
Add unit tests for GenericObjectCache 2023-12-25 14:12:16 +01:00
elsid
0d8dc5aabc
Use string_view for VFS lookups 2023-12-25 12:21:01 +01:00
AnyOldName3
01e2e56f97 Add game-independent VFS directory to CS' VFS 
This should have been like this all along - all the other applications that use the game's VFS do this.
 2023-12-24 17:55:49 +00:00