1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-12 04:14:05 +00:00

34893 Commits

Author SHA1 Message Date
AnyOldName3
bd8386459a Fix inventory doll when ripple fragment shader path is used
Basically don't abuse OSG as badly. We need to let it know we've bound a shader program so it doesn't assume the FFP is still used, but it doesn't have a built-in way to apply the uniforms when doing so, so we need to do it manually.
2024-09-25 16:14:19 +01:00
AnyOldName3
95a1183ad3 Fix OpenGL debug groups 2024-09-25 16:10:18 +01:00
AnyOldName3
e7a31373c9 Partially fix inventory doll when non-compute-shader ripples are used with FFP 2024-09-25 01:50:31 +01:00
AnyOldName3
f817ff01b4 Merge branch 'labelsforeveryone' into 'master'
Editor: Improve Models settings category layout

See merge request OpenMW/openmw!4384
2024-09-21 14:04:36 +00:00
jvoisin
7d84b85d5c Merge branch '76supportwhen' into 'master'
Parse pose array files and all remaining unknown Fallout 76 record types

See merge request OpenMW/openmw!4382
2024-09-20 13:30:50 +00:00
jvoisin
e05b1fabd8 Merge branch 'compile-time' into 'master'
Remove duplicate compile items

See merge request OpenMW/openmw!4380
2024-09-20 13:30:45 +00:00
Jared Davenport
30a37b3fda Remove duplicate compile items 2024-09-20 13:30:44 +00:00
Alexei Kotov
0b1465446d Editor: Improve Models category layout
Increase minimum input field width and give proper labels to string settings
2024-09-20 05:12:38 +03:00
AnyOldName3
224b9f0692 Merge branch 'thismoviesucks' into 'master'
Don't break the read_packet contract

Closes #8153

See merge request OpenMW/openmw!4378
2024-09-20 00:30:26 +00:00
jvoisin
879c23b4cb Merge branch 'enchantedimsure' into 'master'
Deselect magic item before selecting a spell

Closes #8162

See merge request OpenMW/openmw!4379
2024-09-19 01:50:36 +00:00
Alexei Kotov
6e70893113 Parse bhkPoseArray 2024-09-18 23:53:33 +03:00
Alexei Kotov
695932d2db Parse BSDistantObjectInstancedNode 2024-09-18 23:53:33 +03:00
Alexei Kotov
7149fbb408 Parse NiPSysRotDampeningCtlr 2024-09-18 22:03:15 +03:00
Evil Eye
74d699c502 Merge branch 'vfs_normalized_path_13' into 'master'
Use normalized path in ImageManager (#8138)

See merge request OpenMW/openmw!4377
2024-09-18 18:47:27 +00:00
Evil Eye
834bd9bc6c Merge branch 'whatdoesbtrevenmean' into 'master'
niftest: parse BTO, BTR, RDT and PSA files

See merge request OpenMW/openmw!4376
2024-09-18 18:45:33 +00:00
Evil Eye
5a4e5cccc6 Merge branch 'ragdollsupportscheduledfortwentyninety' into 'master'
Parse bhkRagdollTemplate/bhkRagdollTemplateData

See merge request OpenMW/openmw!4375
2024-09-18 18:44:03 +00:00
Evil Eye
d9c16328dd Deselect magic item before selecting a spell 2024-09-17 21:16:41 +02:00
Evil Eye
2dcf1f7ed2 Don't break the read_packet contract 2024-09-17 20:56:04 +02:00
elsid
1fd6ac6438
Use normalized path in ImageManager 2024-09-17 00:49:57 +02:00
Alexei Kotov
5f7fa640b0 Parse bhkRagdollTemplate/bhkRagdollTemplateData 2024-09-17 00:26:06 +03:00
Alexei Kotov
70187bb5ac niftest: parse BTO, BTR, RDT and PSA files 2024-09-16 23:50:36 +03:00
psi29a
b9cb028809 Merge branch 'vfs_normalized_path_12' into 'master'
Store Lua script path as VFS normalized (#8138)

See merge request OpenMW/openmw!4373
2024-09-16 17:12:22 +00:00
elsid
b4f77e8bd7
Store Lua script path as VFS normalized 2024-09-15 13:53:20 +02:00
psi29a
96ec3a8125 Merge branch 'testthevfs' into 'master'
Fix vfs bindings and add tests

Closes #8157

See merge request OpenMW/openmw!4371
2024-09-15 08:44:44 +00:00
jvoisin
f2be4072d9 Merge branch 'fix_build' into 'master'
Fix build with msvc

See merge request OpenMW/openmw!4372
2024-09-14 22:43:05 +00:00
psi29a
04fe036360 Merge branch 'vfs_normalized_path_11' into 'master'
Use normalized path in SceneManager (#8138)

See merge request OpenMW/openmw!4370
2024-09-14 18:57:49 +00:00
elsid
ec6af1ef32
Fix build with msvc
components\resource\cachestats.hpp(23): error C2039: 'string': is not a member of 'std'
2024-09-14 14:05:24 +02:00
Evil Eye
2978b32f51 Fix vfs bindings 2024-09-14 10:10:26 +02:00
Evil Eye
1ac0f27bbd Add integration tests for the openmw.vfs package 2024-09-14 10:10:01 +02:00
elsid
d8189a5aa1
Use normalized path in SceneManager 2024-09-13 14:21:49 +02:00
psi29a
b32f68fcd2 Merge branch 'vfs_normalized_path_10' into 'master'
Use normalized path in LuaState (#8138)

See merge request OpenMW/openmw!4365
2024-09-13 08:17:46 +00:00
Evil Eye
dac6779aaf Merge branch 'actually-you-have-to-sleep' into 'master'
FIX(windowmanagerimp): Don't remove a ui mode twice (Close #8156)

Closes #8156

See merge request OpenMW/openmw!4369
2024-09-13 07:17:49 +00:00
Dave Corley
2ea9d6ba20 FIX(windowmanagerimp): Don't remove a ui mode twice 2024-09-11 13:37:00 -07:00
psi29a
6b762a5328 Merge branch 'fix-macos-libraries' into 'master'
Use CMAKE_FIND_FRAMEWORK ONLY for OpenGL on MacOS

Closes #7934

See merge request OpenMW/openmw!4368
2024-09-11 08:29:57 +00:00
AnyOldName3
0f74e0cca8 Merge branch 'add_frame_number' into 'master'
Add frame number to available postprocess uniforms

See merge request OpenMW/openmw!4355
2024-09-10 16:58:27 +00:00
Cody Glassman
b346a4a858 Add frame number to available postprocess uniforms 2024-09-10 16:58:27 +00:00
psi29a
f3dd6d0a42 Merge branch 'whatstatethisstate' into 'master'
Remove references to temporaries and this_state in properties

Closes #8152

See merge request OpenMW/openmw!4360
2024-09-10 06:58:16 +00:00
psi29a
89241a5c13 Merge branch 'raw-docced' into 'master'
Use raw strings for regex patterns

See merge request OpenMW/openmw!4366
2024-09-10 06:57:56 +00:00
Chris Anderson
3320f2a5b9 Use CMAKE_FIND_FRAMEWORK ONLY for OpenGL on MacOS 2024-09-09 21:56:37 -04:00
elsid
d643970952 Merge branch 'compress-symbols-separately' into 'master'
Compress symbols separately

See merge request OpenMW/openmw!4362
2024-09-09 21:21:18 +00:00
psi29a
7a6fa45ece Merge branch 'ripple-tweaks' into 'master'
Ripple shader tweaks

See merge request OpenMW/openmw!4351
2024-09-09 19:04:50 +00:00
AnyOldName3
6723d6cb5d Don't cd into a directory and expect it to be a child of the cwd
This is a combination of 3 commits.
This is the 1st commit message:

Use the correct path

This will be the last non-deranged commit message on this branch.

This is the commit message #2:

🤨🤨🤨🤨

This is the commit message #3:

🙈🙉🙊

    pick e140f1aa3a Use the correct path
    squash 28744e367c 🤨🤨🤨🤨
    squash b57bde40a2 🙈🙉🙊
2024-09-09 18:55:39 +01:00
AnyOldName3
3c065eca59 Install aws-cli
We have to get it from Amazon directly and run an install script as
aws-cli v2 (which is what we use on Windows) is only shipped as a snap,
and snaps don't work on Docker, which the GitLab runners use.

This is a combination of 4 commits.
This is the 1st commit message:

Install aws-cli

Get it from snap because apt only has 1.x versions.
Pass --classic so it can actually see files.

This is the commit message #2:

But snapd isn't installed by default even though it's Ubuntu's recommended way to install everything

This is the commit message #3:

Mysterious snap-fixing incantation

I guess the service isn't running my default until the next reboot?

This is the commit message #4:

Snap doesn't work in Docker, apt doesn't have awscli v2+, let's just install random binaries wherever they want to put themselves

    pick 5f0dfbf768 Install aws-cli
    squash 1ed2a711fc But snapd isn't installed by default even though it's Ubuntu's recommended way to install everything
    squash 230c917993 Mysterious snap-fixing incantation
    squash 75142ff3c2 Snap doesn't work in Docker, apt doesn't have awscli v2+, let's just install random binaries wherever they want to put themselves
2024-09-09 18:55:39 +01:00
AnyOldName3
0172fe769e Apparently unzip isn't stock on Ubuntu 2024-09-09 18:55:39 +01:00
AnyOldName3
9f50335b76 Fix gcab install 2024-09-09 18:55:39 +01:00
AnyOldName3
0e842d51de Abandon variable-based job specification
You can only use variables to specify the dependency job if you also
specify the project and ref. I couldn't find a built-in variable that
evaluated to the current ref or particularly clear documentation of what
ref even meant in this context (GitLab uses it for a few different
things in CI as far as I can tell).

This is a combination of 2 commits.
This is the 1st commit message:

Project permits variables in job names?

This is the commit message #2:

Using a variable is getting too hard, just copy and paste some stuff

    pick cf1c4dfa73 Project permits variables in job names?
    squash e5e888ac77 Using a variable is getting too hard, just copy and paste some stuff
2024-09-09 18:55:39 +01:00
AnyOldName3
a8b8eb1462 Compress symbols in separate job
Originally this had a double closing '' which wasn't noticed until
several commits later when it was fixed well enough to actually reach
that line. That change has been time-travelled and squashed after a big
argument.

This is a combination of 2 commits.
This is the 1st commit message:

Compress symbols in separate job

Typo

    pick 9c27586080 Compress symbols in separate job
    squash b072d7e33f Typo
2024-09-09 18:53:48 +01:00
psi29a
fc7c141f3b Merge branch 'its_just_a_render_target' into 'master'
Update render targets outside of draw thread

See merge request OpenMW/openmw!4361
2024-09-09 07:15:18 +00:00
Cody Glassman
c495a57217 docs - use raw strings for regex pattern 2024-09-08 13:28:56 -07:00
elsid
32ec92e71c
Use normalized path in LuaState 2024-09-08 11:53:57 +02:00