23366 Commits

Author SHA1 Message Date
Evil Eye
f6a6a33c59 Prevent witnesses from ending combat because they didn't get hit 2025-07-27 21:12:52 +02:00
psi29a
2051d5cbef Merge branch 'master' into 'master'
Fixed Unit Test in `apps/openmw_tests/mwworld/testptr.cpp`

See merge request OpenMW/openmw!4807
2025-07-27 16:33:39 +00:00
Claire
af58da58fd Fixed Unit Test in apps/openmw_tests/mwworld/testptr.cpp 2025-07-27 16:33:38 +00:00
psi29a
7637ca536b Merge branch 'turnedwerewolf' into 'master'
Remove completion threshold-based turning for the player (#8447)

Closes #8447

See merge request OpenMW/openmw!4628
2025-07-27 16:32:43 +00:00
psi29a
7aeff7e473 Merge branch 'combatparalysis' into 'master'
Put combat actions on hold when the actor is incapacitated (#7979)

Closes #7979

See merge request OpenMW/openmw!4597
2025-07-27 16:32:22 +00:00
psi29a
02102eeeca Merge branch 'instantmagicjustaddwater' into 'master'
Update effects upon applying them

Closes #7996

See merge request OpenMW/openmw!4124
2025-07-27 16:30:56 +00:00
Alexei Kotov
d3328552e8 Avoid recomputing collision prediction things an extra N times (#8548) 2025-07-27 07:36:43 +03:00
Alexei Kotov
ed32e4405a Merge branch 'optionalglobalism' into 'master'
Remove global config on Windows

Closes #8434

See merge request OpenMW/openmw!4762
2025-07-26 23:25:55 +03:00
Skyhasacat
9f10269ecc Merge branch 'lua_weather_bindings' into 'master'
lua - add weatherbindings to openmw.core (#6976)

See merge request OpenMW/openmw!4526
2025-07-26 15:01:32 +00:00
Evil Eye
b4a753812e Use empty paths instead of optionals 2025-07-26 10:23:19 +02:00
Evil Eye
c0b230b742 Remove global config on Windows 2025-07-26 09:45:35 +02:00
Sebastian Fieber
95fc66bccd adjusments to weatherbindings
- return nil for not existing effects
- also use currectTexturePath for cloud texture
- corrections for docs
2025-07-25 23:22:33 +02:00
Sebastian Fieber
855b236ee8 direction of the sun light != direction to the sun 2025-07-25 21:00:09 +02:00
Alexei Kotov
730a62effc Merge branch 'warn-baby-warn' into 'master'
Fix MSVC warnings

Closes #7882

See merge request OpenMW/openmw!4804
2025-07-25 21:45:34 +03:00
Sebastian Fieber
cbb96e0fc2 colors should use Misc::Color 2025-07-25 20:10:21 +02:00
Sebastian Fieber
f1447207b2 more less preprocessed code lines 2025-07-25 01:13:43 +02:00
Sebastian Fieber
27adbf0cde less preprocessed code lines 2025-07-25 00:53:04 +02:00
Sebastian Fieber
d20a56517b add getCurrentSunLightDirection 2025-07-25 00:52:56 +02:00
Sebastian Fieber
6be96da6a4 lua - add weatherbindings to core 2025-07-25 00:43:39 +02:00
Evil Eye
f52d9ad977 Prevent hostile actors from engaging combat against actors with 75 chameleon 2025-07-24 17:02:42 +02: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
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
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
Aussiemon
044c556f0e Fix precision issue with container capacity check 2025-07-23 09:31:38 +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
Aussiemon
01fa3cc4e6 Subtract Charm from permanent disposition clamp range 2025-07-20 19:05:24 +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
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
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
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