1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 03:29:55 +00:00
Commit graph

34157 commits

Author SHA1 Message Date
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
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
Evil Eye
c3d02c0b41 Merge branch 'cleanup_dialogue_api' into 'master'
Cleanup dialogue API

See merge request OpenMW/openmw!4088
2024-05-17 15:02:00 +00:00
psi29a
42db5f4386 Merge branch 'fix_menu_timers' into 'master'
Process menu script timers

See merge request OpenMW/openmw!4103
2024-05-17 08:54:43 +00:00
Alexei Kotov
7ceaa6424b Merge branch 'fix7970-remove-removed-spells-on-rest' into 'master'
Magic effects are updated once before applying when resting

Closes #7970

See merge request OpenMW/openmw!4096
2024-05-16 21:47:43 +00:00
trav5
3f26a6c5a0 Merge branch 'master' of https://gitlab.com/OpenMW/openmw into fix7970-remove-removed-spells-on-rest 2024-05-16 20:14:09 +02:00
psi29a
4a3dbb5a80 Merge branch 'default_colors' into 'master'
Change default colors in script editor to support dark themes

See merge request OpenMW/openmw!4097
2024-05-16 11:19:24 +00:00
psi29a
9b31ecc10e Merge branch 'bufferer_log' into 'master'
Write to log file records captured before configs are loaded

See merge request OpenMW/openmw!4095
2024-05-16 11:17:25 +00:00
psi29a
991f887de2 Merge branch 'fix/7562-mouse-position' into 'master'
fix(openmw): MacOS Scaling Bugs

See merge request OpenMW/openmw!3963
2024-05-16 11:15:03 +00:00
Dylan
91a771f851 fix(openmw): MacOS Scaling Bugs 2024-05-16 11:15:02 +00:00
jvoisin
cff0a26132 Merge branch 'paralysisagain' into 'master'
Don't update head animation if the animation is paused (#7980)

Closes #7980

See merge request OpenMW/openmw!4099
2024-05-16 03:13:45 +00:00
uramer
a662198903 Process menu script timers 2024-05-15 21:07:23 +02:00
Alexei Kotov
195599c13c Don't update head animation if the animation is paused (#7980) 2024-05-15 01:38:32 +03:00
Andrei Kortunov
dca452aaca Change default colors in script editor to support dark themes 2024-05-14 13:59:19 +04:00
psi29a
2bed7450b6 Merge branch 'style_change' into 'master'
Minor changes in Qt styles handling

See merge request OpenMW/openmw!4093
2024-05-14 07:43:55 +00:00
psi29a
811236bfe1 Merge branch 'dealingwithkf' into 'master'
Parse all official Oblivion, Fallout 3 and New Vegas KF files

See merge request OpenMW/openmw!4094
2024-05-14 07:43:39 +00:00
trav5
238d68b691 Magic effects are updated once before applying when resting
Fixing #7970.
When the player was resting, all their magic effects were applied throughout
the rest duration, including the effects for already removed spells, which
were applied once more before removal.
This commit calls an update before that applying, so that these removed
spells are executed and removed and only then the real duration-long
execution of remaining magic effects takes place.
2024-05-13 21:41:41 +02:00
psi29a
88bd898e6b Merge branch 'lua_lighting' into 'master'
Lua: Add missing light flags, allow creating light record via world.createRecord

See merge request OpenMW/openmw!3488
2024-05-13 14:14:44 +00:00
Zackhasacat
c63c1e69cf Lua: Add missing light flags, allow creating light record via world.createRecord 2024-05-13 14:14:44 +00:00
elsid
38f0533bcf
Write to log file records captured before configs are loaded 2024-05-13 01:17:26 +02:00
elsid
4ab5871dc4
Split Tee logic into different types 2024-05-13 01:17:24 +02:00
Alexei Kotov
1d96c0adbf Read BSTreadTransfInterpolator 2024-05-13 01:20:23 +03:00
Alexei Kotov
5f4a0c3bf1 Read BSAnimNote/BSAnimNotes 2024-05-13 01:12:09 +03:00
Alexei Kotov
c5a11f0c9f Read BSRotAccumTransfInterpolator 2024-05-13 00:49:10 +03:00
Alexei Kotov
c647374c0d Add compact B-Spline interpolators 2024-05-13 00:36:10 +03:00
Alexei Kotov
d458c07b36 Add base typed B-Spline interpolators 2024-05-13 00:20:32 +03:00
Alexei Kotov
5c6fca14c1 Read NiBSplineData/NiBSplineBasisData 2024-05-12 23:58:05 +03:00
Andrei Kortunov
bf568da6de Remove redundant checks 2024-05-12 17:26:18 +04:00
Andrei Kortunov
0262b33067 Update toolbar style sheet when theme changed 2024-05-12 17:26:14 +04:00
Andrei Kortunov
d5bbd75828 Make sure that Open button becomes focused after enabling 2024-05-12 17:26:14 +04:00
Andrei Kortunov
b0930158df Use an auto raise mode to disable the border 2024-05-12 17:26:14 +04:00
Andrei Kortunov
e7d566eb2e Remove border from status bar 2024-05-12 17:26:10 +04:00
Andrei Kortunov
abd4596cf8 Do not use style sheets to set font 2024-05-12 15:34:33 +04: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
5875869484 Alphebetize list 2024-05-11 22:25:56 -05: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
psi29a
3e8442e749 Merge branch 'fix_build' into 'master'
Add missing include (#7967)

Closes #7967

See merge request OpenMW/openmw!4087
2024-05-11 07:42:55 +00:00
psi29a
1cde82201e Merge branch 'optimize_merge_geometry' into 'master'
Optimize geometry merging

See merge request OpenMW/openmw!4086
2024-05-11 07:40:53 +00:00
elsid
35f5c8cd15
Add missing includes 2024-05-10 23:27:21 +02:00
jvoisin
c9890fbd4f Merge branch 'fix_disabled_esm4' into 'master'
Make a check for disabled parent recursive

See merge request OpenMW/openmw!4084
2024-05-10 20:13:47 +00:00
psi29a
2f8e3611fb Merge branch 'issue-7924-envvar-crashdump' into 'master'
components/crashcatcher: if OPENMW_FULL_MEMDUMP is set, generate a full memory crashdump

See merge request OpenMW/openmw!4078
2024-05-10 13:43:23 +00:00
Alexei Kotov
37e11df59b Adjust default spellings for English l10n am/pm/day lines 2024-05-10 15:38:34 +03:00