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

8154 commits

Author SHA1 Message Date
Andrei Kortunov
ddd0945645 Add a storage mode to drop section on game exit 2024-02-27 23:26:22 +04:00
Mads Buvik Sandvei
c82c111ee1 Use correct index for Athletics_SwimOneSecond 2024-02-27 19:28:51 +01:00
AnyOldName3
f476301670 There's no such thing as the global data directory
That's what resources/vfs is for.
2024-02-27 14:11:48 +00:00
AnyOldName3
7d28788aee data-local is already unquoted when it's read 2024-02-27 02:14:31 +00:00
AnyOldName3
dbdecfe94b Use approved safety comment for path escaping explanation
I thought I'd got this one already
2024-02-27 01:41:12 +00:00
AnyOldName3
90966ecc47 Handle replace= lines properly in the launcher 2024-02-27 01:39:49 +00:00
AnyOldName3
626f438dcc Make builtin.omwscripts actually mandatory
Previously it was quasi-mandatory - lots of things would add it, e.g. when running openmw through the CS, but it could technically be disabled.

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

Closes #7841

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

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

See merge request OpenMW/openmw!3903
2024-02-26 11:21:33 +00:00
AnyOldName3
bcd54ab1ff Format osgpluginchecker.cpp.in
I formatted the generated file that's part of the VS solution, then diffed it against the input and changed it to match.
2024-02-25 23:01:52 +00:00
AnyOldName3
02ef7ae3cc Give up rearranging the CS 2024-02-25 22:49:53 +00:00
AnyOldName3
93a84b38ac Give git-version its name back 2024-02-25 19:05:38 +00:00
AnyOldName3
42c7fc8e92 Update 2 files
- /components/CMakeLists.txt
- /cmake/GitVersion.cmake
2024-02-25 18:53:19 +00:00
uramer
86a82ae3f1 Open matching version of documentation for Launcher Help 2024-02-25 18:20:40 +01:00
AnyOldName3
357bf3db61 Load all config files 2024-02-25 14:01:20 +00:00
Dave Corley
059191c840 Also apply hasWaterHeightSub for INTV 2024-02-25 07:30:23 -06:00
Alexei Kotov
357b190571 Merge branch 'oldsavessuck' into 'master'
Account for pre-0.46 saves storing a gold value of 0 for everything

See merge request OpenMW/openmw!3902
2024-02-25 10:07:52 +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
AnyOldName3
a761e417f1 Accept that it's too much work to defer light manager creation in the CS and instead use something akin to the old approach 2024-02-24 16:59:11 +00: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
82c92a9a6c Merge branch 'bookart-is-textures-too' into 'master'
Consider bookart a valid prefix for regular textures and vice versa

Closes #7535

See merge request OpenMW/openmw!3342
2024-02-24 10:31:13 +00:00
AnyOldName3
dec8d32b3a FIx static destruction order chaos 2024-02-24 00:54:40 +00:00
Andrei Kortunov
cf6b6020a0 Move local variables 2024-02-23 17:10:55 +04:00
Andrei Kortunov
fc1f244627 Add missing initialization 2024-02-23 17:01:59 +04:00
AnyOldName3
3fbd97ffc8 Remove unused <vector> header 2024-02-23 12:48:39 +00:00
Alexei Kotov
6d35b626cf Merge branch 'fix_components_property' into 'master'
Set components property after it is defined

See merge request OpenMW/openmw!3899
2024-02-23 12:41:36 +00:00
Alexei Kotov
89d856d03e Merge branch 'use_is_directory_member' into 'master'
Use is_directory member function

See merge request OpenMW/openmw!3897
2024-02-23 12:36:40 +00:00
AnyOldName3
6406095bfb s p a n 2024-02-23 01:34:01 +00:00
AnyOldName3
2bc091fc05 Include missing header
I thought I'd seen this class defined in one of the existing headers
with a different name, but I was muddling its forward declaration and a
different class being in a non-obvious header.
2024-02-23 00:15:23 +00:00
AnyOldName3
ec4731d454 Cope with scene widgets being destroyed in a weird order
I can't actually test this as the CS still doesn't get far enough with this MR.
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
AnyOldName3
1717e696b1 Format before clang notices and sends me an angry email 2024-02-23 00:06:51 +00:00
AnyOldName3
db5a43db30 Allow top-level prefix to be found in the middle of a path 2024-02-23 00:04:48 +00:00
Evil Eye
0bab37327c Account for pre-0.46 saves storing a gold value of 0 for everything 2024-02-22 20:23:21 +01: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
elsid
38990b1fd2
Set components property after it is defined 2024-02-22 11:15:39 +01:00
Dave Corley
ce2787e15e Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub 2024-02-22 03:26:17 -06:00
Dave Corley
d04572ac84 Cleanup(loadcell): Rename mHasWater to mHasWaterHeightSub for clarity. 2024-02-22 03:01:29 -06:00
Dave Corley
f95cad07f2 Cleanup(loadcell): Remove unused integer water flag 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
1b431bf633 Fix(editor): Don't save dirty water height values 2024-02-22 03:01:28 -06:00
psi29a
35f547ad7c Merge branch 'fatstacks' into 'master'
Allow the NAM9 field to be used if COUN is omitted

Closes #7836

See merge request OpenMW/openmw!3889
2024-02-22 08:10:59 +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
2a5f8d5bab Skip the check on MacOS
It doesn't work, the workaround isn't enough to make it work, I can't be bothered making a more powerful workaround, and it's impossible to *package* a MacOS build missing the plugins we need anyway, even if you can build and attempt to run it.
2024-02-22 00:24:44 +00:00
elsid
c2ac1ce046
Use is_directory member function
To reduce the number of syscalls.
2024-02-21 22:03:15 +01:00
AnyOldName3
3335ccbc32 Capitulate 2024-02-20 23:51:42 +00:00
AnyOldName3
8c92f6ee87 Make uniform a signed int again 2024-02-20 23:10:23 +00:00
AnyOldName3
d282fdb77a Eliminate unused uniform 2024-02-20 23:10:03 +00:00
AnyOldName3
132c43affa Fix warning
Also attempt to make an equivalent warning fire with MSVC, then have to fix other stuff because /WX wasn't working, then back out of enabling the warning because none of the ones I could find disliked the old code.
2024-02-20 22:14:13 +00:00
AnyOldName3
7391bf2814 Fix OpenGL errors
There's no reason to use the AndModes variant as we never (intentionally) attempt to sample from a shadow map via the FFP.
2024-02-20 21:23:23 +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
Evil Eye
254b533512 Allow the NAM9 field to be used if COUN is omitted 2024-02-20 20:04:28 +01: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
AnyOldName3
2c1c8bc8de Work around for listAllAvailablePlugins 2024-02-19 23:16:50 +00:00
psi29a
e88e92d3aa Merge branch 'recursive_directory_iteration_errors' into 'master'
Add context to the errors on recursive iteration over directory

See merge request OpenMW/openmw!3872
2024-02-19 10:00:24 +00: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
elsid
efbc37d22f
Build components with position independent code only for Android
openmw is build as shared library with position independent code enabled there
so linked static libraries need to have this too.
2024-02-18 19:36:58 +01:00
elsid
e2e1d913af
Remove redundant destructor 2024-02-18 14:54:51 +01:00
elsid
8c6e0866e0
Avoid seek for detecting BSA type
Seek is pretty expensive operation. Try to read first 12 bytes instead.
2024-02-18 14:54:51 +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
1b1ed55762
Add context to the errors on recursive iteration over directory
To avoid showing users errors like:
recursive_directory_iterator::operator++: Access is denied.

And show something like this:
Failed to recursively iterate over "/home/elsid/.local/share/openmw/test_data"
when incrementing to the next item from
"/home/elsid/.local/share/openmw/test_data/permission_denied": Permission denied
2024-02-18 01:08:19 +01:00
elsid
a2345194c8
Optimize lookup for a file in the BSA archive
Use binary search in sorted vector or normalized paths instead of linear search
in the original file struct. With number of files from 1k to 10k in vanilla
archives this gives some benefits.
2024-02-18 00:56:50 +01:00
psi29a
a297a0e742 Merge branch 'init_filesystem_archive' into 'master'
Initialize FileSystemArchive index in constructor

See merge request OpenMW/openmw!3870
2024-02-17 23:42:30 +00: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
elsid
d147d1d250
Initialize FileSystemArchive index in constructor
It should be initialize for each created archive anyway. There is no good reason
to have additional complexity for lazy initialization. And it helps to catch
problems with specific directory when it's added to the VFS not when all are
added and index is built.
2024-02-17 02:07:50 +01:00
Alexei Kotov
d9ee54ae98 DebugCustomDraw: Correct PerContextProgram use, clean up drawImplementation 2024-02-16 14:43:16 +03: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
Andrei Kortunov
9a7b9572fd Deploy base Qt translations when needed 2024-02-15 09:26:14 +04:00
uramer
08b7ee8a44 Test LuaUtil::safeGet preventing crash 2024-02-14 09:49:32 +01:00
uramer
550659c2d9 Fix loadVFS error handling 2024-02-14 09:49:32 +01:00
uramer
aa4303fc38 Fix crash when throwing in index meta methods 2024-02-14 09:49:32 +01: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
Epoch
6486f3f2cf Add option to use camera as sound listener 2024-02-13 09:18:18 +00:00
uramer
851e291501 Simplify and fix the storage subscribe test 2024-02-13 00:56:14 +01:00
uramer
35448bf0fe Fix crash when passing a non-callback table to a callback argument 2024-02-12 20:28:56 +01: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
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
Evil Eye
75d0b6e355 Use decompose to handle AI packages and data 2024-02-11 22:06:58 +01:00
elsid
1e07935366
Make crashCatcherInstall no-op for Android
The crashcatcher.cpp is not linked on Android because it's not supported but the
function need to have some definition. Make it empty to avoid link failures.
2024-02-11 03:18:43 +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
4df62d53db Fix OSG boilerplate macro for DebugCustomDraw 2024-02-10 01:25:15 +03:00
Alexei Kotov
6a96cdaa31 Make DebugDrawer a Node 2024-02-09 22:16:46 +03:00
Alexei Kotov
9531b6983a Don't reallocate debug line primitives 2024-02-09 22:16:32 +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
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
Andrei Kortunov
6760fa4945 Localize screenshot messages 2024-02-08 12:50:12 +04: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
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
9fc71bb7df Merge branch 'crash_catcher' into 'master'
Cleanup crash catcher code and support lldb

See merge request OpenMW/openmw!3792
2024-02-05 13:01:10 +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
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
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
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
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
psi29a
ee8eb9d36e Merge branch 'localizable_errors' into 'master'
Make ContentSelector errors localizable

See merge request OpenMW/openmw!3821
2024-01-31 10:51:54 +00:00
psi29a
5ca8f7a00e Merge branch 'normalizedsun' into 'master'
Actually normalize the sun position exposed to post-processing

See merge request OpenMW/openmw!3820
2024-01-31 10:50:31 +00:00
Mads Buvik Sandvei
011d9d6493 Dehardcode skill and level progression 2024-01-30 21:25:36 +01: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
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
Andrei Kortunov
43307bee28 Make ContentSelector errors localizable 2024-01-28 11:25:46 +04:00
Alexei Kotov
422e455157 Actually normalize the sun position exposed to post-processing 2024-01-28 05:38:12 +03:00
uramer
9cce2e39ba Merge branch 'master' into menuscripts 2024-01-27 15:45:31 +01:00
Mads Buvik Sandvei
a94add741e Lua: Animation bindings 2024-01-26 21:39:33 +00:00
Alexei Kotov
ad64c71753 Correct MaxNumberRipples and Timescale Clouds validation categories 2024-01-26 17:12:58 +03:00
elsid
70061329a1
Return Path::Normalized from RecursiveDirectoryIterator 2024-01-24 22:19:03 +01:00
elsid
9279138fb0
Accept normalized path by VFS::Manager functions 2024-01-24 21:52:49 +01:00
elsid
d549cfd66b
Check path for being normalized 2024-01-24 21:52:49 +01:00
elsid
199d97d32a
Use forward declaration for VFS::Manager 2024-01-24 21:52:48 +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
940856b774 Merge branch 'ba2ext' into 'master'
Make BA2 extension hash calculation safer (#7784)

Closes #7784

See merge request OpenMW/openmw!3799
2024-01-23 21:02:17 +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
Alexei Kotov
84ab7afd44 Make BA2 extension hash calculation safer (#7784) 2024-01-21 23:03:37 +03:00
Andrei Kortunov
251d01304f Use move semantics for osg::ref_ptr 2024-01-21 13:48:33 +04:00
psi29a
0ad5829e5d Merge branch 'move_components' into 'master'
Move local variables in components

See merge request OpenMW/openmw!3790
2024-01-20 15:53:07 +00:00
psi29a
f7c819a118 Merge branch 'waterculling' into 'master'
Don't use height cull callback when there's no terrain

See merge request OpenMW/openmw!3787
2024-01-20 15:52:59 +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
elsid
b96e32144c
Support lldb in crash catcher 2024-01-19 21:11:23 +01:00
elsid
0095cb604f
Handle sysctl errors without assert 2024-01-19 21:11:20 +01:00
elsid
4efc0e20a3
Report errors on handling the crash 2024-01-19 21:00:33 +01:00
elsid
acb246cbf2
Report errors on printing gdb info 2024-01-19 21:00:33 +01:00
elsid
140cc53b55
Report errors on installing crash handler 2024-01-19 21:00:33 +01:00
elsid
2ef286b27a
Make sure function handling crash does not return 2024-01-19 21:00:33 +01:00
elsid
fffc6101b7
Remove unnecessary nesting 2024-01-19 21:00:32 +01:00
elsid
55501a02c0
Define only one crashCatcherInstall function 2024-01-19 21:00:32 +01:00
elsid
fc12728d25
Move crash_switch variable to cpp file 2024-01-19 21:00:32 +01:00
elsid
8348557893
Move crash handling out of crash handler installation 2024-01-19 21:00:32 +01:00
elsid
7763fe73d8
Make it clear handled signals are always the same 2024-01-19 21:00:32 +01:00
elsid
d54bb5cb5a
Declare variables closer to where they are used 2024-01-19 21:00:29 +01:00
elsid
d6f1fbe2c9
Remove unused user info function 2024-01-19 19:22:15 +01:00
elsid
388a73376c
Use std::optional for siginfo 2024-01-19 19:22:15 +01:00
elsid
c95c8fcc36
Add missing description for SIGABRT 2024-01-19 19:22:15 +01:00
elsid
48c3268bcb
Reduce code duplication for finding signal description 2024-01-19 19:22:14 +01:00
elsid
98844a692d
Regroup crash catcher includes 2024-01-19 19:21:01 +01:00
Andrei Kortunov
87c9f395f1 Move local variables in components 2024-01-19 16:01:48 +04:00
Alexei Kotov
e997c44db6 Restore unwrapped Bullet triangle shape shallow copying 2024-01-19 12:53:35 +03:00
Alexei Kotov
ffa52dfe7c Don't use height cull callback when there's no terrain 2024-01-19 12:24:15 +03: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
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
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
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
elsid
4d6350539c
Move FindLowestUnusedTexUnitVisitor to unnamed namespace
It's not used anywhere except this translation unit so no need to make the
symbol available everywhere else.
2024-01-15 22:23:59 +01: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
psi29a
4f21ea2eae Merge branch 'rm_redundant_ctors' into 'master'
Remove redundant SizeProxy and RenderTarget constructors

See merge request OpenMW/openmw!3769
2024-01-13 09:51:10 +00:00
psi29a
8dbadd660e Merge branch 'pregenerate_glow_textures' into 'master'
Pregenerate glow texture names

See merge request OpenMW/openmw!3768
2024-01-13 09:50:47 +00:00
uramer
b9afd7245c Create separate UI api tables for menu and player contexts 2024-01-13 10:13:13 +01:00
elsid
dd706aab0e
Add missing SubPass::mMinMap initialization 2024-01-13 01:08:57 +01:00
AnyOldName3
e0eb3feb89 Use OSG_PLUGIN_PREFIX instead of CMAKE_SHARED_MODULE_PREFIX
Logic to generate it copied from OSG's CMake instead of guessed.
2024-01-12 23:49:53 +00:00
uramer
7cc0eae461 Fix Menu Lua settings reset between states 2024-01-13 00:46:24 +01:00
AnyOldName3
62f5c46f25 Split list in CMake instead of C++
That avoids the need for constexpr work, and therefore the need for an MSVC-specific extension
2024-01-12 23:43:14 +00:00
AnyOldName3
de107c6a98 Add missing _view 2024-01-12 23:43:14 +00:00
AnyOldName3
ef65f0c70d Make OSG plugin checker barely functional
* Work out what module filenames should be in CMake, and give those to C++
* Compare just the module filenames instead of the full strings
* Deal with OSG trying to support both UTF-8 and system-eight-bit-code-page file paths on Windows.
* Add a comment complaining about the constexpr situation.
* Use a stub implementation when using static OSG - apparently we don't actually support mixing and matching static and dynamic OSG plugins even though OSG itself does.
2024-01-12 23:43:14 +00: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
elsid
1bfcfaff34
Use proper naming for member variable 2024-01-12 03:40:54 +01:00
elsid
35da9f8c50
Remove redundant SizeProxy and RenderTarget constructors 2024-01-12 01:49:17 +01:00
elsid
3ad79e3b3e
Pregenerate glow texture names
To avoid strings generation and allocations every time model is added to a
scene.
2024-01-11 23:54:20 +01:00
Evil Eye
1880894f4a Use ciEqual to detect missing content files 2024-01-11 19:05:37 +01:00
Evil Eye
2fc87efa8f Merge branch 'cleanup_navmesh_updater' into 'master'
Cleanup navmesh updater

See merge request OpenMW/openmw!3763
2024-01-11 17:50:12 +00:00
Yury Stepovikov
52623ddd7d Set MacOS current_path before reading configuration files [#7706] 2024-01-11 00:59:27 +00: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
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
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
Andrei Kortunov
0e1bb45345 Cleanup navmesh updater 2024-01-10 15:28:26 +04: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
Evil Eye
d05f5e84ff Merge branch 'missing_assert' into 'master'
Add missing assertion

See merge request OpenMW/openmw!3751
2024-01-09 18:17:31 +00:00
Evil Eye
0db8026356 Stop adding and deleting rows 2024-01-09 17:45:48 +01:00
Evil Eye
672cefd594 Track checked EsmFile pointers instead of full paths 2024-01-09 17:40:14 +01:00
Evil Eye
521394d67b Override launcher file info with higher priority info 2024-01-09 17:40:14 +01: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
Andrei Kortunov
d1a7dfee87 Add missing assertion 2024-01-08 16:19:40 +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
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
jvoisin
bb22c6e739 Merge branch 'navmesh_cleanup' into 'master'
Small cleanup for navmesh related code

See merge request OpenMW/openmw!3734
2024-01-07 22:14:52 +00:00
Alexei Kotov
14c8103a9e Merge branch 'dripdrop' into 'master'
Drop support for save game format 4

Closes #6624

See merge request OpenMW/openmw!3737
2024-01-07 18:01:20 +00:00
elsid
b0b6c48a88
Add clarifying comments to detournavigator coordinates conversion functions 2024-01-07 17:57:53 +01:00
elsid
afd6f0739c
Format box shape indices grouping by triangle 2024-01-07 17:57:53 +01:00
Andrei Kortunov
828c40c710 Do not copy due to auto misuse 2024-01-07 18:52:10 +04:00
psi29a
bfb60c5504 Merge branch 'compileerror' into 'master'
Contect selector: fix ESM date and version data encoding/decoding (#7764)

Closes #7764

See merge request OpenMW/openmw!3742
2024-01-07 14:15:52 +00:00
Alexei Kotov
327fafe739 Contect selector: fix ESM date and version data encoding/decoding (#7764) 2024-01-07 07:16:42 +03:00
Alexei Kotov
bd2ea715b4 Bring ESM4 head part reading up-to-date with FO76 2024-01-07 04:55:39 +03:00
Alexei Kotov
0b63fafc6d Bring ESM4 global variable reading up-to-date with FO76 2024-01-07 04:55:39 +03:00
Alexei Kotov
f9825328d2 Bring ESM4 texture set reading up-to-date with FO76 2024-01-07 04:55:39 +03:00
Alexei Kotov
18982ea4a0 Read FO76 plugin header 2024-01-07 04:55:39 +03:00
Evil Eye
a11ff46e82 Drop support for save game format 4 2024-01-06 14:59:22 +01:00
psi29a
21f177daac Merge branch 'shininess' into 'master'
Silence OSG shininess limit warnings

See merge request OpenMW/openmw!3725
2024-01-06 11:26:40 +00:00
psi29a
459aa69b87 Merge branch 'clampunclamped' into 'master'
Manually clamp controller time (#7523)

Closes #7523

See merge request OpenMW/openmw!3713
2024-01-05 09:43:23 +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
Alexei Kotov
3ba03782c0 Silence OSG shininess limit warnings 2024-01-04 01:02:33 +03:00
Andrei Kortunov
8d3efd27ba Add missing initialization 2024-01-03 19:25:33 +04: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
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
uramer
e9b48e35c0 Coverity defects 2024-01-02 13:54:02 +01:00
uramer
1d8ee7984f Make input.triggers[] consistent with input.actions[] 2024-01-02 13:45:45 +01:00
Alexei Kotov
04b714198a Manually clamp controller time (#7523) 2024-01-01 20:59:33 +03:00
Andrei Kortunov
93e50cc7aa Improve format version in content selector 2024-01-01 18:16:58 +04:00
Evil Eye
b835114ce2 Prevent input type assertion 2024-01-01 12:48:12 +01:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +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
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
elsid
7a817d3147
Apply project naming styleguide to GenericObjectCache 2023-12-28 21:58:42 +01:00
elsid
45b1b4f1e0
Remove redundant ObjectCacheMap alias 2023-12-28 21:58:42 +01:00
elsid
7b1ee2780b
Use ranged for loops in GenericObjectCache 2023-12-28 21:58:42 +01:00
elsid
2f0613c8d4
Remove user defined destructor for GenericObjectCache 2023-12-28 21:58:42 +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
alekulyn
f71862fb76 Remove unnecessary code 2023-12-27 22:30:04 -06:00
alekulyn
310b8206dd Fix #7696 2023-12-27 22:15:48 -06: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
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
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
AnyOldName3
4567374e1f Merge branch 'localize_tooltip' into 'master'
Make content selector tooltip localizable

See merge request OpenMW/openmw!3687
2023-12-26 18:38:35 +00:00
jvoisin
c3dfc8c213 Merge branch 'detour_alloc' into 'master'
Use RecastGlobalAllocator for Detour

See merge request OpenMW/openmw!3678
2023-12-26 13:44:00 +00:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath 2023-12-26 14:14:52 +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
Andrei Kortunov
ffffb427f5 Implement crime disposition modifier (bug 4683) 2023-12-26 14:04:23 +04: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
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
elsid
3363616f56
Remove redundant startsWith function 2023-12-25 11:43:02 +01:00
Andrei Kortunov
f2c284688b Make content selector tooltip localizable 2023-12-25 11:29:36 +04:00
Andrei Kortunov
1ca2a0ef66 Store generated UI by pointer to avoid redundant processing 2023-12-24 20:35:19 +04:00
Alexei Kotov
51b05647e2 Merge branch 'move_files' into 'master'
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
2023-12-24 09:58:24 +00:00
elsid
329500b087
Remove redundant return 2023-12-24 00:24:32 +01:00
elsid
0cf55d3617
Use RecastGlobalAllocator for Detour 2023-12-24 00:24:27 +01:00