1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:53:52 +00:00
Commit graph

2897 commits

Author SHA1 Message Date
Dave Corley
fccf75377d FEAT: Add organic/respawning flags to containers 2024-06-28 09:21:44 -05:00
Evil Eye
91bcd0a556 Add a showInDialogue parameter to ui.showMessage and use it for level up messages 2024-06-27 17:16:49 +02:00
Max Yari
13918e3b70 AttackType -> ATTACK_TYPE 2024-06-24 01:15:43 +02:00
Max Yari
88e4ec198d Changed value type in the docs 2024-06-22 00:15:19 +02:00
Max Yari
b01b76b81e Introduced attacktype enum, fixed lua docs 2024-06-21 23:18:48 +02:00
Max Yari
2ef0568dda Changed lua enum name, tweaked docs 2024-06-21 23:18:48 +02:00
Max Yari
70c822d036 Updated lua docs description 2024-06-21 23:18:48 +02:00
Alexei Kotov
348ef6ff2f Update settings-default.cfg light bounds multiplier comment 2024-06-21 20:22:26 +03:00
psi29a
3a686dd8af Merge branch 'lua_travel_dest_2' into 'master'
Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered

See merge request OpenMW/openmw!3592
2024-06-19 21:38:27 +00:00
Zackhasacat
533ce499e0 Expose cell ID, Add actor travel destinations to types.Actor.record.servicesOffered 2024-06-19 21:38:27 +00:00
Kagernac
f7628ff0a8 Code cleanup and documentation
Added documentation in GUI.rst for the new settings

Cleaned up the MR with some remnant changes.
2024-06-19 11:08:05 -07:00
Kindi
ecb07c9bc7 add mwscript.isRunning 2024-06-17 08:05:52 +08:00
psi29a
9523aab18e Merge branch 'objectisinstance(lockable)' into 'master'
Doc: Add objectisinstance to lockable

See merge request OpenMW/openmw!4175
2024-06-15 08:42:24 +00:00
Kindi
cdc77a1d2c add missing objectisinstance to lockable 2024-06-14 12:19:25 +08:00
Alexei Kotov
6ad914919b Remove launcher lighting settings that support runtime changes
Also update lighting method descriptions
2024-06-12 22:44:12 +03:00
Alexei Kotov
ccd36e9413 Support light fade settings in legacy lighting method
This doesn't change launcher descriptions because the launcher settings are going to be omitted
2024-06-12 22:44:12 +03:00
psi29a
cbf0471d8a Merge branch 'launch_button' into 'master'
Set minimum width for Launch OpenMW button

See merge request OpenMW/openmw!4162
2024-06-10 13:51:13 +00:00
psi29a
56183ba982 Merge branch 'ingameppl' into 'master'
Move force per-pixel lighting setting to the in-game settings

See merge request OpenMW/openmw!4137
2024-06-10 13:49:14 +00:00
Andrei Kortunov
fb3687e62a Set minimum width for Launch OpenMW button 2024-06-08 17:20:54 +04:00
Kagernac
7d403089ec Cleaner implementation
Retrieved the Colours straight from Settings

Made tagname clearer in openmw_list.skin.xml

Fixed minor formatting issue in validate.cpp, textcolours.cpp

Updated skin variables to be const and string_view
2024-06-07 18:38:32 -07:00
psi29a
176e6490c5 Merge branch 'stufftheminasack' into 'master'
Drop 360-degree screenshot support (#7720)

Closes #7720

See merge request OpenMW/openmw!4158
2024-06-07 20:50:43 +00:00
psi29a
24d8accee7 Merge branch 'lua_base_disposition_fns' into 'master'
lua - Add [get,set,mod]BaseDisposition functions to npc type

See merge request OpenMW/openmw!4142
2024-06-06 21:44:55 +00:00
Alexei Kotov
93d1c6d7e0 Drop 360-degree screenshot support (#7720) 2024-06-06 14:46:01 +03:00
Kagernac
aca39c919f Changed the tagname to match the values in settings.cfg
Changed the values from int to float in settings.cfg. This is consistent with the older format.

The prefix is no longer referenced and hardcoded. There were four original values in the old color format, the parsing had to be modified to account for floats and four values.
2024-06-05 20:26:45 -07:00
Alexei Kotov
593d4ff714 Move per-pixel lighting to the in-game settings 2024-06-06 05:19:33 +03:00
Sebastian Fieber
ed26708e4d more dry + restrict mutation of disposition to global and on self 2024-06-05 18:09:54 +02:00
Kagernac
3e6ccfce1f Took @Capostrophic's suggestion about leveraging a new tag format
Removed the color settings from Textcolours, they are unneccessary

Removed the Fallback workaround as a dedicated else condition was created with the new tag "fontcolouroptional". This code section has no involvement in Fallback

openmw_list.skin.xml was updated to reflect this new tag

settings.cfg was updated with the updated variable names
2024-06-04 23:14:44 -07:00
psi29a
32dd4a4a68 Merge branch 'windows11_qss' into 'master'
Improve dark mode stylesheets

See merge request OpenMW/openmw!4148
2024-06-04 20:38:46 +00:00
Andrei Kortunov
937101d580 Add a dark style sheet tweaked for Windows 11 2024-06-02 16:58:02 +04:00
Andrei Kortunov
98c0b712f5 Update some lines in Russian translations 2024-06-02 13:55:17 +04:00
Sebastian Fieber
da4531faa0 rename modBaseDisposition to modifyBaseDisposition 2024-05-31 19:39:02 +02:00
Sebastian Fieber
f683adeb14 Add [get,set,mod]BaseDisposition functions to npc type 2024-05-30 00:08:11 +02:00
Joakim Berg
fcc29eeefe duh, found more post processing mistranslations 2024-05-25 18:14:01 +00:00
Joakim Berg
60e8275bb9 Fixed some small translation errors 2024-05-25 18:09:31 +00:00
Alexei Kotov
950d65a382 Merge branch 'rollback_music_interface' into 'master'
Rollback a Muisc interface

See merge request OpenMW/openmw!4129
2024-05-25 15:31:16 +00:00
psi29a
6e0606b55b Merge branch 'paralysisagainagain' into 'master'
Make paralysis cancel camera mode changes (#7997)

Closes #7997

See merge request OpenMW/openmw!4122
2024-05-24 23:06:35 +00:00
psi29a
16572109fc Merge branch 'restoringthelightfacingthedark' into 'master'
Lighting fixes, non-exciting part

See merge request OpenMW/openmw!4126
2024-05-24 23:05:07 +00:00
psi29a
157a5a4489 Merge branch 'l10n' into 'master'
Many localization fixes

See merge request OpenMW/openmw!4108
2024-05-24 17:46:47 +00:00
Andrei Kortunov
aa07dc0312 Rollback a Muisc interface 2024-05-24 10:16:28 +04:00
Alexei Kotov
f87aa02390 Don't clamp individual light contribution in shaders as FFP doesn't do this 2024-05-23 18:06:10 +03:00
psi29a
d15be7a685 Merge branch 'fix-nearest-gui-options' into 'master'
Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI

See merge request OpenMW/openmw!4114
2024-05-23 10:07:42 +00:00
psi29a
db27543ea1 Merge branch 'uniform_choice' into 'master'
Add choice widget type to postprocessing uniforms

See merge request OpenMW/openmw!3969
2024-05-23 10:06:22 +00:00
Alexei Kotov
462818c304 Make paralysis cancel camera mode changes (#7997) 2024-05-23 12:29:10 +03:00
Kagernac
f9577d904c This commit introduces six new color settings for dialogue topic keywords
referencing settings.cfg and settings-default.cfg. These settings work similarly
to the color references found in openmw.cfg and Morrowind.ini.

Changes include:

Removal of deprecated settings:
color topic specific
color topic exhausted
Addition of six new color settings to settings.cfg and settings-default.cfg
Updated description in settings-default.cfg to reflect the new color format
2024-05-22 20:25:58 -07:00
Sam Hellawell
a7991f9988 Update german translation 2024-05-23 04:11:29 +01:00
Sam Hellawell
d3c1aa6653 Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI 2024-05-23 04:11:29 +01:00
psi29a
cd116ebe5f Merge branch 'dark_mode' into 'master'
Support dark mode on Windows

Closes #7985

See merge request OpenMW/openmw!4101
2024-05-20 14:51:20 +00:00
Andrei Kortunov
9f470b45fa Improve size grip appearance 2024-05-20 16:50:25 +04:00
Andrei Kortunov
d1d3a6e631 Make some buttons more noticable in dark mode 2024-05-20 16:50:25 +04:00
Andrei Kortunov
bf682d51a6 Support dark mode on Windows (feature 7985) 2024-05-20 16:50:24 +04:00
Kagernac
02730af391 Changing the skin of the widget seems to be the easiest way to have the choices in the list react to specific conditions and interactions.
Seems that changing the skin modifies some size properties so they had to be reset.

Needed to create a specific skin in order to prevent modifying unintended text.

The exhausted color is not referenced by the settings.cfg, the user will need to modify the color in the skin file.

Edit: Fixed the coding convention issues and converted the tabs into spaces in the .xml. Closed the previous merge request out of confusion, sorry new to Git.
2024-05-19 14:43:41 -07:00
Andrei Kortunov
5a1ec8ce87 Implement Lua-based music 2024-05-19 22:10:54 +04:00
Alexei Kotov
45035413e9 Shorten Swedish am/pm lines to make them less confusing 2024-05-18 08:38:00 +03:00
Alexei Kotov
2aa5c78424 Add Swedish translations for the newly exposed lines 2024-05-18 07:38:05 +03:00
Alexei Kotov
1528522c4d Add French translations for the newly exposed lines
Bump the max width for Prefs page checkbox captions to allow butchering the lines less
2024-05-17 18:31:26 +03:00
Alexei Kotov
f2f9ce343e Add German translations for the newly exposed lines 2024-05-17 13:58:16 +03:00
Alexei Kotov
86ecf3fa0c Make saved game dialog Health and Level lines localizable
Currently providing English, Russian and GMST-based localization.
2024-05-17 05:01:06 +03:00
Alexei Kotov
71dc14cbb2 Use standard quote marks for German OMWControls and OMWCamera
Mystic Cards doesn't provide glyphs for the quote marks Atahualpa used
2024-05-17 04:25:48 +03:00
Alexei Kotov
381ab8e0d2 Unbreak Swedish OMWEngine localization 2024-05-17 03:24:03 +03:00
Alexei Kotov
04989953ad Make rest autosave, crosshair and best attack lines localizable
This includes English, Russian and GMST-based localization for these lines
2024-05-17 02:57:16 +03:00
Alexei Kotov
309201934a Fix Calendar localizations in German, Swedish and Russian
The proper translations for some lines can't come from data/l10n/Calendar variants of the files as these are overridden and aren't included to begin with
Capitalize Dag in Swedish localization
Add all missing lines in Russian localization
Properly supply all localization files
2024-05-17 02:55:56 +03:00
Zackhasacat
c63c1e69cf Lua: Add missing light flags, allow creating light record via world.createRecord 2024-05-13 14:14:44 +00:00
psi29a
f595015ffc Merge branch 'fix-ci-language' into 'master'
Fix CI - missing english launcher translations

See merge request OpenMW/openmw!4092
2024-05-12 08:39:08 +00:00
psi29a
7f54486e80 Merge branch 'doc_has_more_probls' into 'master'
Very minor doc changes

See merge request OpenMW/openmw!4072
2024-05-12 08:38:00 +00:00
Sam Hellawell
4281ea28f6 Fix missing english launcher translations 2024-05-12 05:37:37 +01:00
Zackhasacat
3659890b28 Fix link 2024-05-11 22:21:41 -05:00
psi29a
85ee730b97 Merge branch 'capitalizeonthetimeofdaysystem' into 'master'
Adjust default spellings for English l10n am/pm/day lines

Closes #7969

See merge request OpenMW/openmw!4089
2024-05-11 12:38:27 +00:00
psi29a
ea7555c012 Merge branch 'feature/pplLauncherSetting' into 'master'
added force PPL checkbox

See merge request OpenMW/openmw!3857
2024-05-11 07:45:04 +00:00
psi29a
919d1e366e Merge branch 'staticcollections' into 'master'
Place static collections to the scene and fix item modification record loading

See merge request OpenMW/openmw!4085
2024-05-11 07:43:28 +00:00
Alexei Kotov
37e11df59b Adjust default spellings for English l10n am/pm/day lines 2024-05-10 15:38:34 +03:00
Benjamin Y
553ae5249e fixed ru translation 2024-05-10 06:47:23 -05:00
psi29a
ef93c01a44 Merge branch 'overlapremnants' into 'master'
Remove some more remnants of 'allow shadow map overlap'

See merge request OpenMW/openmw!4083
2024-05-10 11:30:00 +00:00
Zackhasacat
0e1678b3b8 Merge branch 'mwdialogue-bindings' into 'master'
Add Lua bindings for ESM::Dialogue record stores to openmw.core

Closes #7964

See merge request OpenMW/openmw!4034
2024-05-09 23:22:03 +00:00
Alexei Kotov
7d979a2dfc Place ESM4 static collections to the scene 2024-05-09 17:26:27 +03:00
Alexei Kotov
5aa67abe47 Remove some more remnants of 'allow shadow map overlap' 2024-05-09 00:31:11 +03:00
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