Andrei Kortunov
118114c498
Add misisng empty line
2024-04-17 09:04:17 +04: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
jvoisin
b574155a0b
Merge branch 'av_raii' into 'master'
...
Use RAII for ffmpeg pointers
See merge request OpenMW/openmw!4030
2024-04-16 19:20:24 +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
psi29a
ef97c63296
Merge branch 'sv-calendar-2024-04-15' into 'master'
...
Swedish calendar translation
See merge request OpenMW/openmw!4033
2024-04-16 08:49:12 +00:00
psi29a
e633d2bfd4
Merge branch 'unsubscribe' into 'master'
...
Deregister the player before loading a new one
See merge request OpenMW/openmw!4018
2024-04-16 08:48:48 +00:00
Alexei Kotov
d8f19c6e7b
Changelog (two-channel normal maps, #7932 )
2024-04-16 03:29:56 +03:00
Alexei Kotov
443e341ae7
Generalize unsized pixel format computation
2024-04-16 02:52:25 +03:00
elsid
f184d8f390
Use RAII for AVIOContext, AVFormatContext, AVCodecContext and AVFrame pointers
2024-04-15 20:24:03 +02: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
3c0c1717a9
Fix red-green normal map handling for terrain
2024-04-15 12:02:52 +03:00
Alexei Kotov
cf6b95ae7c
Document some technical details regarding normal-mapping
2024-04-15 12:02:52 +03: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
Evil Eye
0fa4b0137a
Merge branch 'mattengarde' into 'master'
...
Improve hit detection emulation (#7900 )
Closes #7900
See merge request OpenMW/openmw!3984
2024-04-14 07:50:34 +00: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
Alexei Kotov
86b6eee62b
Improve hit detection emulation ( #7900 )
2024-04-13 01:34:00 +03:00
Alexei Kotov
55c5f2112b
Merge branch 'alignyorefs' into 'master'
...
Reorder RefData members to decrease its size
See merge request OpenMW/openmw!4020
2024-04-12 21:18:24 +00:00
psi29a
bdbbe34afc
Merge branch 'pushthefatman' into 'master'
...
Animation regression fixes
See merge request OpenMW/openmw!4001
2024-04-12 15:02:39 +00:00
psi29a
2f9e071178
Merge branch 'launcher-wizard-localisation-fr' into 'master'
...
Launcher and Wizard french localisation
See merge request OpenMW/openmw!4013
2024-04-12 15:01:59 +00:00
Arnaud Dochain
b34dac1a27
Launcher and Wizard french localisation
2024-04-12 15:01:59 +00:00
psi29a
f9e957ea0e
Merge branch 'esm4scvr' into 'master'
...
ESM4: Make script local variable loading more reliable
See merge request OpenMW/openmw!3967
2024-04-12 15:01:46 +00:00
Evil Eye
cb92d34ddd
Reorder RefData members to decrease its size
2024-04-11 17:04:55 +02:00
psi29a
c6921d5292
Merge branch 'notarget' into 'master'
...
Don't run target-specific spell infliction code when there's no target (#7926 )
Closes #7926
See merge request OpenMW/openmw!4019
2024-04-11 09:10:23 +00:00
Alexei Kotov
8751203849
Don't run target-specific spell infliction code when there's no target ( #7926 )
2024-04-10 22:24:22 +03:00
Evil Eye
2f6acbd7da
Deregister the player before loading a new one
2024-04-10 21:16:22 +02: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
49b974763f
Merge branch 'imthefactornow' into 'master'
...
Don't show nameless higher ranks
Closes #7923
See merge request OpenMW/openmw!4014
2024-04-10 09:52:03 +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
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
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
