1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 03:29:55 +00:00
Commit graph

22673 commits

Author SHA1 Message Date
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
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
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
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