1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-30 12:04:31 +00:00
Commit graph

36911 commits

Author SHA1 Message Date
Evil Eye
a501e1ad1c Workaround a cmake/ninja issue 2025-11-24 17:45:07 +01:00
Evil Eye
e66d43c083 Reduce the diff 2025-11-24 17:45:07 +01:00
Evil Eye
10c96ff68d Use configure_file substitution 2025-11-24 17:45:07 +01:00
Evil Eye
c6c515f770 Make ATTACK_SOURCE_TYPES read only 2025-11-24 17:45:07 +01:00
Evil Eye
189eff7a49 Use cmake to create vfs-mw/builtin.omwscripts 2025-11-24 17:45:07 +01:00
Evil Eye
e978c230dc Override functions by shallow copying the interface instead of overriding files 2025-11-24 17:45:07 +01:00
Evil Eye
7928930435 Move Morrowind mechanics to data-mw 2025-11-24 17:45:05 +01:00
Evil Eye
2a63ec6af6 Merge branch 'lua-docs-grammar-fixes' into 'master'
Lua docs: minor grammar fixes (mostly missing articles)

See merge request OpenMW/openmw!4996
2025-11-24 16:40:28 +00:00
Johannes Dickenson
dfc1345a63 Lua docs: minor grammar fixes (mostly missing articles) 2025-11-24 16:40:27 +00:00
Alexei Kotov
422e1135e9 Merge branch 'master' into 'master'
Update file events.rst

See merge request OpenMW/openmw!5014
2025-11-24 13:27:16 +03:00
Evil Eye
f8374f2ff0 Merge branch 'fix-8705' into 'master'
Feature #8705: Use texture-based LUT for moddable global map colors

See merge request OpenMW/openmw!4932
2025-11-23 20:54:11 +00:00
Andrzej Głuszak
1bc95605ce Feature #8705: Use texture-based LUT for moddable global map colors 2025-11-23 20:54:11 +00:00
Alexei Kotov
c687a21ccb Merge branch 'enum_naming' into 'master'
Fix and enforce enum naming (#8424)

See merge request OpenMW/openmw!4986
2025-11-23 22:36:23 +03:00
Alexei Kotov
b571835695 Merge branch 'fix_nif_bhk_ragdoll_template' into 'master'
Use proper type for bhkRagdollTemplate::mBones

See merge request OpenMW/openmw!5013
2025-11-23 22:17:12 +03:00
ComeBESNIER
ec81e3b4a6 Edit events.rst
Add a space between `amount` and `=` for stylistical reasons.
2025-11-23 13:42:05 +00:00
elsid
7e1c1e8625
Use proper type for bhkRagdollTemplate::mBones 2025-11-23 13:21:41 +01:00
Alexei Kotov
b49b048f72 Merge branch 'warn-baby-warn-warning-inferno' into 'master'
Warning inferno - fix warnings, then fix warnings

Closes #8674

See merge request OpenMW/openmw!4927
2025-11-23 15:01:53 +03:00
Alexei Kotov
46e0369fee Merge branch 'fix_benchmark_distribution' into 'master'
Use uniform_real_distribution for agent half extents

See merge request OpenMW/openmw!5005
2025-11-23 15:00:08 +03:00
Alexei Kotov
3abc719aa6 Merge branch 'fix_msvc_warnings' into 'master'
Fix C4244 in navmeshtilescache benchmark

See merge request OpenMW/openmw!5011
2025-11-23 14:48:19 +03:00
ComeBESNIER
ac7cc4c9ea Update file events.rst 2025-11-23 09:16:55 +00:00
elsid
d4ce5a2ac6
Fix and enforce enum naming 2025-11-22 11:19:18 +01:00
elsid
cde34d8041 Fix C4244 in navmeshtilescache benchmark
apps\benchmarks\detournavigator\navmeshtilescache.cpp(97): warning C4244: 'argument': conversion from 'double' to 'size_t', possible loss of data
apps\benchmarks\detournavigator\navmeshtilescache.cpp(97): note: the template instantiation context (the oldest one first) is
apps\benchmarks\detournavigator\navmeshtilescache.cpp(192): note: see reference to function template instantiation 'void `anonymous-namespace'::getFromFilledCache<1048576,100>(benchmark::State &)' being compiled
apps\benchmarks\detournavigator\navmeshtilescache.cpp(179): note: see reference to function template instantiation 'void `anonymous-namespace'::generateKeys<std::back_insert_iterator<std::vector<`anonymous-namespace'::Key,std::allocator<`anonymous-namespace'::Key>>>,std::linear_congruential_engine<unsigned int,48271,0,2147483647>>(_T0,size_t,_T1 &)' being compiled
        with
        [
            _T0=std::back_insert_iterator<std::vector<`anonymous-namespace'::Key,std::allocator<`anonymous-namespace'::Key>>>,
            _T1=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
apps\benchmarks\detournavigator\navmeshtilescache.cpp(153): note: see reference to function template instantiation '`anonymous-namespace'::Key `anonymous-namespace'::generateKey<_T1>(size_t,_T0 &)' being compiled
        with
        [
            _T1=std::linear_congruential_engine<unsigned int,48271,0,2147483647>,
            _T0=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
apps\benchmarks\detournavigator\navmeshtilescache.cpp(141): note: see reference to function template instantiation 'DetourNavigator::Mesh `anonymous-namespace'::generateMesh<_T0>(size_t,_T0 &)' being compiled
        with
        [
            _T0=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
apps\benchmarks\detournavigator\navmeshtilescache.cpp(99): warning C4244: 'argument': conversion from 'double' to 'size_t', possible loss of data
apps\benchmarks\detournavigator\navmeshtilescache.cpp(112): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
apps\benchmarks\detournavigator\navmeshtilescache.cpp(112): note: the template instantiation context (the oldest one first) is
apps\benchmarks\detournavigator\navmeshtilescache.cpp(144): note: see reference to function template instantiation 'DetourNavigator::Heightfield `anonymous-namespace'::generateHeightfield<_T0>(_T0 &)' being compiled
        with
        [
            _T0=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
2025-11-21 15:37:40 +00:00
elsid
c844e93f82 Use uniform_real_distribution for agent half extents
They have float type.
2025-11-21 15:37:01 +00:00
elsid
0a2234ad3e
Fix C4244 in navmeshtilescache benchmark
apps\benchmarks\detournavigator\navmeshtilescache.cpp(97): warning C4244: 'argument': conversion from 'double' to 'size_t', possible loss of data
apps\benchmarks\detournavigator\navmeshtilescache.cpp(97): note: the template instantiation context (the oldest one first) is
apps\benchmarks\detournavigator\navmeshtilescache.cpp(192): note: see reference to function template instantiation 'void `anonymous-namespace'::getFromFilledCache<1048576,100>(benchmark::State &)' being compiled
apps\benchmarks\detournavigator\navmeshtilescache.cpp(179): note: see reference to function template instantiation 'void `anonymous-namespace'::generateKeys<std::back_insert_iterator<std::vector<`anonymous-namespace'::Key,std::allocator<`anonymous-namespace'::Key>>>,std::linear_congruential_engine<unsigned int,48271,0,2147483647>>(_T0,size_t,_T1 &)' being compiled
        with
        [
            _T0=std::back_insert_iterator<std::vector<`anonymous-namespace'::Key,std::allocator<`anonymous-namespace'::Key>>>,
            _T1=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
apps\benchmarks\detournavigator\navmeshtilescache.cpp(153): note: see reference to function template instantiation '`anonymous-namespace'::Key `anonymous-namespace'::generateKey<_T1>(size_t,_T0 &)' being compiled
        with
        [
            _T1=std::linear_congruential_engine<unsigned int,48271,0,2147483647>,
            _T0=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
apps\benchmarks\detournavigator\navmeshtilescache.cpp(141): note: see reference to function template instantiation 'DetourNavigator::Mesh `anonymous-namespace'::generateMesh<_T0>(size_t,_T0 &)' being compiled
        with
        [
            _T0=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
apps\benchmarks\detournavigator\navmeshtilescache.cpp(99): warning C4244: 'argument': conversion from 'double' to 'size_t', possible loss of data
apps\benchmarks\detournavigator\navmeshtilescache.cpp(112): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
apps\benchmarks\detournavigator\navmeshtilescache.cpp(112): note: the template instantiation context (the oldest one first) is
apps\benchmarks\detournavigator\navmeshtilescache.cpp(144): note: see reference to function template instantiation 'DetourNavigator::Heightfield `anonymous-namespace'::generateHeightfield<_T0>(_T0 &)' being compiled
        with
        [
            _T0=std::linear_congruential_engine<unsigned int,48271,0,2147483647>
        ]
2025-11-21 13:57:51 +01:00
elsid
d7db0d3d46
Use uniform_real_distribution for agent half extents
They have float type.
2025-11-19 20:17:22 +01:00
Evil Eye
c06f94fee8 Merge branch 'fix_esmtool_afl_findings' into 'master'
Check index for ESM4 race parts

See merge request OpenMW/openmw!4987
2025-11-16 13:18:27 +00:00
Alexei Kotov
dcedbfdb26 Merge branch 'feat/potion-autocalc' into 'master'
FEAT: Add & document autocalc flag on potions

See merge request OpenMW/openmw!5000
2025-11-16 12:56:41 +03:00
Dave Corley
f773da37ee FEAT: Add & document autocalc flag on potions (#8796) 2025-11-16 12:56:41 +03:00
Evil Eye
2386c9d1dc Move 0 check to the top 2025-11-15 11:03:56 +01:00
Evil Eye
f2dd080c14 Clamp index before subtracting 2025-11-14 16:45:32 +01:00
Alexei Kotov
ececf031a4 Merge branch 'changelogsync' into 'master'
Sync changelog

See merge request OpenMW/openmw!4998
2025-11-13 19:55:24 +03:00
Alexei Kotov
9ff4c8c060 Sync changelog for 0.51.0 2025-11-13 12:27:14 +03:00
Alexei Kotov
bb3b3eb5e4 Merge branch 'lua-scripts-doc-remove' into 'master'
fixed obsolete ref to lua-scripts in docs

See merge request OpenMW/openmw!4993
2025-11-12 19:52:10 +03:00
Alexei Kotov
063b233d12 Merge branch 'were-blazin-too-hard' into 'master'
FIX: Correct compile error on newest clang

See merge request OpenMW/openmw!4992
2025-11-12 19:50:34 +03:00
gbtb
3178276f06 fixed obsolete ref to lua-scripts in docs 2025-11-12 03:31:06 +10:00
Dave Corley
307a131ca0 FIX: Correct compile error on newest clang 2025-11-11 11:25:52 -06:00
AnyOldName3
447e01504e Another capitalisation warning 2025-11-10 21:34:46 +00:00
jvoisin
429305401e Merge branch 'keywordsoup' into 'master'
Fix KeywordSearch

Closes #8760

See merge request OpenMW/openmw!4960
2025-11-10 21:20:09 +00:00
jvoisin
c09cb5c0de Merge branch 'fileview' into 'master'
Use std::string_view in file collections

See merge request OpenMW/openmw!4909
2025-11-10 21:08:05 +00:00
AnyOldName3
9d0a8eb8c4 New warning from !4980
It didn't like snake case, and then MSVC wasn't happened that it shadowed the constexpr value with the same name
2025-11-10 19:08:09 +00:00
AnyOldName3
f8553f2e8a Resolve new warning from !4798 2025-11-10 16:03:02 +00:00
AnyOldName3
43fecf48c7 Fix new warnings from !4925
I don't understand why this needed doing now, as this was merged weeks ago and I thought I'd absorbed conflicts since then.
2025-11-10 16:02:36 +00:00
AnyOldName3
ef8e7d97cb Resolve merge conflicts from !4971 2025-11-10 16:01:47 +00:00
AnyOldName3
f31ec2b3a5 Merge branch 'printf' into 'master'
Bring messagebox format parsing more in line with printf/vanilla

Closes #8732

See merge request OpenMW/openmw!4878
2025-11-10 15:23:48 +00:00
AnyOldName3
1fadb167c9 Merge branch 'patient0' into 'master'
Allow non-player actors to catch diseases

Closes #8765

See merge request OpenMW/openmw!4968
2025-11-10 14:39:08 +00:00
uramer
1315d29684 Merge branch 'skills_fix' into 'master'
Validate skill level before changing the progress

Closes #8779

See merge request OpenMW/openmw!4981
2025-11-10 09:50:53 +00:00
uramer
3be1010d03 Merge branch 'protectthecall' into 'master'
Ensure LuaUtil::call is invoked from a safe context

Closes #8769

See merge request OpenMW/openmw!4971
2025-11-10 09:50:10 +00:00
Alexei Kotov
ba72415369 Merge branch 'itemviewfocus' into 'master'
Don't reset item view focus during realignment (#8771)

Closes #8771

See merge request OpenMW/openmw!4985
2025-11-10 06:33:56 +03:00
Alexei Kotov
757c325a4d Merge branch 'whats-a-taret' into 'master'
FIX: Correct typo in unlock events

See merge request OpenMW/openmw!4991
2025-11-10 06:31:57 +03:00
Alexei Kotov
8b6a552f5a Merge branch 'handtwohand' into 'master'
Use Hand To Hand Hit 2 sound (#8731)

Closes #8731

See merge request OpenMW/openmw!4978
2025-11-10 06:30:18 +03:00