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
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
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
