Zackhasacat
8cd488b91f
Add hidden to faction docs
2024-05-07 16:01:05 -05:00
Zackhasacat
921ee8ffe6
Merge branch 'master' of gitlab.com:openmw/openmw into doc_has_more_probls
2024-05-07 15:57:30 -05:00
Alexei Kotov
b9069835b2
Merge branch 'scriptedit' into 'master'
...
Improve appearance of script editor in the OpenMW-CS
See merge request OpenMW/openmw!4076
2024-05-07 13:22:58 +00:00
trav
fc6695a918
Merge branch openmw:master into mwdialogue-bindings
2024-05-06 18:27:19 +00:00
Andrei Kortunov
b56c255be2
Improve appearance of script editor in the OpenMW-CS
2024-05-06 12:22:30 +04:00
psi29a
2e971ec2e3
Merge branch 'appropriateammunition' into 'master'
...
Adjust Russian appropriate ammunition setting label/description
See merge request OpenMW/openmw!4062
2024-05-05 20:19:45 +00:00
trav
512b7e46e5
Merge branch openmw:master into mwdialogue-bindings
2024-05-04 14:35:31 +00:00
Alexei Kotov
bee875e54d
Adjust Russian appropriate ammunition setting label/description
2024-05-04 10:14:07 +03:00
Zackhasacat
112dfcaf8c
Some fixes, and a broken change
2024-05-03 18:49:14 -05:00
Hristos N. Triantafillou
686fdb057d
Idle is optional and could be nil
2024-05-03 15:21:48 -05:00
Zackhasacat
d150a6611d
Minor doc changes
2024-05-03 11:59:43 -05:00
psi29a
739ff70a82
Merge branch 'ai-exposed' into 'master'
...
Expose Wander option values to the Lua API (#7916 )
See merge request OpenMW/openmw!4006
2024-05-03 09:40:30 +00:00
Hristos N. Triantafillou
63a27bbf99
Expose Wander option values to the Lua API ( #7916 )
2024-05-03 09:40:30 +00:00
psi29a
becc832b15
Merge branch 'attenuation' into 'master'
...
Deobfuscate lighting illumination calculation
See merge request OpenMW/openmw!4068
2024-05-03 09:39:06 +00:00
Alexei Kotov
50ab6c71c3
Merge branch 'english_translations' into 'master'
...
Add English translation files for Qt
Closes #7948
See merge request OpenMW/openmw!4066
2024-05-03 04:51:18 +00:00
trav5
0e03b9bd32
ESM::Dialogue Lua bindings: filterActorGender returns string
2024-05-01 13:14:59 +02:00
trav5
9001ed1e2f
ESM::Dialogue Lua bindings: rank filters start from 1 and filterActorCell->filterPlayerCell
2024-05-01 12:33:25 +02:00
trav5
9743276332
ESM::Dialogue Lua bindings: Fixes in speaker faction and DialogueRecordInfo docs
2024-04-30 21:37:56 +02:00
Alexei Kotov
6b90d7f1da
Deobfuscate lighting illumination calculation
2024-04-30 16:57:32 +03:00
psi29a
a57c350c08
Merge branch 'paint_svg' into 'master'
...
Change SVG icons color in the editor
See merge request OpenMW/openmw!4060
2024-04-30 08:19:51 +00:00
Andrei Kortunov
f69ab506b2
Add English translation files for Qt
2024-04-29 11:58:32 +04:00
Benjamin Y
954f08c2ff
removed unfinished type
2024-04-28 10:01:08 -05:00
psi29a
8204d1962b
Apply 1 suggestion(s) to 1 file(s)
...
Co-authored-by: Joakim Berg <zapp90@gmail.com>
2024-04-28 13:07:13 +00:00
psi29a
e2a299e0d0
Apply 1 suggestion(s) to 1 file(s)
...
Co-authored-by: Joakim Berg <zapp90@gmail.com>
2024-04-28 13:07:03 +00:00
trav
c6807465f6
Merge branch openmw:master into mwdialogue-bindings
2024-04-28 10:34:21 +00:00
jvoisin
b770577623
Merge branch 'sayyestoshadowmapoverlap' into 'master'
...
Remove allow shadow map overlap setting (#7939 )
Closes #7939
See merge request OpenMW/openmw!4056
2024-04-28 00:19:27 +00:00
trav5
b9358521cc
Better return values
2024-04-27 15:02:45 +02:00
trav5
4449b66846
Operators and retting rid of 'records'
2024-04-27 13:44:08 +02:00
Andrei Kortunov
070327a259
Change SVG color in the editor
2024-04-27 09:57:47 +04:00
trav
a0989c3481
Merge branch openmw:master into mwdialogue-bindings
2024-04-26 19:21:28 +00:00
bwyunker
a52653858c
another fix
2024-04-26 14:07:15 -05:00
bwyunker
da63b8bb38
couple more fixes
2024-04-26 13:52:00 -05:00
Benjamin Y
ccd0052f8d
fixed escapes
2024-04-26 12:52:33 -05:00
bwyunker
87266ff63c
added FR translation
2024-04-26 11:52:44 -05:00
Alexei Kotov
f0e4793321
Remove allow shadow map overlap setting ( #7939 )
2024-04-26 13:50:03 +03:00
Alexei Kotov
55642650ea
Merge branch 'bad_record_docs' into 'master'
...
Correct record store documentation errors
See merge request OpenMW/openmw!4054
2024-04-26 09:49:23 +00:00
Benjamin Y
d62fb92b5b
Fixed capitalization
2024-04-25 10:09:48 -05:00
Benjamin Y
3146015a00
Fixed Label Capitalization
2024-04-25 09:42:35 -05:00
Benjamin Y
89ad315f65
Merge branch 'feature/pplLauncherSetting' of git@gitlab.com:BPengu1n/openmw.git
2024-04-25 09:31:06 -05:00
Benjamin Y
3ad8b57a60
updated RU label
2024-04-25 09:30:59 -05:00
psi29a
ec8675ba6f
Merge branch 'scalable_launcher' into 'master'
...
Improve launcher appearance
See merge request OpenMW/openmw!4051
2024-04-25 08:46:29 +00:00
psi29a
3980bb15cc
Merge branch 'lua_controller_cursor' into 'master'
...
Add lua bindings for controller cursor mode
See merge request OpenMW/openmw!3623
2024-04-25 08:45:57 +00:00
Zackhasacat
575fb4e637
Correct docs
2024-04-24 17:53:26 -05:00
trav
0986b103c5
Merge branch openmw:master into mwdialogue-bindings
2024-04-24 21:06:58 +00:00
trav5
223e315fdb
ESM::Dialogue Lua bindings quest change and docs
2024-04-24 21:17:26 +02:00
bwyunker
dff36b04c3
updated launcher_sv with unfinished entry
2024-04-24 10:07:39 -05:00
bwyunker
563f5b37a3
Merge branch 'master' into feature/pplLauncherSetting
2024-04-24 10:04:31 -05:00
Andrei Kortunov
d97838def1
Improve launcher appearance
2024-04-23 12:28:37 +04:00
Andrei Kortunov
0873eb6e62
Use scalable icons for wizard
2024-04-23 11:49:33 +04:00
Andrei Kortunov
1bb48bcef7
Treat editor icons as scalable
2024-04-21 20:56:06 +04:00
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
