psi29a
3942d7fb7e
Merge branch 'lua_crime_bounty' into 'master'
...
Lua: Add setCrimeLevel to types.Player
See merge request OpenMW/openmw!4008
2024-04-09 07:10:05 +00:00
Evil Eye
1ed82662ee
Don't show nameless higher ranks
2024-04-08 17:54:13 +02:00
AnyOldName3
a179e9c001
The rest of the merge conflict
...
I didn't notice it as GitLab didn't highlight the diff properly.
2024-04-08 13:43:42 +01:00
AnyOldName3
0d547c5438
Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893
2024-04-08 13:37:36 +01:00
psi29a
c29816f67e
Merge branch 'sv-translatation-2024-04-04' into 'master'
...
Update Swedish translations
See merge request OpenMW/openmw!4004
2024-04-08 09:11:41 +00:00
Joakim Berg
c485726046
Update Swedish translations
2024-04-08 09:11:40 +00:00
psi29a
d4aeeea52a
Merge branch 'capitalize' into 'master'
...
Capitalize captions
See merge request OpenMW/openmw!3893
2024-04-08 08:09:12 +00:00
Andrei Kortunov
e8c3c8115a
Capitalize captions in Launcher and Wizard
2024-04-08 09:17:43 +04:00
Andrei Kortunov
edb9da5a67
Capitalize in-game setting
2024-04-08 09:15:09 +04:00
AnyOldName3
810e2c44a6
Merge conflict resolution part II
2024-04-07 22:34:17 +01:00
AnyOldName3
48f1f08537
Hide things that depend on present-but-inactive game files
...
https://gitlab.com/OpenMW/openmw/-/merge_requests/3925#note_1843962919
2024-04-07 22:12:39 +01:00
AnyOldName3
f8224b29d4
Resolve merge conflicts
...
These were caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/4005
I've had to cherry-pick parts of that MR into this commit, otherwise the CI would yell at me when it noticed the location tags had gone.
2024-04-07 21:59:54 +01:00
Zackhasacat
a51b6c7392
Remove menu select
2024-04-07 15:23:27 -05:00
Sam Hellawell
d23c10622d
Use dynamic cast to check for bone
2024-04-07 21:09:45 +01:00
Zackhasacat
da4e6b38a8
Clang format
2024-04-07 10:37:15 -05:00
Zackhasacat
a29be8909d
Add bindings to select the next menu element
2024-04-07 10:35:13 -05:00
Zackhasacat
6491bb4910
Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor
2024-04-07 08:58:30 -05:00
Zackhasacat
e549490bb1
record crime ID
2024-04-07 08:28:43 -05:00
Alexei Kotov
8027c1e662
Merge branch 'l10n-input-binding' into 'master'
...
Attempt to fix #7906 : l10n name for inputBinding setting renderer taken from action/trigger l10n, not key
Closes #7906
See merge request OpenMW/openmw!4007
2024-04-07 12:04:34 +00:00
Evil Eye
d68d20eb1a
Disallow Lua activation of inventory objects
2024-04-07 10:42:29 +02:00
Zackhasacat
b859fc10e2
Add doc note
2024-04-06 18:18:14 -05:00
Zackhasacat
4ca13a9404
Verify the player
2024-04-06 18:17:51 -05:00
Zackhasacat
5856bc8a0e
Add setCrimeLevel
2024-04-06 18:13:51 -05:00
trav5
b0008d22e6
Attempt to fix openmw issue #7906
...
l10n name is taken not from the ActionInfo/TriggerInfo's 'key' param,
but from the 'l10n' param when making the inputBinding setting renderer
2024-04-06 23:07:11 +02:00
Alexei Kotov
239d8f49d8
Merge branch 'consistent-translations' into 'master'
...
Do not store 'location' tags in translation files
See merge request OpenMW/openmw!4005
2024-04-06 20:58:08 +00:00
Sam Hellawell
36cccef606
Fix formatting
2024-04-05 23:43:59 +01:00
psi29a
8e1d790919
Merge branch 'widgets_rework' into 'master'
...
Make widgets more vanilla-friendly
Closes #7875 and #7914
See merge request OpenMW/openmw!3941
2024-04-05 06:33:53 +00:00
psi29a
2529b8c5a9
Merge branch 'megumingreatersigngreatersigngreatersignaqua' into 'master'
...
Water shader cleanup
See merge request OpenMW/openmw!4000
2024-04-05 06:33:31 +00:00
Andrei Kortunov
8fecbb55ff
Do not store 'location' tags in translation files
2024-04-05 10:12:31 +04:00
Sam Hellawell
a51d560174
Move bone rename logic to ColladaDescriptionVisitor, undo formatting/refactoring
2024-04-05 01:59:40 +01:00
Benjamin Y
a9346d3c8a
updated localization files
2024-04-04 16:02:38 -04:00
Benjamin Y
76199e1fb2
Update settingspage.ui with description for PPL
2024-04-04 19:45:45 +00:00
Alexei Kotov
f2e0129436
Convert water/ripple defines to camelCase
2024-04-04 21:12:47 +03:00
Alexei Kotov
612177be09
Improve some cryptic naming in the water shader
2024-04-04 21:01:14 +03:00
Alexei Kotov
0be7d7fa4c
Reduce the amount of redundant code in the water shader
2024-04-04 21:01:14 +03:00
Alexei Kotov
fbe84f4668
Remove underwater fog radialization remnants
...
The fog is now view-independent so this is not something to concern ourselves as with anymore
2024-04-04 21:01:14 +03:00
Sam Hellawell
ceabeab0fd
Fix RotateController not updating skeleton
2024-04-04 00:11:15 +01:00
Sam Hellawell
2288a691d2
Replace osgAnimation bone underscore naming at load time, map bone instances, reset root bone transform each frame
2024-04-04 00:10:51 +01:00
Alexei Kotov
3380b806de
Merge branch 'haggleraven' into 'master'
...
Remove superfluous Trading class
See merge request OpenMW/openmw!3996
2024-04-03 18:21:02 +00:00
Alexei Kotov
dfdd7aa684
Always queue movement even when there's none
2024-04-03 21:16:47 +03:00
Alexei Kotov
5e99545b9c
Don't discard stagger/KO animation movement
2024-04-03 21:11:49 +03:00
psi29a
3a1d0a9649
Merge branch 'timeout_table_filter' into 'master'
...
Restore !613
See merge request OpenMW/openmw!3990
2024-04-03 07:12:53 +00:00
uramer
3b930e4471
Restore !613
2024-04-03 07:12:53 +00:00
Andrei Kortunov
02e000ab5b
Add changelog entries
2024-04-02 11:56:30 +04:00
Andrei Kortunov
1b544b93d2
Do not allow to move resizable windows outside of game window
2024-04-02 11:40:21 +04:00
Andrei Kortunov
939760007e
Resize console window on resolution change, not reset it
2024-04-02 11:40:21 +04:00
Andrei Kortunov
b3188b593c
Disable MyGUI windows snapping
2024-04-02 11:40:21 +04:00
psi29a
99fa1278d2
Merge branch 'codenames' into 'master'
...
Make binding names layout-independent
See merge request OpenMW/openmw!3993
2024-04-02 07:36:45 +00:00
psi29a
b83ffdc357
Merge branch 'i-have-value-too' into 'master'
...
FIX(CS): Re-add gold value column for objects
See merge request OpenMW/openmw!3991
2024-04-02 07:34:51 +00:00
psi29a
46bf6c12b6
Merge branch 'equipunequipwhatsthedifference' into 'master'
...
Allow weapon equip/unequip animations to intersect (#7886 )
Closes #7886
See merge request OpenMW/openmw!3951
2024-04-02 07:34:31 +00:00
