psi29a
6dc09b1cda
Update file before_install.osx.sh
2024-01-07 01:12:50 +00:00
psi29a
21f177daac
Merge branch 'shininess' into 'master'
...
Silence OSG shininess limit warnings
See merge request OpenMW/openmw!3725
2024-01-06 11:26:40 +00:00
Evil Eye
26a0d27e57
Merge branch 'fix-mwui-docs' into 'master'
...
Missing newlines in MWUI documentation
See merge request OpenMW/openmw!3726
2024-01-06 11:09:35 +00: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
jvoisin
b4971b6841
Merge branch 'dashdashdash' into 'master'
...
Fix MagicSchoolData documentation
See merge request OpenMW/openmw!3729
2024-01-05 22:02:32 +00:00
Evil Eye
8e17aff6a6
Fix MagicSchoolData documentation
2024-01-05 22:17:46 +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
uramer
2c45d316fb
Missing newlines in MWUI documentation
2024-01-05 11:21:12 +00:00
psi29a
459aa69b87
Merge branch 'clampunclamped' into 'master'
...
Manually clamp controller time (#7523 )
Closes #7523
See merge request OpenMW/openmw!3713
2024-01-05 09:43:23 +00:00
Alexei Kotov
19a7d50a3f
Merge branch 'error_codes' into 'master'
...
Use error messages instead of unhandled exceptions
See merge request OpenMW/openmw!3723
2024-01-04 20:35:37 +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
Alexei Kotov
3ba03782c0
Silence OSG shininess limit warnings
2024-01-04 01:02:33 +03:00
Andrei Kortunov
7ffb2bc3c4
Use error messages instead of unhandled exceptions
2024-01-03 21:48:25 +04:00
Andrei Kortunov
8d3efd27ba
Add missing initialization
2024-01-03 19:25:33 +04:00
Alexei Kotov
9cbe82ac7b
Merge branch 'qmake_leftover' into 'master'
...
Remove qmake leftover
See merge request OpenMW/openmw!3716
2024-01-03 15:24:35 +00: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
19a6fd4e1b
Merge branch 'display_esm_version' into 'master'
...
Improve format version in content selector
See merge request OpenMW/openmw!3709
2024-01-02 17:32:21 +00: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
e734191b56
Add clarifying comment
2024-01-02 14:40:03 +01:00
uramer
9d1a3f243d
Use the same controls check for startUse and processAttacking
2024-01-02 14:31:13 +01:00
uramer
e9b48e35c0
Coverity defects
2024-01-02 13:54:02 +01:00
uramer
c1e8e88914
Fix input trigger docs
2024-01-02 13:47:04 +01:00
uramer
1d8ee7984f
Make input.triggers[] consistent with input.actions[]
2024-01-02 13:45:45 +01:00
uramer
5f2cbf810d
Check if controls are on for Use action
2024-01-02 13:38:55 +01:00
Alexei Kotov
2ff2e3c2ef
Merge branch 'raceless' into 'master'
...
Replace missing NPC races and default animations
Closes #6754
See merge request OpenMW/openmw!3703
2024-01-02 12:37:03 +00:00
Alexei Kotov
cf2c6a99a0
Merge branch 'unsignedscript' into 'master'
...
Prevent input type assertion
See merge request OpenMW/openmw!3708
2024-01-02 12:06:07 +00:00
Andrei Kortunov
0705175b9b
Remove qmake leftover
2024-01-02 09:23:55 +04:00
Alexei Kotov
2fbdde34c6
Set paged refs' base node to null ( #6335 )
2024-01-02 02:31:47 +03:00
jvoisin
29c20cdb41
Merge branch 'fix_universal_id' into 'master'
...
Add missing UniversalId::mClass initialization
See merge request OpenMW/openmw!3707
2024-01-01 23:05:57 +00:00
Alexei Kotov
04b714198a
Manually clamp controller time ( #7523 )
2024-01-01 20:59:33 +03:00
Andrei Kortunov
93e50cc7aa
Improve format version in content selector
2024-01-01 18:16:58 +04: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
4636ab3f3e
Update cmakelists
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
Evil Eye
b835114ce2
Prevent input type assertion
2024-01-01 12:48:12 +01:00
elsid
94409ce172
Add missing UniversalId::mClass initialization
2024-01-01 01:12:19 +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
jvoisin
db0d78ba24
Merge branch 'normalizednormals' into 'master'
...
Don't handle per-vertex normals as tangent space normals (#7748 )
See merge request OpenMW/openmw!3704
2023-12-31 17:12:05 +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
Alexei Kotov
0f9eb3d85a
Merge branch 'editor_double_settings' into 'master'
...
Use settings values to declare double settings (#6876 )
See merge request OpenMW/openmw!3701
2023-12-30 15:20:25 +00:00