Commit Graph

34977 Commits (06bf80cc3b6e9ebd4907f192b30a54766f334b98)
 

Author SHA1 Message Date
AnyOldName3 06bf80cc3b Rearrange conditionals to be prettier 2 months ago
AnyOldName3 62199c2dad Install the local openmw.cfg template on Windows
The Windows global config path is really really dumb and the whole concept of having a global path on an OS where it's so easy to have different incompatible versions installed side-by-side (instead of a single canonical OS-wide OpenMW install from the system package manager) is really dumb, too.

We've therefore only used local `openmw.cfg`s on Windows for a very long time.

However, it appears that we were installing the global `openmw.cfg` template instead of the local template.
That's wrong and we shouldn't do it, so I've stopped it.

I've left the separate `openmw.cfg` and `openmw.cfg.install` in the build directory as that makes doing development for portable installs with the same build system as doing the development for the installer easier.
2 months ago
psi29a 4ac1b13871 Merge branch 'vfs_normalized_path_17' into 'master'
Use normalized path for groundcover (#8138)

See merge request OpenMW/openmw!4403
3 months ago
elsid d1ccb4b804
Use normalized path for groundcover 3 months ago
psi29a a50f857eb1 Merge branch 'cyan' into 'master'
Teal CI job hack

See merge request OpenMW/openmw!4402
3 months ago
Evil Eye 86c85d1b75 Force tl 0.15 3 months ago
psi29a 49e178be05 Merge branch 'docs_themes' into 'master'
Update RTD theme

See merge request OpenMW/openmw!4400
3 months ago
Cody Glassman ab682a9469 upgrade theme to fix selector styling 3 months ago
Cody Glassman bf58c03160 docs - update RTD theme 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
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
3 months ago
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
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
elsid 0665de4c09
Use normalized path for model in ProjectileManager 3 months ago
elsid 6e0eb64538
Use normalized path for glow texture names 3 months ago
Alexei Kotov c5b54cf585 Update SDL controller mappings, bump SDL version requirement to 2.0.10 3 months ago
trav5 3b06446bed French fix for 'Factor Strength into Hand-to-Hand Combat'
Found by running a translations make job
3 months ago
trav 3d2dd9201d Merge branch openmw:master into handtohand-tooltip 3 months ago
trav5 4a433635b3 French, Russian and Swedish Factor Strength into Hand-to-Hand Combat
Applied tooltip translation suggestions from the gitlab review. Thanks!
3 months ago
Evil Eye 403189c711 Switch between DrawElementsUInt and DrawElementsUShort on demand 3 months ago
Evil Eye 5e16579793 Switch to DrawElementsUInt 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
Alexei Kotov c4ca0105e8 Make OMWMusic lines stylistically consistent with other tabs 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
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
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
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 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
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 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
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 95a1183ad3 Fix OpenGL debug groups 3 months ago
AnyOldName3 e7a31373c9 Partially fix inventory doll when non-compute-shader ripples are used with FFP 3 months ago
Arnaud Dochain 7f1ce5e812 Add OpenMW Music French setting and unfoformize the other settings tabs 3 months ago
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
3 months ago
Sarah Sunday 57add0f3f6 CI - Use XZ for Mac builds, clean some steps 3 months ago
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
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