Alexei Kotov
961c53f1c4
Merge branch 'clickcrash' into 'master'
...
Don't crash when clicking the logo video
See merge request OpenMW/openmw!3736
2024-01-07 01:21:56 +00:00
Alexei Kotov
dfc29974d0
Merge branch 'water_walking_cost' into 'master'
...
Use walking speed for swimming actor with water walking for pathfinding (#7758 )
Closes #7758
See merge request OpenMW/openmw!3732
2024-01-07 01:19:43 +00:00
Evil Eye
72c382aca6
Don't crash when clicking the logo video
2024-01-06 14:23:08 +01:00
psi29a
c3c8fa1e61
Merge branch 'sceneleak' into 'master'
...
Set paged refs' base node to null (#6335 )
Closes #6335
See merge request OpenMW/openmw!3715
2024-01-06 11:07:07 +00:00
elsid
903299ce50
Avoid recomputing navigator flags when getting area costs
2024-01-06 02:39:42 +01:00
elsid
594bd6e136
Use walking speed for swimming actor with water walking for pathfinding
...
This will make them find shorter paths nearby shores.
2024-01-06 02:39:40 +01:00
jvoisin
689efa6d69
Merge branch 'mapnotes' into 'master'
...
Shorten global map marker notes like vanilla (bug #7619 )
Closes #7619
See merge request OpenMW/openmw!3719
2024-01-05 13:05:56 +00:00
jvoisin
5837f97b99
Merge branch 'nonexclusivesettings' into 'master'
...
Downgrade Settings GUI mode to a modal (bug #6758 )
Closes #6758
See merge request OpenMW/openmw!3720
2024-01-05 13:04:20 +00:00
Alexei Kotov
c5a3b516d6
Merge branch 'init_variables' into 'master'
...
Add missing initialization
See merge request OpenMW/openmw!3722
2024-01-04 20:31:55 +00:00
Andrei Kortunov
8d3efd27ba
Add missing initialization
2024-01-03 19:25:33 +04:00
Alexei Kotov
febfccb356
Merge branch 'move_class_text' into 'master'
...
Avoid redundant string copies
See merge request OpenMW/openmw!3718
2024-01-03 15:24:22 +00:00
Alexei Kotov
b132fd4373
Merge branch 'lua_action_fixes' into 'master'
...
Lua Action fixes
See merge request OpenMW/openmw!3717
2024-01-03 15:19:18 +00:00
Alexei Kotov
7310418984
Downgrade Settings GUI mode to a modal (bug #6758 )
2024-01-02 22:32:52 +03:00
Alexei Kotov
14942d7541
Shorten global map marker notes like vanilla (bug #7619 )
2024-01-02 18:50:32 +03:00
Andrei Kortunov
fb16871c80
Avoid redundant string copies
2024-01-02 18:30:35 +04:00
uramer
e9b48e35c0
Coverity defects
2024-01-02 13:54:02 +01:00
Alexei Kotov
2fbdde34c6
Set paged refs' base node to null ( #6335 )
2024-01-02 02:31:47 +03:00
Evil Eye
ef4e5b45e3
Don't add custom anim source if it's a default animation but keep the skeleton
2024-01-01 15:06:32 +01:00
Evil Eye
03c791e61a
Move animation handling to NpcAnimation
2024-01-01 13:58:55 +01:00
Evil Eye
84c15344ee
Address feedback
2024-01-01 13:07:43 +01:00
Evil Eye
5bd5c84018
Replace missing NPC races and default animations
2024-01-01 13:07:43 +01:00
Alexei Kotov
78459314bf
Merge branch 'impartialplayerbelike' into 'master'
...
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us
Closes #7645
See merge request OpenMW/openmw!3650
2023-12-31 17:33:08 +00:00
jvoisin
31ac993374
Merge branch 'allthatglitters' into 'master'
...
Use NAM9 for stack count
Closes #2566
See merge request OpenMW/openmw!3698
2023-12-31 17:12:46 +00:00
Evil Eye
e63933efa6
Use NAM9 for stack count
2023-12-31 17:12:46 +00:00
jvoisin
6180ad0e51
Merge branch 'sunlighting' into 'master'
...
Fix interior sun direction (bug #7585 )
Closes #7585
See merge request OpenMW/openmw!3699
2023-12-31 17:12:32 +00:00
Evil Eye
c97d0b5252
Merge branch 'weather' into 'master'
...
Make rain and snow ripple settings global rather than per-weather (#7748 )
See merge request OpenMW/openmw!3706
2023-12-31 11:01:14 +00:00
Alexei Kotov
7e162a0d7c
Merge branch 'lua_real_frame_time' into 'master'
...
Pass real frame duration to onFrame
See merge request OpenMW/openmw!3621
2023-12-31 01:21:41 +00:00
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
Alexei Kotov
640fa53bb8
Make rain and snow ripple settings global rather than per-weather ( #7748 )
2023-12-30 04:24:18 +03: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
Alexei Kotov
abbbd8cf69
Fix interior sun direction (bug #7585 )
2023-12-29 02:21:39 +03: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
Cody Glassman
8f85c9194d
lua - add bindings to get frame duration
2023-12-26 09:15:55 -08: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
