Mads Buvik Sandvei
c82c111ee1
Use correct index for Athletics_SwimOneSecond
2024-02-27 19:28:51 +01: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
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
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
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
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
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
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
