1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-07 01:15:36 +00:00
Commit graph

2739 commits

Author SHA1 Message Date
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
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
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
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
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