1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-02 19:13:25 +00:00

7945 Commits

Author SHA1 Message Date
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
Evil Eye
958f70736f Implement auto calculated potion values 2024-03-02 12:45:48 +01:00
psi29a
be1e77c282 Merge branch 'fix-git-commit-updating' into 'master'
Fix git commit updating

See merge request OpenMW/openmw!3911
2024-02-28 20:37:28 +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
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
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
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
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
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