Commit Graph

22795 Commits (69c4a68187d15719cb4e0277e35b2b30ba5b0f3f)

Author SHA1 Message Date
Evil Eye 5dbe86e9ee Use the actual callback function instead of mocking it 2 months ago
Pi03k 306982cdd1 Move from qt_wrap_ui to AUTOUIC for opencs
Set opencs target properties in appropriate section
Use forward declaration for Ui::FileDialog

(#7348)
2 months ago
pi03k 18080a83d6 Move from qt_wrap_ui to AUTOUIC for launcher and wizard
(#7348)
2 months ago
psi29a ac7b54af80 Merge branch 'refnumremapping' into 'master'
Use the right deserializer for unloaded scripts

See merge request OpenMW/openmw!4449
2 months ago
psi29a f5c457c474 Merge branch 'pageswithattitude' into 'master'
Apply rotation when computing the bounding box of a paged reference

See merge request OpenMW/openmw!4447
2 months ago
Evil Eye 6572122acc Use the right deserializer for unloaded scripts 2 months ago
Alexei Kotov 32a6ed6f49 Merge branch 'creaturesstronk' into 'master'
Allow creatures' strength to be edited

See merge request OpenMW/openmw!4448
2 months ago
psi29a d356fea5b6 Merge branch 'whycantitalkthedoorintoopening' into 'master'
Let AI open moved doors (#7548)

Closes #7548

See merge request OpenMW/openmw!4435
2 months ago
Evil Eye 7bd2f73fe5 Allow creatures' strength to be edited 2 months ago
Evil Eye 79bd6309a5 Apply rotation when computing the bounding box of a paged reference 2 months ago
elsid afa769408a
Use normalized path for correctActorModelPath 2 months ago
psi29a 3e804042c4 Merge branch 'soitsthesametypeofstandasstarplatinum' into 'master'
Update spell window effect icons if the world is unpaused

See merge request OpenMW/openmw!4439
2 months ago
psi29a 6c52d92832 Merge branch 'ducksinarow' into 'master'
Improve memory alignment of CreatureStats to reduce memory usage

See merge request OpenMW/openmw!4433
2 months ago
psi29a 362eec43be Merge branch 'noblacklisting' into 'master'
Exterminate script blacklisting (#8214)

Closes #8214

See merge request OpenMW/openmw!4440
2 months ago
psi29a 62079499c1 Merge branch 'nowaterculling' into 'master'
Allow opting out of water culling (#7318)

Closes #7318

See merge request OpenMW/openmw!4441
2 months ago
Alexei Kotov 5d37cb3b74 Exterminate script blacklisting (#8214) 2 months ago
Alexei Kotov 4f521a94d7 Allow opting out of water culling (#7318) 2 months ago
Alexei Kotov fdafdaf599 Update spell icons if the world is unpaused 2 months ago
Alexei Kotov 476abb83d8 Don't enable groundcover for non-default worldspaces (#7692) 2 months ago
psi29a 34b6a9d402 Merge branch 'howdidabdufindthis' into 'master'
Don't assign vertical movement for inert characters out of water (#7968)

Closes #7968

See merge request OpenMW/openmw!4432
2 months ago
jvoisin 540eee9c97 Merge branch 'draganddropdead' into 'master'
Don't update displayed armor rating when there's no player pointer (#8211)

Closes #8211

See merge request OpenMW/openmw!4430
2 months ago
Alexei Kotov 4fdfd6ae91 Let AI open moved doors (#7548) 2 months ago
Evil Eye ee16dbd2e2 Improve memory alignment of CreatureStats to reduce memory usage 2 months ago
Evil Eye 4c11dcdd7d Merge branch 'display_fix' into 'master'
Improve screen detection for editor's widgets

Closes #8146

See merge request OpenMW/openmw!4364
2 months ago
Alexei Kotov 84aebccbb0 Don't assign vertical movement for inert characters out of water (#7968) 2 months ago
Alexei Kotov 636e5ed08b Don't update displayed armor rating when there's no player pointer (#8211) 2 months ago
psi29a 64fdf72c4c Merge branch 'mfwnotext' into 'master'
Fix #8202 (probably)

Closes #8202

See merge request OpenMW/openmw!4422
2 months ago
psi29a 1dc1bfe543 Merge branch 'launcherimportdefaults' into 'master'
Save/load INI importer flags in the launcher (#8189)

Closes #8189

See merge request OpenMW/openmw!4429
2 months ago
Evil Eye b288448893 Merge branch 'ulfricstormcloakjarlofwindhelm' into 'master'
Revise storm wind effect on velocity (bug #8206)

Closes #8206

See merge request OpenMW/openmw!4426
2 months ago
Alexei Kotov a239724316 Revise storm wind effect on velocity (bug #8206) 2 months ago
Alexei Kotov e78d3e8ac6 Add a lower cap to launcher viewing distance spinbox (#8208) 2 months ago
psi29a 891bb67ac5 Merge branch 'fatiguecrit' into 'master'
Only play critical hit sound for health damage (#8207)

Closes #8207

See merge request OpenMW/openmw!4427
2 months ago
Alexei Kotov eea916a43d Save/load INI importer flags in the launcher (#8189) 2 months ago
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
2 months ago
Alexei Kotov 71f6341f30 Only play critical hit sound for health damage (#8207) 2 months ago
Evil Eye a8710b7b42 Don't modify base records from Lua 2 months ago
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
2 months ago
AnyOldName3 7640b6bcf4 Typo 2 months ago
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).
2 months ago
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
2 months ago
Alexei Kotov 13cca461f2 Maybe fix #8202 2 months ago
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.
2 months ago
Evil Eye 9395624e5f Write SoundGens after their creatures 2 months ago
Alexei Kotov 1fcbcd5bfa Merge branch 'journalFirst' into 'master'
FIX: Serialize journal records first when saving plugins

See merge request OpenMW/openmw!4405
2 months ago
Evil Eye ea52a5f4bd Clarify that topics should be written after journals 2 months ago
AnyOldName3 7556ab6f90 Make the launcher ignore case in bsa names 2 months ago
psi29a cdf7bd74d5 Merge branch 'passivestorage' into 'master'
Activate global storage when setting up the player

See merge request OpenMW/openmw!4413
2 months ago
psi29a 941a6dcf89 Merge branch 'crime-interface' into 'master'
add OFFENSE_TYPE and commitCrime to lua

Closes #8109

See merge request OpenMW/openmw!4319
2 months ago
Calandiel Elende 9248e37156 add OFFENSE_TYPE and commitCrime to lua 2 months ago
psi29a 9325c80244 Merge branch 'userdataplz' into 'master'
Set SavedDataDeserializer on LocalScripts creation

See merge request OpenMW/openmw!4409
2 months ago
psi29a 083381526f Merge branch 'mourningnote' into 'master'
Play region sounds in quasi exteriors

See merge request OpenMW/openmw!4411
2 months ago
psi29a c60e0539cc Merge branch 'dead_code' into 'master'
Remove dead code

See merge request OpenMW/openmw!4412
2 months ago
psi29a 26af518d67 Merge branch 'vfs_normalized_path_18' into 'master'
Use normalized path in PhysicsSystem (#8138)

See merge request OpenMW/openmw!4410
2 months ago
psi29a 8b3e8676bf Merge branch 'noxt' into 'master'
Remove old dependency on Xt which shouldn't be needed anymore

See merge request OpenMW/openmw!4407
2 months ago
Evil Eye cee373aea8 Don't trigger onStateChanged until the game is in a running state 2 months ago
Evil Eye e1046dc715 Tell the LuaManager the game has started before the player can be teleported 2 months ago
Andrei Kortunov 192807609d Remove dead code 2 months ago
Evil Eye 361586d85e Play region sounds in quasi exteriors 2 months ago
Evil Eye a2fb575678 Set SavedDataDeserializer on LocalScripts creation 2 months ago
elsid d2ab366233
Use normalized path in PhysicsSystem 2 months ago
Alexey Sokolov be15db4dfb Remove old dependency on Xt which shouldn't be needed anymore 2 months ago
Andrei Kortunov aab2f4a5bb Do not disable controllers for melee weapons sheathes (bug 8191) 2 months ago
Dave Corley dbb29b2391 FIX: Serialize journal records first when saving plugins 2 months ago
Petr Mikheev bac0018a09 Merge branch 'unloadedcontainers' into 'master'
Fix Lua memory usage

See merge request OpenMW/openmw!4363
2 months ago
Evil Eye 68ebefc2dd Fix Lua memory usage 2 months ago
psi29a 34e32b7392 Merge branch 'thewickedmarkerofthewest' into 'master'
Emulate vanilla closest marker preference (#8187)

Closes #8187

See merge request OpenMW/openmw!4401
3 months ago
psi29a 3e3ff00c72 Merge branch 'dialoguestuff' into 'master'
Improve TESCS dialogue compatibility

Closes #8181

See merge request OpenMW/openmw!4396
3 months ago
Alexei Kotov 77d2f18f83 Emulate vanilla closest marker preference (#8187) 3 months ago
elsid d1ccb4b804
Use normalized path for groundcover 3 months ago
psi29a 974c0ce158 Merge branch 'vfs_normalized_path_16' into 'master'
Use normalized path in multiple places and fix additional animation sources loading (#8138)

See merge request OpenMW/openmw!4398
3 months ago
psi29a ef708c9cf0 Merge branch 'consistentcaptioncapitalization' into 'master'
Make OpenMW-CS preferences and OMWMusic lines more stylistically consistent

See merge request OpenMW/openmw!4394
3 months ago
AnyOldName3 6c8055134d Merge branch 'seaofnodesmorelike' into 'master'
Use more sensible types in pathgridutil

Closes #8172

See merge request OpenMW/openmw!4395
3 months ago
elsid 5532bc61c1
Support additional animation sources not only for 2 letter extensions
If extension is not 2 letters length (e.g. not .kf), replacing last 3 last
charaters leads to weird results like:
"meshes/basicplayer.dae" -> "animations/basicplayer./"

According to the doc this should be "animations/basicplayer/".
3 months ago
elsid a6e075499b
Use normalize path in Animation::addAnimSource to change extension 3 months ago
elsid 7e7cf51ade
Use normalized path in NpcAnimation 3 months ago
elsid 52ab136dd6
Remove redundant reference for ESM::RefId variables 3 months ago
Evil Eye ffe164b28d Add a test and address feedback 3 months ago
elsid 0665de4c09
Use normalized path for model in ProjectileManager 3 months ago
trav 3d2dd9201d Merge branch openmw:master into handtohand-tooltip 3 months ago
Evil Eye c9ef03fdd1 Change INFO id generation to not exceed 31 characters 3 months ago
Evil Eye df757b9e4d Count DIAL and INFO records in the HEDR 3 months ago
Evil Eye 6644a7f27b Use more sensible types in pathgridutil 3 months ago
Alexei Kotov 4dd11d91f3 Editor: Make setting captions stylistically consistent, improve grammar 3 months ago
psi29a f27030a87c Merge branch 'uipointers' into 'master'
Prevent stale pointers in UI widgets

See merge request OpenMW/openmw!4393
3 months ago
Alexei Kotov 56e200f8ac Merge branch 'ripply-doll' into 'master'
Fix inventory doll when non-compute-shader ripples are used with FFP

See merge request OpenMW/openmw!4390
3 months ago
jvoisin 1bc130332e Merge branch 'catfight' into 'master'
Restore female/beast-specific first person animations (#8179)

Closes #8179

See merge request OpenMW/openmw!4392
3 months ago
Evil Eye 481e63ffa7 Prevent stale pointers in UI widgets 3 months ago
Alexei Kotov 963b7ec742 Unify first/third-person animation choice logic (#8179)
Re-enable first-person female/beast-specific animations
Use dehardcoded argonian swim animation path
3 months ago
Andrei Kortunov 8dc16f0a17 Improve screen detection for editor's widgets 3 months ago
elsid 63e984ba24
Use normalized path in BulletShapeManager 3 months ago
elsid 7a5c478e34
Use normalized path in PreloadItem 3 months ago
elsid 1d98b5c66b
Remove redundant toNormalized 3 months ago
psi29a cb009db4bb Merge branch 'topicHighlighting' into 'master'
Topic Highlighting Mouse Over Fix

See merge request OpenMW/openmw!4113
3 months ago
psi29a d1059aee8c Merge branch 'test_ptr' into 'master'
Add tests for MWWorld::Ptr

See merge request OpenMW/openmw!4344
3 months ago
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.
3 months ago
AnyOldName3 e7a31373c9 Partially fix inventory doll when non-compute-shader ripples are used with FFP 3 months ago
elsid b6c1e33da6 Merge branch 'hammerthingstilltheybreak' into 'master'
Don't let the player repair items that are better than new

Closes #8171

See merge request OpenMW/openmw!4381
3 months ago
Evil Eye 772a0b3711 Merge branch 'vfs_normalized_path_14' into 'master'
Use normalized path in multiple places (#8138)

See merge request OpenMW/openmw!4383
3 months ago
Evil Eye 9de501a62c Merge branch 'local_static_init' into 'master'
Properly initialize local static pointers and collections

See merge request OpenMW/openmw!4386
3 months ago
Evil Eye 2546ce2b16 Don't allow items that are better than new to be repaired 3 months ago