1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-06 18:40:23 +00:00

16769 Commits

Author SHA1 Message Date
Alexei Kotov
e369ab941e Fix word-wrapping for dialogue topics with changed skin 2024-09-19 04:54:12 +03: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
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
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
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
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
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
Zackhasacat
c63c1e69cf Lua: Add missing light flags, allow creating light record via world.createRecord 2024-05-13 14:14:44 +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
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
elsid
26233e082d
Optimize iteration over dialogue records 2024-05-10 10:38:18 +02: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
29b25ffb26 Formatting 2024-05-09 17:52:34 +03:00
elsid
bad935ff34
Make a check for disabled parent recursive 2024-05-09 16:38:30 +02:00
Alexei Kotov
fd4d3b8a27 Fix item mod record loading 2024-05-09 17:29:47 +03:00
Alexei Kotov
7d979a2dfc Place ESM4 static collections to the scene 2024-05-09 17:26:27 +03:00
Alexei Kotov
c95bb4ce59 Merge branch 'split_esm_headers' into 'master'
Split ESM headers

See merge request OpenMW/openmw!4071
2024-05-07 11:57:32 +00:00
trav
fc6695a918 Merge branch openmw:master into mwdialogue-bindings 2024-05-06 18:27:19 +00:00
trav
512b7e46e5 Merge branch openmw:master into mwdialogue-bindings 2024-05-04 14:35:31 +00:00
elsid
f83d388391
Iterate over smaller container when removing blacklisted refs 2024-05-04 13:22:32 +02:00
elsid
a920ca9070
Report loading screens to osg stats 2024-05-04 13:22:32 +02:00
Hristos N. Triantafillou
63a27bbf99 Expose Wander option values to the Lua API (#7916) 2024-05-03 09:40:30 +00:00
elsid
01166b1f26
Split ESM headers 2024-05-03 01:55:20 +02: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
2cdfaa69b3 ESM::Dialogue Lua bindings: Fixes in speaker faction and DialogueRecordInfo docs [correction] 2024-04-30 21:46:20 +02:00
trav5
9743276332 ESM::Dialogue Lua bindings: Fixes in speaker faction and DialogueRecordInfo docs 2024-04-30 21:37:56 +02:00
psi29a
bb89717886 Merge branch 'droppinglikeflies' into 'master'
Fix Drop behavior for creatures that don't have an inventory

See merge request OpenMW/openmw!4063
2024-04-30 08:18:22 +00:00
elsid
404940b6e0
Make sure proper number of cells is preloaded
Limit the number of exterior cells around a cell to be preloded based on current
and max cache size not just max cache size. Avoid doing break from inner loop
only.

Log when truncation happens but only once during process lifetime to warn a user.
2024-04-29 02:03:32 +02:00
elsid
2220868fa9
Preload surrounding exterior cells for the teleport door destination
When player teleports to the exterior cell, multiple cells are loaded not only
the target so better to have them preloaded too.
2024-04-29 01:02:49 +02:00
Alexei Kotov
cc4b2e5c58 Fix Drop behavior for creatures that don't have an inventory 2024-04-28 20:07:37 +03:00
psi29a
5b25435260 Merge branch 'fix_osg_stats_report' into 'master'
Report osg stats for frames with loading screens (#7737)

Closes #7737

See merge request OpenMW/openmw!4053
2024-04-28 14:16:41 +00:00
psi29a
1e1fd28136 Merge branch 'fix_anim_state' into 'master'
Fix AnimState initialization

See merge request OpenMW/openmw!4061
2024-04-28 13:14:44 +00:00
psi29a
24fca82f2c Merge branch 'faction_relations' into 'master'
Take in account faction reaction changes

See merge request OpenMW/openmw!4015
2024-04-28 13:05:13 +00:00
trav
c6807465f6 Merge branch openmw:master into mwdialogue-bindings 2024-04-28 10:34:21 +00:00
trav5
0aae0299af ESM::Dialogue Lua bindings: Several post-review fixes 2024-04-28 12:32:56 +02:00
jvoisin
3e63b507d4 Merge branch 'fix_physics_crash' into 'master'
Fix crash in physics worker on removing object (#7950)

Closes #7950

See merge request OpenMW/openmw!4057
2024-04-28 00:25:43 +00:00
trav5
421cf40508 ESM::Dialogue Lua bindings: ref in DialogueInfos 2024-04-27 21:56:22 +02:00
trav5
52e1f32c88 Important change, https://godbolt.org/z/YjjaaqYsc 2024-04-27 21:38:20 +02:00
trav5
897e43ae1e Less complex "index" and "at" 2024-04-27 15:22:19 +02:00
trav5
b9358521cc Better return values 2024-04-27 15:02:45 +02:00
elsid
9d2f132aa7
Fix AnimState initialization
Remove redundant user defined constructor and destructor, make sure all members
are properly initialized including mTime (new float does not initialize the
float).
2024-04-27 14:47:23 +02:00