psi29a
2438fb4c98
Merge branch 'windows_qt6' into 'master'
...
Use Qt6 on Windows by default
See merge request OpenMW/openmw!4016
2024-04-20 16:39:47 +00:00
psi29a
ddd64c893a
Merge branch 'noyoudumbtoolyourflipingwrong' into 'master'
...
Don't flip the water normal map twice
See merge request OpenMW/openmw!4022
2024-04-20 16:39:09 +00:00
psi29a
b072b9e54b
Merge branch 'actuallynormalnormalz' into 'master'
...
Reconstruct normal Z *properly*
See merge request OpenMW/openmw!4036
2024-04-20 16:38:02 +00:00
Joakim Berg
f9eefd9ac4
Swedish translation of the launcher
2024-04-20 16:35:11 +00:00
Benjamin Y
4f6951b84f
added RU translation from Alexei
2024-04-19 16:49:19 -05:00
Benjamin Y
8cc512cbc9
Convention fixes and remove confusing info
2024-04-18 18:44:51 -05:00
Alexei Kotov
537964f8d8
Reconstruct normal Z *properly*
2024-04-18 11:23:58 +03:00
psi29a
b91ff634e4
Merge branch 'navmesh_queue' into 'master'
...
Optimize queue for navmesh async jobs
See merge request OpenMW/openmw!4025
2024-04-17 11:10:44 +00:00
Andrei Kortunov
d06e8e2c24
Use Qt6 on Windows by default
2024-04-17 08:58:18 +04:00
psi29a
e1be24e7fc
Merge branch 'svg_icons' into 'master'
...
Rework editor icons
See merge request OpenMW/openmw!4024
2024-04-16 20:26:19 +00:00
AnyOldName3
df5cdffbee
Merge branch 'pythagorastrousers' into 'master'
...
Support red-green normal maps (#7932 )
Closes #7932
See merge request OpenMW/openmw!3983
2024-04-16 11:53:16 +00:00
Joakim Berg
9448a30caf
Accidental upper case in a comment
2024-04-15 17:53:17 +00:00
Joakim Berg
231ec03ef4
swedish calendar translation
2024-04-15 17:30:11 +00:00
Alexei Kotov
58afe1ba23
Support red-green normal maps
2024-04-15 12:02:52 +03:00
psi29a
819aace891
Merge branch 'update-appdata' into 'master'
...
Add missing developer tag to appdata
See merge request OpenMW/openmw!4029
2024-04-15 06:47:59 +00:00
psi29a
40ee8b3bed
Merge branch 'GermanTranslationStuff' into 'master'
...
Update/add German translation files
See merge request OpenMW/openmw!4023
2024-04-15 06:47:48 +00:00
Martin Otto
e0a016749c
Update/add German translation files
2024-04-15 06:47:48 +00:00
Alexander Olofsson
c2f63259d8
Add missing developer tag to appdata
2024-04-14 10:53:57 +02:00
Andrei Kortunov
1ad9e5f9e8
Rework editor icons
2024-04-14 08:17:10 +04:00
psi29a
8a980fcce1
Merge branch 'update-appdata' into 'master'
...
Update appdata XML, add branding colors
See merge request OpenMW/openmw!4021
2024-04-13 23:16:28 +00:00
Alexander Olofsson
d6452e7d29
Update appdata XML, add branding colors
2024-04-13 23:16:28 +00:00
elsid
910c88325a
Add a setting to wait for all navmesh jobs on exit
2024-04-13 19:51:16 +02:00
elsid
a1438f65fe
Set proper max tiles on initializing navmesh settings
2024-04-13 19:48:58 +02:00
Alexei Kotov
f880ada633
Don't flip the water normal map twice
2024-04-13 00:06:24 +03:00
Arnaud Dochain
b34dac1a27
Launcher and Wizard french localisation
2024-04-12 15:01:59 +00:00
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
Zackhasacat
a51b6c7392
Remove menu select
2024-04-07 15:23:27 -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
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
Benjamin Y
a9346d3c8a
updated localization files
2024-04-04 16:02:38 -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
Cody Glassman
098396822f
add choice widget type to postprocessing uniforms
2024-03-21 17:48:30 -07: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
psi29a
d168466034
Merge branch 'raciallybound' into 'master'
...
Expose races to Lua
See merge request OpenMW/openmw!3863
2024-03-02 20:14:27 +00:00
psi29a
03d5872a55
Merge branch 'drop_on_exit' into 'master'
...
Add a storage mode to drop section on game exit
See merge request OpenMW/openmw!3905
2024-02-28 20:36:40 +00:00
Evil Eye
f346295975
Add a number-per-sex type
2024-02-27 21:57:01 +01:00
Evil Eye
cd118ee263
Expose races to Lua
2024-02-27 21:50:57 +01:00
Andrei Kortunov
2a4f12b96e
Use a new life time API
2024-02-27 23:26:26 +04:00
Andrei Kortunov
ddd0945645
Add a storage mode to drop section on game exit
2024-02-27 23:26:22 +04:00
Mads Buvik Sandvei
c82c111ee1
Use correct index for Athletics_SwimOneSecond
2024-02-27 19:28:51 +01:00
psi29a
b9fc9f0827
Merge branch 'ownership' into 'master'
...
Lua: Remove legacy ownership documentation
See merge request OpenMW/openmw!3912
2024-02-27 17:03:25 +00:00
AnyOldName3
626f438dcc
Make builtin.omwscripts actually mandatory
...
Previously it was quasi-mandatory - lots of things would add it, e.g. when running openmw through the CS, but it could technically be disabled.
Now it's treated like the resources/vfs directory and implicitly added by the engine etc.
2024-02-27 01:09:46 +00:00
Alexei Kotov
98447a1690
Remove legacy ownership documentation
2024-02-26 12:48:59 +03:00
Alexei Kotov
ba78729f35
Make Run action ru description more faithful to en description
2024-02-25 16:42:18 +03:00
Alexei Kotov
25b6230a54
Fix Smooth Move Right action localization
2024-02-25 16:13:45 +03:00
Alexei Kotov
fe78e57391
Russian localization updates
...
Localize new player controls lines
Fix some other minor inconsistencies
2024-02-25 15:53:23 +03:00
Evil Eye
595e42ae43
Merge branch 'lua_death_finished' into 'master'
...
Add a Lua function to check if actor's death is finished
See merge request OpenMW/openmw!3901
2024-02-24 10:31:15 +00:00
Alexei Kotov
cd4845ff08
Merge branch 'ingame_text' into 'master'
...
Improve in-game text
See merge request OpenMW/openmw!3894
2024-02-23 12:37:21 +00:00
Abdu Sharif
83ab028bef
Improve in-game text
2024-02-23 12:37:20 +00:00
psi29a
e4a9e83609
Merge branch 'disable-shadows-properly-properly' into 'master'
...
Affect correct texture units when disabling shadows for stateset
Closes #7838
See merge request OpenMW/openmw!3891
2024-02-22 18:05:48 +00:00
psi29a
a6c9e63520
Merge branch 'nojumpallowed' into 'master'
...
Reduce false-positive jumping events (#7833 )
Closes #7833
See merge request OpenMW/openmw!3869
2024-02-22 18:05:07 +00:00
Andrei Kortunov
7c4b42ab2a
Add a Lua function to check if actor's death is finished
2024-02-22 19:06:15 +04:00
psi29a
56596e7589
Merge branch 'fix_menu_docs' into 'master'
...
Fix Documentation for core.sendMenuEvent to be listed under types.Player
See merge request OpenMW/openmw!3871
2024-02-21 14:00:54 +00:00
psi29a
bc873d2869
Merge branch 'equipment' into 'master'
...
Lua docs: equipment -> getEquipment
See merge request OpenMW/openmw!3892
2024-02-21 13:59:59 +00:00
psi29a
097fad352f
Merge branch 'wtf-even-is-force-shaders' into 'master'
...
Clarify shaders documentation
See merge request OpenMW/openmw!3860
2024-02-21 10:21:54 +00:00
Alexei Kotov
4ca3b83ecb
Lua docs: equipment -> getEquipment
2024-02-21 09:07:00 +03:00
Alexei Kotov
93bb67a08f
Merge branch 'launcher_fixes' into 'master'
...
Minor launcher improvements
Closes #7843
See merge request OpenMW/openmw!3887
2024-02-21 05:51:27 +00:00
Zackhasacat
d96340c902
Return to original order
2024-02-20 23:42:27 -06:00
Zackhasacat
fc55b87664
Put it in the right place, again
2024-02-20 23:38:49 -06:00
AnyOldName3
d282fdb77a
Eliminate unused uniform
2024-02-20 23:10:03 +00:00
uramer
d7bd50e45f
Only set controls.jump to true for one frame when jumping
2024-02-20 20:20:38 +01:00
Zackhasacat
d73c1c8590
Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor
2024-02-20 12:07:23 -06:00
Zackhasacat
873877795a
Move gamepad controls to lua interface
2024-02-20 12:06:19 -06:00
Andrei Kortunov
3971abf5e6
Minor launcher improvements (feature 7843)
2024-02-20 14:02:59 +04:00
uramer
cfa6dc076b
Render global setting groups on renderlua
2024-02-19 19:39:52 +01:00
uramer
586706ffe0
Handle group resets gracefully
2024-02-19 19:35:41 +01:00
uramer
ef730c4395
Clean up global setting groups, don't try to destroy setting pages before they were rendered
2024-02-19 18:26:58 +01:00
Zackhasacat
95ade48292
Fix menu doc
2024-02-16 19:22:34 -06:00
AnyOldName3
9c959d9698
Make a long sentence more concise
...
Thanks Bing Chat for doing a mediocre job of this that inspired me to do a competent job of it.
2024-02-16 01:33:52 +00:00
AnyOldName3
91e7eebefb
Clarify interaction between clamp lighting and terrain
2024-02-14 13:32:39 +00:00
psi29a
ec1cf46ec7
Merge branch 'lua_keybinds' into 'master'
...
Lua Implement mouse input engine handlers, improve inputBinding renderer
See merge request OpenMW/openmw!3855
2024-02-14 08:30:38 +00:00
psi29a
29c2042432
Merge branch 'lua_callback_crash' into 'master'
...
Lua Fix crash when passing a non-callback table to a callback argument
Closes #7827
See merge request OpenMW/openmw!3861
2024-02-14 08:29:58 +00:00
psi29a
744cd50520
Merge branch 'decoupled-audio' into 'master'
...
Add option to use camera as sound listener
Closes #5944
See merge request OpenMW/openmw!3836
2024-02-13 09:18:18 +00:00
Epoch
6486f3f2cf
Add option to use camera as sound listener
2024-02-13 09:18:18 +00:00
psi29a
50ea852928
Merge branch 'STOP_IGNORING_ME_AND_LOOK_ME_IN_THE_EYES' into 'master'
...
add ignore list to raycasts (#7788 )
See merge request OpenMW/openmw!3848
2024-02-13 09:15:49 +00:00
psi29a
9fb28a250c
Merge branch 'a2c-grammar' into 'master'
...
Fix grammar for A2C checkbox
See merge request OpenMW/openmw!3858
2024-02-13 09:15:17 +00:00
uramer
4ffcb5b197
Prevent deepContentCopy corrupting non-plain tables
2024-02-13 00:59:39 +01:00
Cody Glassman
56b31ceaf5
add ignore list to raycasts
2024-02-12 07:52:47 -08:00
AnyOldName3
567d36240e
Clarify shaders documentation
...
We know people get confused by it. Hopefully this should help.
2024-02-12 15:02:21 +00:00
psi29a
1c2fc59a6f
Merge branch 'water' into 'master'
...
Refraction fog based on water depth
See merge request OpenMW/openmw!3842
2024-02-12 14:13:48 +00:00
psi29a
e9c97b835e
Merge branch 'acertainsign' into 'master'
...
Expose birth signs to Lua
See merge request OpenMW/openmw!3850
2024-02-12 14:11:29 +00:00
psi29a
a060a7297c
Merge branch 'dehardcode-skillprogression' into 'master'
...
Lua: Dehardcode skill and level progression
See merge request OpenMW/openmw!3779
2024-02-12 14:10:51 +00:00
AnyOldName3
5913ca67d5
.ts files, too
2024-02-11 23:53:58 +00:00
BPengu1n
4c136ed7ee
Updated qt localization text for new option
2024-02-11 17:00:45 -06:00
uramer
63a1bbb88d
Enable Lua mouse engine handlers while in UI
2024-02-11 23:49:26 +01:00
uramer
f4fed4ca5f
Simplify inputBinding renderer, allow binding controller buttons
2024-02-11 16:27:54 +01:00
Alexei Kotov
3301ebb2cb
Merge branch 'localize_screenshot' into 'master'
...
Localize screenshot messages
See merge request OpenMW/openmw!3843
2024-02-10 13:54:05 +00:00
Alexei Kotov
d975ed33ab
Merge branch 'lua_fix_move360' into 'master'
...
Lua Fix 360 controller movement
See merge request OpenMW/openmw!3851
2024-02-09 15:42:03 +00:00
Andrei Kortunov
525dee00f1
Refraction fog based on water depth (feature 5926)
2024-02-08 18:07:48 +04:00
Andrei Kortunov
6760fa4945
Localize screenshot messages
2024-02-08 12:50:12 +04:00
Alexei Kotov
6ce9c20d56
Merge branch 'lua_ui_aux' into 'master'
...
Lua deep update and destroy UI helpers
See merge request OpenMW/openmw!3846
2024-02-08 08:26:56 +00:00
Alexei Kotov
6be6f47503
Merge branch 'lua_enchantment_charge_nil' into 'master'
...
Lua Use nil instead of -1 for default enchantment charge
See merge request OpenMW/openmw!3845
2024-02-08 08:25:15 +00:00
Evil Eye
5715e6428a
Merge branch 'lua_separate_owner' into 'master'
...
Group owner bindings into a table
See merge request OpenMW/openmw!3841
2024-02-07 19:06:18 +00:00
Evil Eye
f114d409c8
Add get and set birth sign
2024-02-07 19:35:26 +01:00
uramer
2463633c99
Put camera after playercontrols in load order not to override move360 controls
2024-02-07 18:10:36 +01:00
Evil Eye
f7aa9f8d94
Expose birth signs to Lua
2024-02-07 18:08:06 +01:00
uramer
b1773d7e9f
Use nil instead of -1 for default enchantment charge
2024-02-06 17:30:48 +01:00
uramer
88ce12ecd8
Copy all the luadoc files into resources/lua_api directory
2024-02-06 17:03:29 +01:00
uramer
e7ef49e6df
Deep update and destroy ui helpers
2024-02-06 15:35:04 +01:00
uramer
6792cf02b2
Group owner bindings into a table
2024-02-05 18:48:53 +01:00
Andrei Kortunov
66b2d428c8
Merge branch 'qt_localization' into 'master'
...
Localize Launcher and Wizard
See merge request OpenMW/openmw!3571
2024-02-05 15:11:42 +00:00
uramer
891f3583fe
Only reset settings when there is no game, not on game end / player death
2024-02-04 11:12:12 +01:00
uramer
72136e7e92
Remove debug log
2024-02-04 11:12:12 +01:00
