psi29a
|
7647af6e4e
|
Merge branch 'friendlyhit' into 'master'
Correct friendly fire reaction for different damage sources (bug #7646)
Closes #7646
See merge request OpenMW/openmw!3694
|
2023-12-30 09:43:19 +00:00 |
|
psi29a
|
e9f3e5c6d1
|
Merge branch 'lua_actions_electric_boogaloo' into 'master'
Lua actions take 3
See merge request OpenMW/openmw!2628
|
2023-12-29 18:56:59 +00:00 |
|
uramer
|
0e2e386dc9
|
Lua actions take 3
|
2023-12-29 18:56:59 +00:00 |
|
Evil Eye
|
3f6c3e24f4
|
Merge branch 'autoequipcrash' into 'master'
Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll (#7744)
Closes #7744
See merge request OpenMW/openmw!3697
|
2023-12-29 14:30:49 +00:00 |
|
psi29a
|
2fde1ef3d8
|
Merge branch 'bodypartanimation' into 'master'
NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822)
Closes #4822
See merge request OpenMW/openmw!3653
|
2023-12-29 13:09:56 +00:00 |
|
AnyOldName3
|
647bd2b572
|
Merge branch 'revert-78a8f9d6' into 'master'
Revert "Merge branch 'skating-olympics' into 'master'"
See merge request OpenMW/openmw!3696
|
2023-12-28 00:59:07 +00:00 |
|
jvoisin
|
dcb403c114
|
Merge branch 'training' into 'master'
Use modified value for governing attribute training limit (#7742)
Closes #7742
See merge request OpenMW/openmw!3692
|
2023-12-27 22:49:23 +00:00 |
|
Alexei Kotov
|
30cff6f6ee
|
Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll
|
2023-12-28 01:49:18 +03:00 |
|
Mads Buvik Sandvei
|
9d3ede7575
|
Revert "Merge branch 'skating-olympics' into 'master'"
This reverts merge request !3631
|
2023-12-27 19:11:49 +00:00 |
|
Alexei Kotov
|
f1782ad8df
|
Merge branch 'rm_unused_vfs' into 'master'
Remove unused vfs argument from correctMeshPath
See merge request OpenMW/openmw!3691
|
2023-12-27 17:23:16 +00:00 |
|
Alexei Kotov
|
ca5e7d1ccb
|
Merge branch 'fix_fallout3' into 'master'
Make traits and base data optional for ESM4 NPC
See merge request OpenMW/openmw!3682
|
2023-12-27 17:10:13 +00:00 |
|
Alexei Kotov
|
d5428b23d8
|
Disable voiced responses to magical friendly hits (bug #7646)
Disable ranged friendly fire
|
2023-12-27 20:05:08 +03:00 |
|
Alexei Kotov
|
94c052dfef
|
Classify the damage passed to Class::onHit
|
2023-12-27 20:05:08 +03:00 |
|
Evil Eye
|
c6e5a28241
|
Merge branch 'crime_disposition' into 'master'
Implement crime disposition modifier
Closes #4683
See merge request OpenMW/openmw!3448
|
2023-12-27 11:53:56 +00:00 |
|
elsid
|
13c8e04b27
|
Make traits and base data optional for ESM4 NPC
Fallout 3 is not fully supported and it causes failures to load NPCs. Log errors
and make sure there is no nullptr dereference.
|
2023-12-27 10:07:48 +01:00 |
|
jvoisin
|
291d19af48
|
Merge branch 'rm_ref_ptr' into 'master'
Avoid using osg::ref_ptr when reference is enough
See merge request OpenMW/openmw!3690
|
2023-12-27 08:03:16 +00:00 |
|
Alexei Kotov
|
1834597361
|
Move friendly fire logic to onHit
|
2023-12-27 01:03:23 +03:00 |
|
Alexei Kotov
|
1b594d874e
|
Use modified value for governing attribute training limit (#7742)
|
2023-12-26 21:53:49 +03:00 |
|
elsid
|
81a483fc7f
|
Remove unused vfs argument from correctMeshPath
|
2023-12-26 14:14:52 +01:00 |
|
elsid
|
145f7b5672
|
Avoid using osg::ref_ptr when reference is enough
|
2023-12-26 11:35:03 +01:00 |
|
psi29a
|
ff514df5a1
|
Merge branch 'distortion' into 'master'
Distortion
See merge request OpenMW/openmw!3536
|
2023-12-26 10:31:51 +00:00 |
|
Andrei Kortunov
|
ffffb427f5
|
Implement crime disposition modifier (bug 4683)
|
2023-12-26 14:04:23 +04: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
|
2628b02b4e
|
NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822)
|
2023-12-14 00:48:40 +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 |
|