1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 07:45:36 +00:00
Commit graph

22756 commits

Author SHA1 Message Date
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
Alexei Kotov
13cca461f2 Maybe fix #8202 2024-10-23 22:23:28 +03: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
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
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
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
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
192807609d Remove dead code 2024-10-19 15:03:29 +04:00
Evil Eye
361586d85e Play region sounds in quasi exteriors 2024-10-19 10:43:50 +02:00
Evil Eye
a2fb575678 Set SavedDataDeserializer on LocalScripts creation 2024-10-18 18:25:43 +02:00
elsid
d2ab366233
Use normalized path in PhysicsSystem 2024-10-18 13:45:29 +02:00
Alexey Sokolov
be15db4dfb Remove old dependency on Xt which shouldn't be needed anymore 2024-10-16 14:28:34 +01:00
Andrei Kortunov
aab2f4a5bb Do not disable controllers for melee weapons sheathes (bug 8191) 2024-10-16 17:13:33 +04:00
Dave Corley
dbb29b2391 FIX: Serialize journal records first when saving plugins 2024-10-16 02:01:58 -07:00
Petr Mikheev
bac0018a09 Merge branch 'unloadedcontainers' into 'master'
Fix Lua memory usage

See merge request OpenMW/openmw!4363
2024-10-15 21:18:13 +00:00
Evil Eye
68ebefc2dd Fix Lua memory usage 2024-10-15 21:18:13 +00:00
psi29a
34e32b7392 Merge branch 'thewickedmarkerofthewest' into 'master'
Emulate vanilla closest marker preference (#8187)

Closes #8187

See merge request OpenMW/openmw!4401
2024-10-15 07:43:00 +00:00
psi29a
3e3ff00c72 Merge branch 'dialoguestuff' into 'master'
Improve TESCS dialogue compatibility

Closes #8181

See merge request OpenMW/openmw!4396
2024-10-15 07:42:47 +00:00
Alexei Kotov
77d2f18f83 Emulate vanilla closest marker preference (#8187) 2024-10-14 02:59:56 +03:00
elsid
d1ccb4b804
Use normalized path for groundcover 2024-10-13 13:27:23 +02:00
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
2024-10-07 20:02:54 +00:00
psi29a
ef708c9cf0 Merge branch 'consistentcaptioncapitalization' into 'master'
Make OpenMW-CS preferences and OMWMusic lines more stylistically consistent

See merge request OpenMW/openmw!4394
2024-10-07 20:01:27 +00:00
AnyOldName3
6c8055134d Merge branch 'seaofnodesmorelike' into 'master'
Use more sensible types in pathgridutil

Closes #8172

See merge request OpenMW/openmw!4395
2024-10-07 12:23:27 +00:00
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/".
2024-10-06 16:33:59 +02:00
elsid
a6e075499b
Use normalize path in Animation::addAnimSource to change extension 2024-10-06 16:33:39 +02:00
elsid
7e7cf51ade
Use normalized path in NpcAnimation 2024-10-06 11:32:53 +02:00
elsid
52ab136dd6
Remove redundant reference for ESM::RefId variables 2024-10-06 11:32:53 +02:00
Evil Eye
ffe164b28d Add a test and address feedback 2024-10-06 11:32:24 +02:00
elsid
0665de4c09
Use normalized path for model in ProjectileManager 2024-10-06 11:26:06 +02:00
trav
3d2dd9201d Merge branch openmw:master into handtohand-tooltip 2024-10-05 17:24:17 +00:00
Evil Eye
c9ef03fdd1 Change INFO id generation to not exceed 31 characters 2024-10-03 22:24:08 +02:00
Evil Eye
df757b9e4d Count DIAL and INFO records in the HEDR 2024-10-03 22:23:37 +02:00
Evil Eye
6644a7f27b Use more sensible types in pathgridutil 2024-10-02 21:10:51 +02:00
Alexei Kotov
4dd11d91f3 Editor: Make setting captions stylistically consistent, improve grammar 2024-10-02 19:30:37 +03:00
psi29a
f27030a87c Merge branch 'uipointers' into 'master'
Prevent stale pointers in UI widgets

See merge request OpenMW/openmw!4393
2024-10-02 10:31:19 +00:00
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
2024-10-02 08:43:41 +00:00
jvoisin
1bc130332e Merge branch 'catfight' into 'master'
Restore female/beast-specific first person animations (#8179)

Closes #8179

See merge request OpenMW/openmw!4392
2024-09-30 11:21:51 +00:00
Evil Eye
481e63ffa7 Prevent stale pointers in UI widgets 2024-09-29 22:36:31 +02:00
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
2024-09-28 13:30:04 +03:00
Andrei Kortunov
8dc16f0a17 Improve screen detection for editor's widgets 2024-09-28 10:19:30 +04:00
elsid
63e984ba24
Use normalized path in BulletShapeManager 2024-09-27 23:33:58 +02:00
elsid
7a5c478e34
Use normalized path in PreloadItem 2024-09-27 23:33:57 +02:00
elsid
1d98b5c66b
Remove redundant toNormalized 2024-09-27 23:33:57 +02:00
psi29a
cb009db4bb Merge branch 'topicHighlighting' into 'master'
Topic Highlighting Mouse Over Fix

See merge request OpenMW/openmw!4113
2024-09-27 06:36:17 +00:00
psi29a
d1059aee8c Merge branch 'test_ptr' into 'master'
Add tests for MWWorld::Ptr

See merge request OpenMW/openmw!4344
2024-09-26 07:36:23 +00:00
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
e7a31373c9 Partially fix inventory doll when non-compute-shader ripples are used with FFP 2024-09-25 01:50:31 +01:00
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
2024-09-22 18:23:12 +00:00
Evil Eye
772a0b3711 Merge branch 'vfs_normalized_path_14' into 'master'
Use normalized path in multiple places (#8138)

See merge request OpenMW/openmw!4383
2024-09-22 16:38:55 +00:00
Evil Eye
9de501a62c Merge branch 'local_static_init' into 'master'
Properly initialize local static pointers and collections

See merge request OpenMW/openmw!4386
2024-09-22 16:38:49 +00:00
Evil Eye
2546ce2b16 Don't allow items that are better than new to be repaired 2024-09-22 18:24:21 +02: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
elsid
cd6e49796e
Properly initialize local static pointers and collections
Static variables should be initalized once instead of initializing them with
nullptr and then doing actual initialization behind if condition. Otherwise a
race condition may happen leading to undefined behaviour.
2024-09-21 13:52:43 +02:00
trav5
16a691187c Tooltip for 'Factor Strength into Hand-to-Hand Combat'
Added the game launcher tooltip message for the setting
enabling the factoring of player strength into hand to
hand combat damage
2024-09-21 00:08:59 +02: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
Alexei Kotov
e369ab941e Fix word-wrapping for dialogue topics with changed skin 2024-09-19 04:54:12 +03: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
elsid
2ef5a8486d
Use normalized path in ObjectPaging::createChunk 2024-09-19 01:05:10 +02:00
elsid
7e453d491a
Remove redundant toNormalized 2024-09-19 00:53:27 +02:00
elsid
5f2582fe68
Use normalized path in SceneManager::checkLoaded 2024-09-19 00:51:17 +02:00
elsid
3475a166e5
Use normalized path for World::spawnEffect 2024-09-19 00:31:16 +02:00
elsid
320d376b95
Remove unused virtual specifier 2024-09-19 00:17:44 +02:00
elsid
8ba4ff9946
Remove redundant bool argument from ActorAnimation::attachMesh 2024-09-19 00:13:41 +02:00
elsid
d7e99f988b
Use normalized path in ActorAnimation::attachMesh 2024-09-19 00:07:36 +02:00
elsid
f1533c215d
Use normalized path in ActorAnimation::attach 2024-09-19 00:03:18 +02: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
d9c16328dd Deselect magic item before selecting a spell 2024-09-17 21:16:41 +02:00
elsid
1fd6ac6438
Use normalized path in ImageManager 2024-09-17 00:49:57 +02:00
Alexei Kotov
70187bb5ac niftest: parse BTO, BTR, RDT and PSA files 2024-09-16 23:50:36 +03: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
Evil Eye
2978b32f51 Fix vfs bindings 2024-09-14 10:10:26 +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
Dave Corley
2ea9d6ba20 FIX(windowmanagerimp): Don't remove a ui mode twice 2024-09-11 13:37:00 -07: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
elsid
32ec92e71c
Use normalized path in LuaState 2024-09-08 11:53:57 +02:00
Cody Glassman
f849b0c90f update render targets during update instead of draw thread -- fixes a bug with <1 size ratios 2024-09-06 09:52:56 -07:00
Evil Eye
a32e006e1c Remove references to temporaries and this_state in properties 2024-09-06 16:57:36 +02:00
psi29a
1e94f53146 Merge branch 'is_starter_spell' into 'master'
Expose starter spells

See merge request OpenMW/openmw!4352
2024-09-06 07:25:09 +00:00
psi29a
8992a9fb8c Merge branch 'master' into 'master'
Navmeshtool as a Library

See merge request OpenMW/openmw!4354
2024-09-06 07:23:22 +00:00
psi29a
46cbee2f21 Merge branch 'input_bindings' into 'master'
Fix input bindings handling (#8115)

Closes #8115

See merge request OpenMW/openmw!4332
2024-09-05 14:52:54 +00:00
Ole Volbracht
e920325073 Build navmeshtool as a library 2024-09-05 16:30:11 +02:00
psi29a
4c28731f6a Merge branch 'optionallightfadeout' into 'master'
Make light attenuation fade optional

See merge request OpenMW/openmw!4267
2024-09-05 07:29:48 +00:00
psi29a
e1875d459a Merge branch 'boost-config-required' into 'master'
Modernise Boost CMake stuff

Closes #8100

See merge request OpenMW/openmw!4307
2024-09-04 19:04:57 +00:00
psi29a
b3677d07fd Merge branch 'pcallallthethings' into 'master'
Wrap all memory allocating Lua functions in protected calls

Closes #8099

See merge request OpenMW/openmw!4336
2024-09-04 07:22:26 +00:00