36271 Commits

Author SHA1 Message Date
Evil Eye
f52d9ad977 Prevent hostile actors from engaging combat against actors with 75 chameleon 2025-07-24 17:02:42 +02:00
Evil Eye
e3c9e6fe2b Set a root for BS skins as well 2025-07-24 08:46:21 +02:00
Evil Eye
8d7218c118 Take skin transform and skeleton root into account 2025-07-24 08:40:20 +02:00
Alexei Kotov
ad996393f1 Apply filtering settings to composite maps 2025-07-24 08:41:43 +03:00
AnyOldName3
437f22ed72 Typo fix 2025-07-24 00:37:28 +01:00
AnyOldName3
092d9a4c62 Remove dumb comment 2025-07-24 00:35:22 +01:00
AnyOldName3
f8a96fae24 Some formatting changes I missed 2025-07-24 00:26:47 +01:00
AnyOldName3
be54521cfa Fix loads of warnings
These weren't detected due to https://gitlab.com/OpenMW/openmw/-/issues/7882, but now they are, so they can be fixed.
2025-07-24 00:20:05 +01:00
AnyOldName3
52b785f726 Use updated Windows dependencies
The main changes are changing an OSG option that was disabling most of our warnings, and MSVC2019 switching to a custom vcpkg triplet.
2025-07-23 23:18:03 +01:00
Alexei Kotov
5dddf9153d Fix useAmbientLight references in docs 2025-07-24 00:25:26 +03:00
Evil Eye
acfe9b6785 Merge branch 'karamunsing' into 'master'
Don't deselect item when usage is denied

Closes #7693

See merge request OpenMW/openmw!4788
2025-07-23 18:43:41 +00:00
Evil Eye
362c1a7ebe Update sol 2025-07-23 17:35:35 +02:00
psi29a
d1b03734b3 Merge branch 'master' into 'master'
Save user settings when closing windows

Closes #8077

See merge request OpenMW/openmw!4367
2025-07-23 09:32:04 +00:00
Jared Davenport
324bdf8f7a Save user settings when closing windows 2025-07-23 09:32:04 +00:00
psi29a
d401dd2441 Merge branch 'ContainerCapacityCheck' into 'master'
Fix precision issue with container capacity check

Closes #8606

See merge request OpenMW/openmw!4776
2025-07-23 09:31:38 +00:00
Aussiemon
044c556f0e Fix precision issue with container capacity check 2025-07-23 09:31:38 +00:00
AnyOldName3
125bbdc118 Merge branch 'long-specular' into 'master'
Elongated specular highlight for water

See merge request OpenMW/openmw!4726
2025-07-22 13:04:03 +00:00
Alexei Kotov
896d6fd01e Put combat actions on hold when the actor is incapacitated (#7979) 2025-07-22 15:38:04 +03:00
Alexei Kotov
d899454f36 Remove completion threshold-based turning for the player (#8447) 2025-07-22 15:35:57 +03:00
psi29a
b2cc549585 Merge branch 'theemperorwantedyoutohavethisinvaliditerator' into 'master'
Prevent iterator invalidation during actor traversal

Closes #4885

See merge request OpenMW/openmw!4445
2025-07-22 07:38:20 +00:00
psi29a
2b1cd1deb8 Merge branch 'getpcrunning' into 'master'
Deduplicate GetPCRunning logic

See merge request OpenMW/openmw!4800
2025-07-22 07:37:35 +00:00
Alexei Kotov
93cde36b09 Deduplicate GetPCRunning logic 2025-07-21 19:09:24 +03:00
Evil Eye
30cfb42ed1 Fix rebase fallout 2025-07-21 17:57:51 +02:00
psi29a
c30964feb2 Merge branch 'namespace_naming' into 'master'
Fix and enforce namespace naming (#8424)

See merge request OpenMW/openmw!4648
2025-07-21 10:30:47 +00:00
elsid
28851411a3
Fix and enforce namespace naming 2025-07-20 21:19:16 +02:00
AnyOldName3
9845f76583 Merge branch 'nonessentialjobs' into 'master'
Don't run some non-essential jobs on upstream branch pushes

See merge request OpenMW/openmw!4797
2025-07-20 16:59:04 +00:00
Alexei Kotov
2b4b532745 Merge branch 'charmdispofix' into 'master'
Fix permanent disposition loss on exit conversation

Closes #8557

See merge request OpenMW/openmw!4796
2025-07-20 19:05:24 +03:00
Aussiemon
01fa3cc4e6 Subtract Charm from permanent disposition clamp range 2025-07-20 19:05:24 +03:00
Alexei Kotov
10602a0412 Don't run some non-essential jobs on upstream branch pushes 2025-07-19 12:08:48 +03:00
Evil Eye
8bf9b205b7 Merge branch 'supporteddirections' into 'master'
Cache computed supported movement directions

See merge request OpenMW/openmw!4709
2025-07-19 08:59:18 +00:00
Evil Eye
39cc893639 Unbreak swimdeath fallback 2025-07-19 09:38:44 +02:00
Evil Eye
1dfa2629f0 Remove more redundant checks 2025-07-19 09:24:24 +02:00
Evil Eye
35eed68269 Move null checks to address feedback 2025-07-19 09:24:23 +02:00
Evil Eye
d34aee6257 Allow unsetting a character controller's animation 2025-07-19 09:23:43 +02:00
Evil Eye
b2bb12cd19 Run ~CharacterController when invalidating an Actor 2025-07-19 09:22:44 +02:00
Evil Eye
c098f2ccde Prevent iterator invalidation during actor traversal 2025-07-19 09:22:44 +02:00
Kuyondo
614062d387 prevent item flickering on drag use and dont stop drag on denied lua itemusage 2025-07-19 15:02:32 +08:00
Alexei Kotov
152d87a6b3 Merge branch 'esm4paging' into 'master'
Object paging in ESM4 worldspaces

See merge request OpenMW/openmw!4770
2025-07-18 23:41:18 +03:00
Petr Mikheev
7f28b33cf1 Object paging in ESM4 worldspaces 2025-07-18 22:12:24 +02:00
psi29a
82b1d1b78e Merge branch 'corpsecollector' into 'master'
Ensure corpses of actors that have moved cells are cleaned up

See merge request OpenMW/openmw!4793
2025-07-18 19:57:58 +00:00
psi29a
412134da99 Merge branch 'bsazoomies' into 'master'
Use zlib directly for BSA file decompression (#8569)

Closes #8569

See merge request OpenMW/openmw!4795
2025-07-18 19:56:15 +00:00
Evil Eye
22232e8710 Merge branch 'sortedanimations' into 'master'
Assume NIF controller data is already sorted (#8545)

Closes #8545

See merge request OpenMW/openmw!4794
2025-07-18 19:29:24 +00:00
Alexei Kotov
f7238cd043 Merge branch 'document_object_cache' into 'master'
Add documentation for update function of Generic Object Cache

See merge request OpenMW/openmw!4164
2025-07-18 21:51:16 +03:00
Alexei Kotov
9370b41636 Merge branch 'convertthis' into 'master'
Remove int conversions from pathfinding

See merge request OpenMW/openmw!4755
2025-07-18 16:13:20 +03:00
Alexei Kotov
4a0c998f53 Avoid zero division during animation interpolation 2025-07-18 00:13:01 +03:00
Alexei Kotov
93cb69b012 Assume NIF controller data is already sorted (#8545) 2025-07-18 00:09:28 +03:00
Alexei Kotov
6796121305 Use zlib directly for BSA file decompression (#8569) 2025-07-17 22:25:18 +03:00
Skyhasacat
c90ae89381 Merge branch 'luapaths' into 'master'
Expose path grids to Lua

See merge request OpenMW/openmw!4792
2025-07-17 16:13:09 +00:00
Evil Eye
b61d8fb585 Use Context::initializeOnce 2025-07-17 16:42:24 +02:00
psi29a
3b42874797 Merge branch 'defendingthelight' into 'master'
Only autoequip the shield in updateEquippedLight (#8404)

Closes #8404

See merge request OpenMW/openmw!4763
2025-07-17 14:23:57 +00:00