psi29a
8037a6e765
Merge branch 'portable-launcher' into 'master'
...
Portable Launcher (plus a whole slew of bugs fixes for problems I found that I suspect aren't on the tracker)
Closes #6846
See merge request OpenMW/openmw!3925
2024-04-10 09:53:07 +00:00
psi29a
9db56c8bc4
Merge branch 'usedontactivate' into 'master'
...
Disallow Lua activation of inventory objects
See merge request OpenMW/openmw!4009
2024-04-09 07:10:15 +00:00
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
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
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
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
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
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
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
Andrei Kortunov
8fecbb55ff
Do not store 'location' tags in translation files
2024-04-05 10:12:31 +04: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
Andrei Kortunov
b3188b593c
Disable MyGUI windows snapping
2024-04-02 11:40:21 +04:00
Alexei Kotov
aa447a9c68
Merge branch 'localisation-update-fr' into 'master'
...
French localisation update
See merge request OpenMW/openmw!3999
2024-04-01 20:55:38 +00:00
Arnaud Dochain
36ca3b8bd9
French localisation update
2024-04-01 20:55:38 +00:00
psi29a
a7c6297240
Merge branch 'sorewaai' into 'master'
...
Expose AI stats to Lua
Closes #7860
See merge request OpenMW/openmw!3997
2024-04-01 20:49:38 +00:00
Evil Eye
d08e47bc40
Expose AI stats to Lua
2024-03-29 22:34:53 +01:00
Alexei Kotov
76105cc2d1
Make sunlight scattering and wobbly shores optional
2024-03-29 10:41:04 +03:00
psi29a
3fcf3aca77
Merge branch 'modalsettingsmodal' into 'master'
...
Reimplement the Settings window as a normal window (#7845 , #7870 )
Closes #7845 and #7870
See merge request OpenMW/openmw!3895
2024-03-27 17:59:41 +00:00
psi29a
012d10703f
Merge branch 'spellcast-refactor' into 'master'
...
Spellcast related Lua API + spellcasting/activespell refactor
See merge request OpenMW/openmw!3922
2024-03-25 13:50:23 +00:00
Mads Buvik Sandvei
320d8ef014
Spellcast related Lua API + spellcasting/activespell refactor
2024-03-25 13:50:23 +00:00
psi29a
e62089d102
Merge branch 'lua_records_fix' into 'master'
...
Lua: Standardize record stores
See merge request OpenMW/openmw!3523
2024-03-25 13:46:24 +00:00
Zackhasacat
6d529835ae
Lua: Standardize record stores
2024-03-25 13:46:23 +00:00
Andrei Kortunov
009ccca978
Modify sound API permissions
2024-03-15 19:48:43 +04:00
psi29a
d746918563
Merge branch 'yaml_parse' into 'master'
...
Load YAML files via Lua
Closes #7590
See merge request OpenMW/openmw!3924
2024-03-15 11:02:05 +00:00
Andrei Kortunov
715efe892f
Load YAML files via Lua (feature 7590)
2024-03-14 16:29:21 +04:00
Alexei Kotov
6232b4f9e8
Reimplement the Settings window as a normal window ( #7845 , #7870 )
2024-03-11 23:48:44 +03:00
psi29a
b5b6744321
Merge branch 'hotfix_ui_update' into 'master'
...
Fix Lua UI updates
See merge request OpenMW/openmw!3936
2024-03-11 11:14:26 +00:00
psi29a
0557a649ce
Merge branch 'skill-used-rework' into 'master'
...
Rewrite SkillProgression.skillUsed to allow directly adding xp
See merge request OpenMW/openmw!3927
2024-03-11 09:48:14 +00:00
uramer
eba4ae94b0
Fix re-rendering of settings on value changes
2024-03-10 14:06:21 +01:00
Mads Buvik Sandvei
57d7f5977c
Bump interface version
2024-03-09 21:56:46 +01:00
Mads Buvik Sandvei
7cb316f3c9
Docu fix
2024-03-09 16:35:24 +01:00
psi29a
61d01f3b62
Merge branch 'openmw-sv-2024-03' into 'master'
...
Bring sv translations up to date
See merge request OpenMW/openmw!3926
2024-03-09 09:49:14 +00:00
Joakim Berg
709c12053a
Bring sv translations up to date
2024-03-09 09:49:14 +00:00
AnyOldName3
baab28440e
Russian translations from Capo
2024-03-08 01:49:23 +00:00
uramer
a11e553de4
Optimize setting group rendering by rendering them as separate elements, support element-rendered setting renderers
2024-03-06 23:16:02 +01:00
uramer
7a5493796f
Update setting page elements when possible
2024-03-06 23:16:02 +01:00
Mads Buvik Sandvei
312f6c90e0
Rewrite SkillProgression.skillUsed to allow directly adding xp instead of going via useType.
2024-03-06 20:27:41 +01:00
AnyOldName3
c23e5e1059
I guess these aren't wired up as a dependency of the build
...
I know the qm generation is so maybe it needs another look
2024-03-06 00:47:31 +00:00
