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