1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-07 03:54:40 +00:00
Commit Graph

35044 Commits

Author SHA1 Message Date
uramer
ad1c2a0e9f Fix table-valued settings 2024-10-28 16:46:14 +01:00
uramer
e248ba293a Use sol helpers for metatable keys 2024-10-28 16:45:51 +01:00
Evil Eye
b288448893 Merge branch 'ulfricstormcloakjarlofwindhelm' into 'master'
Revise storm wind effect on velocity (bug #8206)

Closes #8206

See merge request OpenMW/openmw!4426
2024-10-28 15:33:46 +00:00
Evil Eye
e4f0227991 Merge branch 'launcherviewdist' into 'master'
Add a lower cap to launcher viewing distance spinbox (#8208)

Closes #8208

See merge request OpenMW/openmw!4428
2024-10-28 15:33:31 +00:00
Alexei Kotov
a239724316 Revise storm wind effect on velocity (bug #8206) 2024-10-28 13:10:16 +03:00
Alexei Kotov
e78d3e8ac6 Add a lower cap to launcher viewing distance spinbox (#8208) 2024-10-28 13:04:16 +03:00
psi29a
d3b509d70f Merge branch 'only-local-openmw.cfg-on-windows' into 'master'
Install the local openmw.cfg template on Windows

See merge request OpenMW/openmw!4404
2024-10-28 09:56:46 +00:00
psi29a
891bb67ac5 Merge branch 'fatiguecrit' into 'master'
Only play critical hit sound for health damage (#8207)

Closes #8207

See merge request OpenMW/openmw!4427
2024-10-28 09:53:58 +00:00
AnyOldName3
06bf80cc3b Rearrange conditionals to be prettier 2024-10-27 23:42:48 +00:00
Evil Eye
7bbb1bf05d Merge branch 'loosey-goosey' into 'master'
Store original representation of paths in content lists. Also compare against existing content lists in a more forgiving way.

See merge request OpenMW/openmw!4424
2024-10-27 12:31:41 +00:00
Alexei Kotov
71f6341f30 Only play critical hit sound for health damage (#8207) 2024-10-27 08:17:33 +03:00
Alexei Kotov
0d702689d0 Merge branch 'normally-we-have-a-uv-set' into 'master'
Don't expect TangentSpaceGenerator to work without texcoords

Closes #7353

See merge request OpenMW/openmw!4423
2024-10-27 03:58:43 +00:00
Alexei Kotov
1e6c0f459a Merge branch 'sanespells' into 'master'
Don't modify base records from Lua

Closes #8204

See merge request OpenMW/openmw!4425
2024-10-27 03:57:21 +00:00
AnyOldName3
a95b3672cf c h a n g e l o g 2024-10-25 23:37:18 +01:00
Evil Eye
a8710b7b42 Don't modify base records from Lua 2024-10-25 16:35:23 +02:00
psi29a
a11e683a40 Merge branch 'content-lists-could-provide-duplicate-fallback-archives' into 'master'
Gracefully handle content lists that specify duplicate BSAs

Closes #8200

See merge request OpenMW/openmw!4421
2024-10-25 11:08:41 +00:00
AnyOldName3
31c84e0407 We don't need to capture constexpr stuff 2024-10-25 00:49:46 +00:00
AnyOldName3
7640b6bcf4 Typo 2024-10-25 00:32:12 +00:00
AnyOldName3
b596902329 c a p i t u l a t e
Looks like I forgot to reformat after a typo fix.
2024-10-25 00:53:27 +01:00
AnyOldName3
c2b383ea92 Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.

The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.

To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.

The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.

To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2024-10-25 00:49:59 +01:00
AnyOldName3
6330d80b9e Don't expect TangentSpaceGenerator to work without texcoords 2024-10-24 13:36:49 +01:00
Alexei Kotov
e9627e9b0c Merge branch 'cifileprofiles' into 'master'
Compare content files and archives case insensitively when matching existing profiles

See merge request OpenMW/openmw!4419
2024-10-24 03:23:10 +00:00
psi29a
cd2f261ff5 Merge branch 'case-insensitive-bsa-name' into 'master'
Make the launcher ignore case in bsa names

Closes #8201

See merge request OpenMW/openmw!4418
2024-10-23 22:23:27 +00:00
psi29a
69fa1ee808 Merge branch 'soundgenorder' into 'master'
Write SoundGens after their creatures

See merge request OpenMW/openmw!4420
2024-10-23 22:21:22 +00:00
AnyOldName3
0537b53d21 Gracefully handle content lists that specify duplicate BSAs
Previously, if fed bad data, or a content list predated a BSA being moved to a non-user config file, or possibly in other situations (but not any of the obvious ones as those had other guards), the `selectedArchives` list could be longer than the number of archives available due to duplicate entries.

This ensures they're handled like entries specifying no-longer-present archives, and just skips the duplicates.
The same would happen elsewhere in similar situations, but those code paths aren't always taken.
2024-10-22 22:40:16 +01:00
Evil Eye
9395624e5f Write SoundGens after their creatures 2024-10-22 21:25:52 +02:00
psi29a
462e118e0d Merge branch 'teal_update' into 'master'
Update Teal and Cyan version used in CI

See merge request OpenMW/openmw!4417
2024-10-22 07:16:23 +00:00
Alexei Kotov
1fcbcd5bfa Merge branch 'journalFirst' into 'master'
FIX: Serialize journal records first when saving plugins

See merge request OpenMW/openmw!4405
2024-10-22 01:37:02 +00:00
Evil Eye
ea52a5f4bd Clarify that topics should be written after journals 2024-10-21 19:57:18 +02:00
Evil Eye
6d182dcdae Compare content files and archives case insensitively when matching existing profiles 2024-10-21 19:42:37 +02:00
AnyOldName3
7556ab6f90 Make the launcher ignore case in bsa names 2024-10-21 18:07:13 +01:00
psi29a
cdf7bd74d5 Merge branch 'passivestorage' into 'master'
Activate global storage when setting up the player

See merge request OpenMW/openmw!4413
2024-10-21 11:01:26 +00:00
uramer
244c4b4376 Dono't use self as a type name, as it's reserved in Teal 2024-10-20 18:27:28 +02:00
uramer
7f886f1840 Use stable cyan, print teal versions in CI 2024-10-20 18:27:27 +02:00
uramer
bef9fc0a4b Upload Teal artifacts on failure, avoid nested archives 2024-10-20 18:27:27 +02:00
uramer
2bb25ef2d6 Use current cyan commit 2024-10-20 18:27:27 +02:00
psi29a
941a6dcf89 Merge branch 'crime-interface' into 'master'
add OFFENSE_TYPE and commitCrime to lua

Closes #8109

See merge request OpenMW/openmw!4319
2024-10-20 09:37:27 +00:00
Calandiel Elende
9248e37156 add OFFENSE_TYPE and commitCrime to lua 2024-10-20 09:37:27 +00:00
psi29a
9325c80244 Merge branch 'userdataplz' into 'master'
Set SavedDataDeserializer on LocalScripts creation

See merge request OpenMW/openmw!4409
2024-10-20 09:36:13 +00:00
psi29a
083381526f Merge branch 'mourningnote' into 'master'
Play region sounds in quasi exteriors

See merge request OpenMW/openmw!4411
2024-10-20 09:35:27 +00:00
psi29a
c60e0539cc Merge branch 'dead_code' into 'master'
Remove dead code

See merge request OpenMW/openmw!4412
2024-10-20 09:34:49 +00:00
psi29a
26af518d67 Merge branch 'vfs_normalized_path_18' into 'master'
Use normalized path in PhysicsSystem (#8138)

See merge request OpenMW/openmw!4410
2024-10-20 09:34:37 +00:00
psi29a
8b3e8676bf Merge branch 'noxt' into 'master'
Remove old dependency on Xt which shouldn't be needed anymore

See merge request OpenMW/openmw!4407
2024-10-20 09:34:16 +00:00
Evil Eye
cee373aea8 Don't trigger onStateChanged until the game is in a running state 2024-10-20 10:50:18 +02:00
Alexei Kotov
e541e5f6d7 Merge branch 'changelog' into 'master'
Fix changelog typo

See merge request OpenMW/openmw!4416
2024-10-19 21:31:44 +00:00
Evil Eye
e1046dc715 Tell the LuaManager the game has started before the player can be teleported 2024-10-19 19:15:23 +02:00
Andrei Kortunov
aef9722920 Fix changelog typo 2024-10-19 21:06:46 +04:00
psi29a
acce1e6e99 Merge branch 'changelog' into 'master'
Add missing changelog entries

See merge request OpenMW/openmw!4414
2024-10-19 11:56:18 +00:00
Andrei Kortunov
7ef1ea1d6e Add missing changelog entries 2024-10-19 15:09:47 +04:00
Andrei Kortunov
192807609d Remove dead code 2024-10-19 15:03:29 +04:00