1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Commit Graph

34972 Commits

Author SHA1 Message Date
Evil Eye
86c85d1b75 Force tl 0.15 2024-10-12 12:48:40 +02:00
psi29a
49e178be05 Merge branch 'docs_themes' into 'master'
Update RTD theme

See merge request OpenMW/openmw!4400
2024-10-10 20:23:02 +00:00
Cody Glassman
ab682a9469 upgrade theme to fix selector styling 2024-10-09 09:54:48 -07:00
Cody Glassman
bf58c03160 docs - update RTD theme 2024-10-09 09:01:57 -07: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
jvoisin
c31460a969 Merge branch 'controllerbindings' into 'master'
Update SDL controller mappings, bump SDL version requirement to 2.0.10

See merge request OpenMW/openmw!4397
2024-10-06 20:57:27 +00:00
jvoisin
4a7fcc1437 Merge branch 'handtohand-tooltip' into 'master'
Added the tooltip for 'Factor Strength into Hand-to-Hand Combat' into game launcher

See merge request OpenMW/openmw!4385
2024-10-06 19:01:29 +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
elsid
6e0eb64538
Use normalized path for glow texture names 2024-10-06 11:19:58 +02:00
Alexei Kotov
c5b54cf585 Update SDL controller mappings, bump SDL version requirement to 2.0.10 2024-10-05 21:14:41 +03:00
trav5
3b06446bed French fix for 'Factor Strength into Hand-to-Hand Combat'
Found by running a translations make job
2024-10-05 19:50:59 +02:00
trav
3d2dd9201d Merge branch openmw:master into handtohand-tooltip 2024-10-05 17:24:17 +00:00
trav5
4a433635b3 French, Russian and Swedish Factor Strength into Hand-to-Hand Combat
Applied tooltip translation suggestions from the gitlab review. Thanks!
2024-10-05 19:22:46 +02:00
Evil Eye
403189c711 Switch between DrawElementsUInt and DrawElementsUShort on demand 2024-10-03 19:05:57 +02:00
Evil Eye
5e16579793 Switch to DrawElementsUInt 2024-10-03 16:32:47 +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
Alexei Kotov
c4ca0105e8 Make OMWMusic lines stylistically consistent with other tabs 2024-10-02 14:16:55 +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
Alexei Kotov
0590aa181d Merge branch 'vfs_normalized_path_15' into 'master'
Use normalized path in BulletShapeManager and PreloadItem (#8138)

See merge request OpenMW/openmw!4391
2024-09-30 11:06:09 +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
ac21cf3bb3 Merge branch 'script-music-settings-fr-localization' into 'master'
Add OpenMW Music setting yaml localization and uniformize the other settings tabs

See merge request OpenMW/openmw!4389
2024-09-27 06:38:00 +00: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
b4f5242b98 Merge branch 'lua-docs-minor-grammar-fixes' into 'master'
Minor grammar fixes for `ambient` `async` and `animation` packages

See merge request OpenMW/openmw!4359
2024-09-26 07:37:11 +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
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
Arnaud Dochain
7f1ce5e812 Add OpenMW Music French setting and unfoformize the other settings tabs 2024-09-24 17:05:51 +00:00
psi29a
c8c6ea5f3f Merge branch 'mac-build-artifact-tweaks' into 'master'
CI - Use XZ for Mac builds, clean some steps

See merge request OpenMW/openmw!4327
2024-09-23 10:11:05 +00:00
Sarah Sunday
57add0f3f6 CI - Use XZ for Mac builds, clean some steps 2024-09-23 10:11:04 +00:00
Alexei Kotov
9be31b66db Merge branch 'fleemeirl' into 'master'
Start combat music for fleeing actors that haven't drawn a weapon

Closes #8159

See merge request OpenMW/openmw!4374
2024-09-22 18:58:47 +00: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
Alexei Kotov
b412b60a07 Update topic highlighting documentation 2024-09-22 21:10:59 +03: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