1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00

16266 Commits

Author SHA1 Message Date
psi29a
ff514df5a1 Merge branch 'distortion' into 'master'
Distortion

See merge request OpenMW/openmw!3536
2023-12-26 10:31:51 +00:00
jvoisin
b39a6ae9cd Merge branch 'smoothbraincriminal' into 'master'
End pursue package if the target doesn't have a bounty

See merge request OpenMW/openmw!3677
2023-12-26 09:59:24 +00:00
Evil Eye
af40d7ce80 End pursue package if the target doens't have a bounty 2023-12-23 15:50:36 +01:00
Alexei Kotov
099c39ae87 Use fallback weather ripple settings (bug #7292) 2023-12-23 11:46:08 +03:00
elsid
4067e10f3f
Use gamepad cursor speed setting 2023-12-22 19:24:02 +01:00
AnyOldName3
8cafcf702f Merge branch 'sdl_errors' into 'master'
Handle and log some controller related SDL errors (#7728)

Closes #7728

See merge request OpenMW/openmw!3669
2023-12-22 14:57:21 +00:00
Alexei Kotov
f11c66794b Merge branch 'advancedalchemy' into 'master'
Make ingredient order affect effect order

Closes #7676

See merge request OpenMW/openmw!3667
2023-12-22 08:25:24 +00:00
jvoisin
2873f971a6 Merge branch 'downsized' into 'master'
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
2023-12-21 22:50:10 +00:00
Cody Glassman
187f63d3d3 support postprocess distortion 2023-12-21 10:56:38 -08:00
Alexei Kotov
51cb3b08cb Merge branch 'followthecrab' into 'master'
Stop combat when stacking a new AI package

Closes #7661

See merge request OpenMW/openmw!3665
2023-12-21 07:08:36 +00:00
elsid
78a0e0eb3b
Handle and log some controller related SDL errors
SDL_GameControllerNameForIndex may return nullptr indicating an error which
causes a crash when passed to log.
2023-12-21 02:19:24 +01:00
Evil Eye
532a330aac mac plz 2023-12-20 13:58:43 +01:00
Evil Eye
1223d12b29 Make ingredient order affect effect order 2023-12-20 11:56:12 +01:00
Alexei Kotov
78a8f9d692 Merge branch 'skating-olympics' into 'master'
De-jank stationary animations

Closes #3330

See merge request OpenMW/openmw!3631
2023-12-20 12:35:41 +03:00
Evil Eye
8a1ca870eb Stop infighting when gaining new allies 2023-12-19 21:23:10 +01:00
Mads Buvik Sandvei
00b1cd8c08 Replace movement() with eraseMovementIf() 2023-12-18 22:50:45 +01:00
Mads Buvik Sandvei
5a6dbf8714 Comments 2023-12-18 22:43:45 +01:00
Evil Eye
94b129cc62 Stop combat when stacking a new AI package 2023-12-18 22:18:26 +01:00
Evil Eye
77cf9284b7 Allow ModPCCrimeLevel to clear crimes and cap bounties 2023-12-18 21:52:17 +01:00
jvoisin
2c1810c6db Merge branch 'hoteltransylvania' into 'master'
Outlaw vampires and werewolves (bugs #7723, #7724)

Closes #7723 and #7724

See merge request OpenMW/openmw!3661
2023-12-17 19:08:32 +00:00
Evil Eye
37415b0382 Don't use getExact to read structs 2023-12-17 15:16:32 +01:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01:00
Alexei Kotov
82982bbc05 Outlaw vampires and werewolves (bugs #7723, #7724) 2023-12-15 23:46:10 +03:00
jvoisin
ec480db9ac Merge branch 'constanteffect' into 'master'
For constant enchantments, allow on-self range for any effect (bug #7643)

Closes #7643

See merge request OpenMW/openmw!3657
2023-12-15 13:35:47 +00:00
jvoisin
c969aa42b7 Merge branch 'aifollow' into 'master'
Base AiFollow activation range on follow distance (bug #7685)

Closes #7685

See merge request OpenMW/openmw!3652
2023-12-14 20:14:20 +00:00
Alexei Kotov
27bd70a976 For constant enchantments, allow on-self range for any effect (bug #7643) 2023-12-14 15:55:24 +03:00
Alexei Kotov
5b02b77a39 Base AiFollow activation range on follow distance (bug #7685) 2023-12-13 20:18:20 +03:00
Alexei Kotov
4dfd2b0f46 Merge branch 'lessassertiveschooling' into 'master'
Don't assert that spells have a school

See merge request OpenMW/openmw!3651
2023-12-13 17:14:29 +00:00
Alexei Kotov
7e3270abc9 Merge branch 'unsave' into 'master'
Drop support for saves made prior to 0.40

See merge request OpenMW/openmw!3645
2023-12-13 00:33:20 +00:00
Evil Eye
a0694d4134 Don't assert that spells have a school 2023-12-12 22:11:32 +01:00
Alexei Kotov
ad8392b7d1 Merge branch 'awholelottanothing' into 'master'
Don't crash on spells or enchantments without effects

Closes #7712

See merge request OpenMW/openmw!3643
2023-12-11 13:02:51 +00:00
Alexei Kotov
21ca9ba34b Merge branch 'crashtainer' into 'master'
Use the right getContainerStore

Closes #7658

See merge request OpenMW/openmw!3644
2023-12-11 12:25:33 +00:00
jvoisin
47b87f1ff2 Merge branch 'reanimaterescaling' into 'master'
Restore animated collision shape rescaling (take 3)

See merge request OpenMW/openmw!3635
2023-12-10 12:55:57 +00:00
Mads Buvik Sandvei
76232c49df clang format 2023-12-09 20:42:14 +01:00
Alexei Kotov
f269b25bd0 Remove unused field 2023-12-09 22:00:35 +03:00
Evil Eye
41dc409238 Don't consider empty effect lists exceptional 2023-12-09 18:20:10 +01:00
Evil Eye
521cff08f8 Drop support for save game format 1 2023-12-09 17:22:11 +01:00
Mads Buvik Sandvei
c79446818e Add a flag for jump when queueing movement, so inertia can be added accurately. 2023-12-09 16:48:04 +01:00
Evil Eye
4062f0225b Use the right getContainerStore 2023-12-09 16:13:56 +01:00
Mads Buvik Sandvei
32d391f548 Revert accumulating movement in the reset accum root callback. 2023-12-09 15:50:17 +01:00
Evil Eye
0da620b3f9 Don't crash on spells or enchantments without effects 2023-12-09 15:40:23 +01:00
Mads Buvik Sandvei
af9312d869 clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
15c143e272 Comment 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
26817e9cc5 Change the comparison of positions to avoid a problem if both positions are large numbers. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
0037fd78c1 Use std::numeric_limits<float>::epsilon() instead of picking our own epsilon. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
edf8c3b81c mSteps should be an int. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
aa30ec81d6 more clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
18a6422c1c clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
28eeef59bc Reduce movement solver same-position epsilon size. The previous value causes very stable idles to very slightly slide. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
81095686bf Reset mPreviousAccumulatePosition when not accumulating to avoid an instant transition when resuming idle anims. 2023-12-09 14:49:58 +01:00