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 5dcac4c48fOpenMW/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
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
