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

22782 commits

Author SHA1 Message Date
Dave Corley
b7deb7e9bc Feat(CS): Make LMB the primary interaction 2024-06-12 19:36:55 -05:00
Alexei Kotov
d226b72592 Throw on invalid bone group indices in getActiveGroup 2024-06-12 23:26:16 +03: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
Evil Eye
fbc6629d40 Rework land texture handling 2024-06-12 17:09:28 +02:00
Alexei Kotov
5c6fbc332f Fix endif conditions in cmake 2024-06-12 15:43:04 +03:00
Alexei Kotov
65a9f78943 Fix flags used in terrain saving/loading tests 2024-06-12 12:50:20 +03:00
psi29a
c1d74763ed Merge branch 'i-have-no-land-and-i-must-scream' into 'master'
Fix(CS): Add landscape flag if it doesn't exist at all and improve landscape QOL

Closes #7707

See merge request OpenMW/openmw!3617
2024-06-11 11:10:33 +00:00
psi29a
61772fa234 Merge branch 'verifiers' into 'master'
Complain about fishy local variable names, improve editor effect list handling

See merge request OpenMW/openmw!4160
2024-06-11 11:10:19 +00:00
psi29a
0a7f4e5149 Merge branch 'unit_tests' into 'master'
Split openmw_test_suite into openmw and components tests

See merge request OpenMW/openmw!4166
2024-06-11 11:09:43 +00:00
elsid
1e98cc6c3b
Move EXPECT_ERROR macro to a separate header
To include it only where it's required.
2024-06-10 23:12:15 +02:00
elsid
7d1cd11ba9
Split openmw_test_suite into openmw and components tests
To avoid duplicated compilation for openmw translation units. Link openmw-lib to
openmw-tests instead.
2024-06-10 23:12:14 +02:00
elsid
9b0362fba8
Split openmw into binary and library
To make it possible to create a new binary for the tests by linking this
library to it.

Rename openmw-lib into openmw to have libopenmw.a on Linux. Do not rename it on
Windows to avoid conflict with automatically generated lib for exe due to
__declspec(dllexport) presence.
2024-06-10 23:11:34 +02:00
elsid
2e0e0f53b6
Add --coverage to openmw-cs 2024-06-10 23:04:01 +02:00
Evil Eye
965bc20bab Set mPluginIndex to -1 for textures defined in this plugin 2024-06-10 21:39:10 +02:00
Evil Eye
ed5bedb9db Use record state to determine if a LandTexture record was defined in the current plugin 2024-06-10 21:39:10 +02: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
3ef4180464 Merge branch 'soulless' into 'master'
Properly copy items between containers

See merge request OpenMW/openmw!4139
2024-06-10 13:49:51 +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
Dave Corley
659874cb65 FEAT: Update land flag representation in ESMTool 2024-06-10 02:03:02 -05:00
Dave Corley
145f9c1154 CLEANUP(CS): Do heightData check in actual implementation, revert
accidental change to land condition order
2024-06-10 02:02:31 -05:00
Dave Corley
86316fa7ab Fix(cell.cpp): Don't try to update land for interiors 2024-06-10 02:02:31 -05:00
Dave Corley
10eb807e72 Fix(Cell.hpp): Correct include path for document 2024-06-10 02:02:31 -05:00
Dave Corley
0a8fee59dd Don't store member variables from document & use simpler and safer
inputs to cell constructor. Explicitly tell the constructor whether land
should be loaded or not
2024-06-10 02:02:31 -05:00
Dave Corley
47044e1dc0 Cleanup(CS): re-add const for land collection 2024-06-10 02:02:31 -05:00
Dave Corley
89bce6f678 Fix(CS): Enum name in accordance with current standards 2024-06-10 02:02:31 -05:00
Dave Corley
6f2ae4a33b Cleanup(CS): Improve readability and clean up some implementations 2024-06-10 02:02:31 -05:00
Dave Corley
ad135e3b95 Fix(cell.cpp): Change commands.hpp to absolute include path 2024-06-10 02:02:31 -05:00
Dave Corley
d8187e40b2 Feat(CS): Create LAND record using the undo stack 2024-06-10 02:02:31 -05:00
Dave Corley
731302ecff Feat(CS): Add undo stack as a member of CSVRender::Cell 2024-06-10 02:02:31 -05:00
Dave Corley
f565730a9a Fix(cell.cpp): never try to update land for interiors 2024-06-10 01:58:34 -05:00
Dave Corley
dd7a2f22d1 Cleanup(CSVRender::Cell:updateLand): Early exit when landscape should
not be loaded
2024-06-10 01:58:34 -05:00
Dave Corley
78fd135764 Fix(CS): Remove unreachable code as land data will always be present 2024-06-10 01:58:34 -05:00
Dave Corley
3e7335ddc7 Fix(CS): Initialize landscape when opening an existing cell without VHGT 2024-06-10 01:58:34 -05:00
Dave Corley
2541b74fc6 Fix(CS): Apply land flags when appropriate edits are made 2024-06-10 01:58:34 -05:00
elsid
6ba42314df
Fix Ptr::toString 2024-06-09 04:08:18 +02:00
Andrei Kortunov
fb3687e62a Set minimum width for Launch OpenMW button 2024-06-08 17:20:54 +04:00
Alexei Kotov
dd0ff13ba9 Reset attribute/skill arguments in IngredEffectRefIdAdapter if needed 2024-06-08 13:50:40 +03:00
Alexei Kotov
3051e0834a Accept invalid effect IDs and ranges in EffectsListAdapter 2024-06-08 13:49:39 +03:00
psi29a
9087de1596 Merge branch 'esm3_land' into 'master'
Add unit tests for saving and loading ESM3 Land

See merge request OpenMW/openmw!4159
2024-06-08 10:47:58 +00:00
Alexei Kotov
252ee7f8c4 Deduplicate effect list verification
Drop Potion-specific range check, it's irrelevant
2024-06-08 06:31:18 +03:00
Alexei Kotov
ba20ba2c6c Editor: Warn if a magic effect's max magnitude is zero 2024-06-08 06:31:18 +03:00
Alexei Kotov
2fdbd6287d Editor: Verify magic effects for enchantments, ingredients and potions
Use constants for known magic effect/skill/attribute range
2024-06-08 06:31:17 +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
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
a80f5c109c Merge branch 'ltexerasure' into 'master'
Fix LTEX overriding and allow deletion

See merge request OpenMW/openmw!4152
2024-06-07 08:05:56 +00:00
elsid
044748725c
Add unit tests for saving and loading ESM3 Land 2024-06-07 00:22:24 +02: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
Mads Buvik Sandvei
e063fa5b23 rename template_ to templatePtr 2024-06-06 16:51:51 +02:00
Alexei Kotov
93d1c6d7e0 Drop 360-degree screenshot support (#7720) 2024-06-06 14:46:01 +03:00
Mads Buvik Sandvei
90b415a8dd comments by elsid 2024-06-06 11:20:14 +02:00
Alexei Kotov
593d4ff714 Move per-pixel lighting to the in-game settings 2024-06-06 05:19:33 +03:00
psi29a
ee5ccaa760 Merge branch 'setangleaxis' into 'master'
Fix SetAngle alternative axis order

See merge request OpenMW/openmw!4155
2024-06-05 21:00:15 +00:00
Evil Eye
330f5de78d Rename ot mStatic 2024-06-05 21:48:07 +02:00
Sebastian Fieber
ed26708e4d more dry + restrict mutation of disposition to global and on self 2024-06-05 18:09:54 +02:00
Alexei Kotov
32ca57c9ad Merge branch 'unify_operation_bars' into 'master'
Unify operation progress bar appearance

See merge request OpenMW/openmw!4154
2024-06-05 11:31:27 +00: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
8f3625b6a8 Merge branch 'cleanup_object_paging' into 'master'
Cleanup object paging

See merge request OpenMW/openmw!4149
2024-06-04 20:39:37 +00:00
jvoisin
c7f3277744 Merge branch 'waterfiltering' into 'master'
Apply filtering settings to water normal map

See merge request OpenMW/openmw!4151
2024-06-04 16:37:52 +00:00
Alexei Kotov
4a394a391b Fix SetAngle alternative axis order 2024-06-04 18:44:55 +03:00
Andrei Kortunov
eac2082e82 Unify operation progress bar appearance 2024-06-04 11:07:08 +04:00
Alexei Kotov
56b31d87e3 Merge branch 'soundfixes' into 'master'
Follow-up work for Lua-based music

See merge request OpenMW/openmw!4146
2024-06-03 22:03:04 +00:00
Evil Eye
ca6baed366 Fix LTEX overriding and allow deletion 2024-06-03 16:42:27 +02:00
Alexei Kotov
c7e98fdb45 Apply filtering settings to water normal map 2024-06-03 11:12:29 +03:00
elsid
2169e22e93
Move key when inserting item to mLODNameCache 2024-06-02 13:16:22 +02:00
elsid
6e3fd34790
Calculate floor and ceil of bounds once 2024-06-02 13:16:22 +02:00
elsid
3790e97184
Clarify scope and constness of the variables 2024-06-02 13:16:22 +02:00
elsid
d9d8802f3a
Move node when inserting into a nodes map 2024-06-02 13:16:22 +02:00
elsid
aecdf04705
Use custom struct for CellRef used by object paging
ESM::CellRef is too heavy. There is no need to have all the data from there.
2024-06-02 13:16:21 +02:00
elsid
0040409a4d
Move collectESM3References to unnamed namespace 2024-06-02 13:16:21 +02:00
elsid
524af5b723
Move symbols not defined in header to unnamed namespace 2024-06-02 13:16:20 +02:00
Andrei Kortunov
7b5146e824 Do not allow Lua's "stopMusic" to interrupt MWScript's music 2024-06-02 13:18:06 +04:00
Andrei Kortunov
402e725d87 Reset music type to Normal when we are done to scripted music 2024-06-02 09:44:41 +04:00
Andrei Kortunov
e762ae9703 Move current music from MechanicsManager to SoundManager 2024-06-02 09:29:28 +04:00
psi29a
05815b3952 Merge branch 'settingswindow' into 'master'
Hide the settings window when any main menu button is pressed

See merge request OpenMW/openmw!4136
2024-06-01 15:31:56 +00:00
Mads Buvik Sandvei
a1b695a8d5 De-duplicate ManualRef constructor 2024-05-31 23:10:54 +02: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
Mads Buvik Sandvei
ae4bf04798 Fix soul gems losing their souls when splitting stacks between containers. 2024-05-28 23:35:44 +02:00
elsid
6218afa484
Cleanup object paging includes 2024-05-28 22:21:15 +02:00
elsid
b5a75ba96c
Use std::vector to collect ChunkIds to be removed
Cache does not have duplicated entries.
2024-05-28 22:21:15 +02:00
elsid
b64069156d
Convert position on construction 2024-05-28 22:21:15 +02:00
elsid
33ef7fc8ca
Make ClearCacheFunctor a class and rename to clarify the purpose 2024-05-28 22:21:14 +02:00
psi29a
e7c9574d31 Merge branch 'savetheslot' into 'master'
Convert constant effect equipment slots to refnums

Closes #7998

See merge request OpenMW/openmw!4130
2024-05-28 11:09:36 +00:00
psi29a
8cf6fde8b6 Merge branch 'fix_debug_render' into 'master'
Fix debug render for recast mesh and navmesh

See merge request OpenMW/openmw!4127
2024-05-28 07:38:00 +00:00
psi29a
af4adf41d0 Merge branch 'saveyourvanityforsomeonewhocares' into 'master'
Toggle the vanity camera off before toggling to the saved camera mode

Closes #7960

See merge request OpenMW/openmw!4135
2024-05-28 07:37:44 +00:00
psi29a
4ae29b0042 Merge branch 'log_exceptions' into 'master'
Log caught exceptions

See merge request OpenMW/openmw!4131
2024-05-28 07:36:30 +00:00
Alexei Kotov
340783e3a1 Merge branch 'modernprometheus' into 'master'
Make torches held by creatures emit light

Closes #8002

See merge request OpenMW/openmw!4134
2024-05-27 18:19:58 +00:00
Andrei Kortunov
204267d211 React to scale or color changes in editor tables 2024-05-27 18:38:33 +04:00
Alexei Kotov
131bb510e4 Merge branch 'operation_fixes' into 'master'
Improve operations widget formatting, part 2

See merge request OpenMW/openmw!4119
2024-05-27 01:07:07 +00:00
Alexei Kotov
7274d825a3 Hide the settings window when any main menu button is pressed 2024-05-26 23:49:52 +03:00
Evil Eye
9027af426b Toggle the vanity camera off before toggling to the saved camera mode 2024-05-26 11:35:13 +02:00
Evil Eye
a7026ae3e9 Make torches held by creatures emit light 2024-05-26 09:52:50 +02:00
elsid
71369be796
Log caught exceptions 2024-05-26 02:52:11 +02:00
Andrei Kortunov
2749d2a6cb Revert "Make sure that Open button becomes focused after enabling"
This reverts commit d5bbd75828.
2024-05-25 23:43:19 +04:00
Evil Eye
11e8e1eeb5 Include creatures 2024-05-25 09:58:46 +02:00
psi29a
62930cb8db Merge branch 'fix_archives_selection' into 'master'
Fix archive selection when switching profiles (#7956)

See merge request OpenMW/openmw!4118
2024-05-24 23:06:55 +00:00
Yury Stepovikov
80d2b289e7 Fix archive selection when switching profiles (#7956) 2024-05-24 23:06:55 +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
c8567e96fd Merge branch 'itsover32767' into 'master'
Use more appropriate types in terrain storage

See merge request OpenMW/openmw!4125
2024-05-24 21:56:20 +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
Evil Eye
cdfd305ac3 Convert constant effect equipment slots to refnums 2024-05-24 16:59:48 +02:00
elsid
d6af9305ae
Exclude debug rendering from toggleworld 2024-05-24 01:08:15 +02:00
elsid
4b8897e33e
Use state sets without transparency support for recast mesh and agents paths 2024-05-24 00:05:10 +02:00
elsid
98d530d8cb
Share state sets for recast mesh tiles and actors paths 2024-05-24 00:05:09 +02:00
Evil Eye
6a10311ae5 Use more appropriate types in terrain storage 2024-05-23 18:48:54 +02: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
psi29a
b0aa19dc07 Merge branch 'msvc_crash_fix' into 'master'
Avoid MSVC crash in Visual Studio 17.10.0

See merge request OpenMW/openmw!4116
2024-05-23 10:05:52 +00:00
Alexei Kotov
ae7861abe4 Move paralysis god mode checks to CreatureStats 2024-05-23 11:48:59 +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
d3c1aa6653 Fix incorrect texture filtering GUI for nearest, allow to disable nearest from GUI 2024-05-23 04:11:29 +01:00
psi29a
2be6116ef6 Merge branch 'fix_recastmesh' into 'master'
Limit number of cached tiles with recast meshes

See merge request OpenMW/openmw!4112
2024-05-22 20:38:42 +00:00
Andrei Kortunov
52de6177d1 Avoid MSVC crash in Visual Studio 17.10.0 2024-05-22 18:17:22 +04:00
Andrei Kortunov
6c83451b15 Improve operations widget formatting 2024-05-22 14:37:58 +04:00
Alexei Kotov
67c47b8603 Merge branch 'operation_fixes' into 'master'
Improve operation widget appearance

See merge request OpenMW/openmw!4110
2024-05-21 19:31:39 +00:00
Dave Corley
c87eaefd17 Merge branch 'theeditorisjustanotherengine' into 'master'
Use ESM::ReadersCache in the editor

Closes #7896

See merge request OpenMW/openmw!4111
2024-05-21 06:35:47 +00: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
bf682d51a6 Support dark mode on Windows (feature 7985) 2024-05-20 16:50:24 +04:00
psi29a
fd3ae0d42a Merge branch 'dehardcode_music' into 'master'
Dehardcode music

See merge request OpenMW/openmw!3438
2024-05-20 12:49:33 +00:00
psi29a
f34994e4c8 Merge branch 'notexturetypeconfusion' into 'master'
Support defining the texture type with a state attribute (#6240)

Closes #6240

See merge request OpenMW/openmw!4079
2024-05-20 12:48:30 +00:00
psi29a
651a7d569c Merge branch 'activatebooks' into 'master'
Allow NPCs to activate in-world books for the player (part of #7959)

See merge request OpenMW/openmw!4080
2024-05-20 12:46:01 +00:00
psi29a
d67bc1defd Merge branch 'timeplayedhours' into 'master'
Improve Time Played formatting (#7971)

Closes #7971

See merge request OpenMW/openmw!4107
2024-05-20 12:45:49 +00: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
Alexei Kotov
a3bfd3a337 Merge branch 'fix-infinite-fall-into-void' into 'master'
Fix infinite fall into void (#1415)

Closes #1415

See merge request OpenMW/openmw!4100
2024-05-19 20:47:13 +00:00
Alexei Kotov
e96ebec2cf Merge branch 'fix_lua_attack' into 'master'
Allow Actors to pick an attack type/animation when no AI applies (fix #7583)

Closes #7583

See merge request OpenMW/openmw!4102
2024-05-19 20:40:09 +00:00
Alexei Kotov
03652104fe Merge branch 'cleanup_preloading' into 'master'
Cleanup preloading code

See merge request OpenMW/openmw!4104
2024-05-19 20:39:28 +00:00
Evil Eye
77d554594f Add ReadersCache::clear 2024-05-19 20:39:23 +02:00
Andrei Kortunov
5a1ec8ce87 Implement Lua-based music 2024-05-19 22:10:54 +04:00
elsid
45d62ee59f
Limit RecastMeshManager range by active cell grid 2024-05-19 20:07:47 +02:00
elsid
49db37ee29
Merge setWorldspace and updateBounds 2024-05-19 20:07:47 +02:00
elsid
9854d42d56
Use ESM::RefId for worldspace type 2024-05-19 20:07:47 +02:00
elsid
5d28164416
Remove recast mesh tiles outside active range 2024-05-19 20:07:47 +02:00
elsid
4f5bdbb4fb
Remove recastmesh group for absent tile 2024-05-19 20:07:47 +02:00
Evil Eye
5f0fe8097c Use ESM::ReadersCache in the editor 2024-05-19 18:55:37 +02:00
Andrei Kortunov
3d699bd533 Improve operation widget appearance 2024-05-19 15:56:44 +04:00
Alexei Kotov
908f3891fb Add helper method for texture type recovery 2024-05-19 02:26:40 +03:00
Alexei Kotov
84f4ba4ca1 Support defining the texture type with a state attribute (#6240)
Named textures are still supported for easier native format compatibility (and so that I don't have to edit the documentation)
2024-05-18 23:11:20 +03:00
Sam Hellawell
c1cd8bd900 Check collision before findInteriorPositionfindInteriorPos 2024-05-18 06:33:06 +01:00
elsid
6f70350f2f
Remove unused arguments from preload functions 2024-05-17 19:42:44 +02:00
elsid
7290ce81c0
Avoid allocating std::vector for a single element 2024-05-17 19:42:44 +02:00
elsid
ac891a5eb1
Use algorithms to check if PositionCellGrid(s) is/are contained in a range 2024-05-17 19:42:31 +02: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
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
b8ee467d13 Allow NPCs to activate in-world books for the player (part of #7959) 2024-05-17 01:04:30 +03:00
Alexei Kotov
6bf0d17aa2 Improve Time Played formatting (#7971) 2024-05-16 23:48:13 +03:00
Sam Hellawell
72dbad6fb4 Satisfy king clang 2024-05-16 20:10:32 +01:00
Sam Hellawell
6f7fff409c Empty refid check 2024-05-16 19:38:29 +01: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
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
Sam Hellawell
64142dbd51 Merge remote-tracking branch 'origin/master' into fix-infinite-fall-into-void
# Conflicts:
#	CHANGELOG.md
2024-05-16 04:48:27 +01:00
Sam Hellawell
e98c4f86d6 Remove period 2024-05-16 00:14:09 +01:00
elsid
d71b422615
Convert PositionCellGrid into a struct 2024-05-15 22:33:12 +02:00
Sam Hellawell
e1cfd46f87 Do not teleport if dest < lowest point or collision disabled, add debug log 2024-05-15 20:41:48 +01:00
Zackhasacat
20d26a9cda Use random attack type 2024-05-15 14:09:33 -05:00
uramer
a662198903 Process menu script timers 2024-05-15 21:07:23 +02:00
Zackhasacat
0ad64cffdb Add empty line back 2024-05-15 12:41:45 -05:00
Zackhasacat
b62b0a2f00 Check for world AI disable 2024-05-15 11:56:58 -05:00
Zackhasacat
1e05bb20bf Allow Actors to pick an attack type/animation when no AI applies 2024-05-15 11:39:02 -05:00
Sam Hellawell
b43c7238e9 Fix infinite fall into void (#1415) 2024-05-15 05:01:58 +01: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
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
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
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
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
psi29a
99ac6c40e5 Merge branch 'wizard_update' into 'master'
UI fixes for Wizard

See merge request OpenMW/openmw!4069
2024-05-09 08:45:29 +00: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
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
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
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
Alexei Kotov
95cef34477 Bump the minimum launcher width to 775 2024-05-04 11:15:57 +03: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
Andrei Kortunov
9252879f0f UI fixes for Wizard 2024-05-01 08:56:35 +04: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
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
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
trav5
4449b66846 Operators and retting rid of 'records' 2024-04-27 13:44:08 +02:00
elsid
41d5d3bf09
Report osg stats for all frames showing loading screens 2024-04-27 12:37:39 +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
elsid
5261f0c5cf
Modify PhysicsTaskScheduler::mCollisionObjects under lock
addCollisionObject is called from the main thread and removeCollisionObject is
usually called from the main thread and rarely from one of the physics worker
threads. This usually happens on cell unloading when object is already removed
from the scene but there is active simulation for it. Which possible because
it's a shared pointer.

There is getUserPointer function which only reads from the container but it's
called only when there is no active simulation so no lock is required.
2024-04-26 16:17:40 +02:00
elsid
acf1e51a28
Call getUserPointer only for not nullptr collision object
nullptr can't have user pointer anyway so it saves a lookup in the
unordered_map.
2024-04-26 15:32:27 +02: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
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
trav
0986b103c5 Merge branch openmw:master into mwdialogue-bindings 2024-04-24 21:06:58 +00:00
elsid
b4976354a5
Use correct frame and stats for lua worker
When a loading screen appears during the frame processing, the frame number
returned by the viewer is incremented and the stats reporting goes into the
wrong frame. Pass frame number and stats object from the main thread to avoid
this.
2024-04-24 21:53:59 +02:00
trav5
223e315fdb ESM::Dialogue Lua bindings quest change and docs 2024-04-24 21:17:26 +02:00
bwyunker
563f5b37a3 Merge branch 'master' into feature/pplLauncherSetting 2024-04-24 10:04:31 -05:00
psi29a
5f926bd129 Merge branch 'scalable_wizard' into 'master'
Use scalable icons for wizard

See merge request OpenMW/openmw!4050
2024-04-24 13:20:36 +00:00
psi29a
a20f456a5c Merge branch 'mudcrabcanhazsoulgem' into 'master'
Allow running soulgem instructions on all actors (#7943)

Closes #7943

See merge request OpenMW/openmw!4048
2024-04-24 13:20:09 +00:00
psi29a
a628c658a9 Merge branch 'lessgoofymaterialptr' into 'master'
Simplify material file pointer acrobatics

See merge request OpenMW/openmw!4049
2024-04-24 08:39:52 +00:00
Andrei Kortunov
5e8dc9cc03 Fix stub icon color 2024-04-24 11:14:50 +04:00
psi29a
6d0df9f686 Merge branch 'window_clamp' into 'master'
Do not take in account UI scaling factor twice

See merge request OpenMW/openmw!4046
2024-04-23 10:28:51 +00: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
psi29a
02cdeb6252 Merge branch 'scalable_editor' into 'master'
Treat editor icons as scalable

See merge request OpenMW/openmw!4042
2024-04-23 07:04:59 +00:00
psi29a
9662586947 Merge branch 'editor-crash' into 'master'
Clamp widgets coordinates to avoid editor crashes

See merge request OpenMW/openmw!4043
2024-04-23 07:04:09 +00:00
Alexei Kotov
78eda530ac Simplify material file pointer acrobatics 2024-04-23 00:34:38 +03:00
Alexei Kotov
1c1df996be Allow running soulgem instructions on all actors (#7943) 2024-04-23 00:02:06 +03:00
Andrei Kortunov
d10b0d503b Do not take in account UI scaling factor twice 2024-04-22 13:36:34 +04:00
psi29a
023c0f7a46 Merge branch 'vfs_normalized_path_6' into 'master'
Use normalized path for music related functions

See merge request OpenMW/openmw!4038
2024-04-22 07:02:14 +00:00
Andrei Kortunov
1bb48bcef7 Treat editor icons as scalable 2024-04-21 20:56:06 +04:00
Andrei Kortunov
1909ec121b Take in account faction reaction changes 2024-04-21 18:00:26 +04:00
Andrei Kortunov
2264d067fc Clamp widgets coordinates to avoid crashes 2024-04-21 17:15:33 +04:00
elsid
a863899eb1
Use normalized path for SoundManager::streamMusic 2024-04-20 21:14:09 +02:00
trav5
277d830530 ESM::Dialogue Lua bindings 6 2024-04-20 20:23:37 +02:00
trav5
c1639e54b1 ESM::Dialogue Lua bindings 6 2024-04-20 19:53:56 +02:00
Alexei Kotov
6f9206428d Don't ignore material files in NifLoader tests 2024-04-20 19:43:42 +03:00
Alexei Kotov
4e3d45db1b Deduplicate file handling in niftest 2024-04-20 19:43:42 +03:00
Alexei Kotov
1d65aaee71 Formatting 2024-04-20 19:43:42 +03:00
Alexei Kotov
1a961f3021 Extremely early handling for BGSM/BGEM files 2024-04-20 19:43:41 +03:00
Alexei Kotov
4a03555d53 Add BGEM/BGSM file support to niftest 2024-04-20 19:43:40 +03: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
f21453f0b7 Merge branch 'twoahahidles' into 'master'
Change wander package column names to match reality

See merge request OpenMW/openmw!4032
2024-04-20 16:38:41 +00:00
psi29a
29d6c76f93 Merge branch 'log_not_supported_agent_bounds_ptr' into 'master'
Log ptr for which agent bounds are not supported

See merge request OpenMW/openmw!4040
2024-04-20 16:37:37 +00:00
trav5
1e36b17679 ESM::Dialogue Lua bindings 5 2024-04-20 17:44:36 +02:00
AnyOldName3
04f1dc282b Merge branch 'fix-osga-rotate-wildly' into 'master'
Fix OSGAnimation issues

See merge request OpenMW/openmw!3989
2024-04-20 15:37:09 +00:00
trav5
3bb7bf1a4a ESM::Dialogue Lua bindings 4 2024-04-20 15:47:34 +02:00
trav5
d14fc1d28c ESM::Dialogue Lua bindings 3 2024-04-20 14:29:11 +02:00
trav
807d78a0d0 Merge branch openmw:master into mwdialogue-bindings 2024-04-20 12:27:47 +00:00
elsid
5b0eb0b5b0
Log ptr for which agent bounds are not supported
To make it easier to find what NPC or mod makes this happen.
2024-04-20 14:15:26 +02:00
elsid
40cc16046b
Use normalized path for sound decoder 2024-04-19 22:46:38 +02:00
elsid
e11a5a4352
Use normalized path for SoundManager::playPlaylist 2024-04-19 22:43:20 +02:00
elsid
38b005cda6
Use normalized path to store playlist music files 2024-04-19 22:42:20 +02:00
elsid
82931059fd
Make NormalizedView constructor from const char* explicit 2024-04-19 22:42:04 +02:00
Benjamin Y
8cc512cbc9 Convention fixes and remove confusing info 2024-04-18 18:44:51 -05:00
psi29a
3600c6c7c7 Merge branch 'filterview' into 'master'
Validate INFO filters when loading the record

See merge request OpenMW/openmw!4003
2024-04-17 13:08:49 +00: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
Sam Hellawell
d09f32d9e4 Yes sir clang 2024-04-17 08:19:51 +01:00
Sam Hellawell
2653b76db9 getTranslation/getTransformForNode refactor, unit tests 2024-04-17 08:16:48 +01: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
jvoisin
b574155a0b Merge branch 'av_raii' into 'master'
Use RAII for ffmpeg pointers

See merge request OpenMW/openmw!4030
2024-04-16 19:20:24 +00:00
psi29a
e633d2bfd4 Merge branch 'unsubscribe' into 'master'
Deregister the player before loading a new one

See merge request OpenMW/openmw!4018
2024-04-16 08:48:48 +00:00
trav5
34aec9caf9 ESM::Dialogue Lua bindings 2 2024-04-15 22:10:18 +02:00
trav5
c622cfc245 ESM::Dialogue Lua bindings 1 2024-04-15 22:01:41 +02:00
elsid
f184d8f390
Use RAII for AVIOContext, AVFormatContext, AVCodecContext and AVFrame pointers 2024-04-15 20:24:03 +02:00
Evil Eye
963035fe47 Change wander package column names to match reality 2024-04-15 18:20:57 +02:00
Evil Eye
b016f414d5 Add INFO record unit test 2024-04-15 17:06:40 +02:00
Evil Eye
0fa4b0137a Merge branch 'mattengarde' into 'master'
Improve hit detection emulation (#7900)

Closes #7900

See merge request OpenMW/openmw!3984
2024-04-14 07:50:34 +00:00
Andrei Kortunov
1ad9e5f9e8 Rework editor icons 2024-04-14 08:17:10 +04:00
elsid
910c88325a
Add a setting to wait for all navmesh jobs on exit 2024-04-13 19:51:16 +02:00
elsid
50f4471750
Use R-tree for dynamic priority of navmesh async job 2024-04-13 19:51:16 +02:00
elsid
d6f3d34f2f
Remove tiles present on navmesh but outside desired area 2024-04-13 19:51:16 +02:00
Alexei Kotov
86b6eee62b Improve hit detection emulation (#7900) 2024-04-13 01:34:00 +03:00
Alexei Kotov
55c5f2112b Merge branch 'alignyorefs' into 'master'
Reorder RefData members to decrease its size

See merge request OpenMW/openmw!4020
2024-04-12 21:18:24 +00:00
Alexei Kotov
f880ada633 Don't flip the water normal map twice 2024-04-13 00:06:24 +03:00
Evil Eye
6e79064a57 Fix editor oddities 2024-04-12 18:32:47 +02:00
psi29a
bdbbe34afc Merge branch 'pushthefatman' into 'master'
Animation regression fixes

See merge request OpenMW/openmw!4001
2024-04-12 15:02:39 +00:00
Evil Eye
a4625ea784 Deduplicate dialogue filter parsing 2024-04-11 22:29:33 +02:00
Evil Eye
cb92d34ddd Reorder RefData members to decrease its size 2024-04-11 17:04:55 +02:00
Evil Eye
fb4edda45d Validate INFO filters when loading the record 2024-04-11 16:55:00 +02:00
Sam Hellawell
c3420ed306 Fix build 2024-04-11 03:01:00 +01:00
Sam Hellawell
8c2c66d59e .nif check, matrix mult feedback, auto usage, reuse NodeMap typedef 2024-04-11 02:16:06 +01:00
Alexei Kotov
8751203849 Don't run target-specific spell infliction code when there's no target (#7926) 2024-04-10 22:24:22 +03:00
Evil Eye
2f6acbd7da Deregister the player before loading a new one 2024-04-10 21:16:22 +02: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
49b974763f Merge branch 'imthefactornow' into 'master'
Don't show nameless higher ranks

Closes #7923

See merge request OpenMW/openmw!4014
2024-04-10 09:52:03 +00:00
Zackhasacat
4018b1ae59 Remove hidden functions 2024-04-09 21:24:53 -05: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
Evil Eye
1ed82662ee Don't show nameless higher ranks 2024-04-08 17:54:13 +02:00
AnyOldName3
0d547c5438 Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893 2024-04-08 13:37:36 +01:00
Andrei Kortunov
e8c3c8115a Capitalize captions in Launcher and Wizard 2024-04-08 09:17:43 +04:00
Zackhasacat
15c6e90bdb Allow shoulder buttons to work when text input is active 2024-04-07 10:48:09 -05:00
Zackhasacat
da4e6b38a8 Clang format 2024-04-07 10:37:15 -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
Zackhasacat
e549490bb1 record crime ID 2024-04-07 08:28:43 -05:00
Zackhasacat
4ca13a9404 Verify the player 2024-04-06 18:17:51 -05:00
Zackhasacat
5856bc8a0e Add setCrimeLevel 2024-04-06 18:13:51 -05:00
Sam Hellawell
36cccef606 Fix formatting 2024-04-05 23:43:59 +01: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
Sam Hellawell
a51d560174 Move bone rename logic to ColladaDescriptionVisitor, undo formatting/refactoring 2024-04-05 01:59:40 +01:00
Benjamin Y
76199e1fb2 Update settingspage.ui with description for PPL 2024-04-04 19:45:45 +00:00
Alexei Kotov
f2e0129436 Convert water/ripple defines to camelCase 2024-04-04 21:12:47 +03:00
Sam Hellawell
ceabeab0fd Fix RotateController not updating skeleton 2024-04-04 00:11:15 +01:00
Sam Hellawell
2288a691d2 Replace osgAnimation bone underscore naming at load time, map bone instances, reset root bone transform each frame 2024-04-04 00:10:51 +01:00
Alexei Kotov
3380b806de Merge branch 'haggleraven' into 'master'
Remove superfluous Trading class

See merge request OpenMW/openmw!3996
2024-04-03 18:21:02 +00:00
Alexei Kotov
dfdd7aa684 Always queue movement even when there's none 2024-04-03 21:16:47 +03:00
Alexei Kotov
5e99545b9c Don't discard stagger/KO animation movement 2024-04-03 21:11:49 +03:00
uramer
3b930e4471 Restore !613 2024-04-03 07:12:53 +00:00
Andrei Kortunov
1b544b93d2 Do not allow to move resizable windows outside of game window 2024-04-02 11:40:21 +04:00
Andrei Kortunov
939760007e Resize console window on resolution change, not reset it 2024-04-02 11:40:21 +04:00
psi29a
99fa1278d2 Merge branch 'codenames' into 'master'
Make binding names layout-independent

See merge request OpenMW/openmw!3993
2024-04-02 07:36:45 +00:00
psi29a
b83ffdc357 Merge branch 'i-have-value-too' into 'master'
FIX(CS): Re-add gold value column for objects

See merge request OpenMW/openmw!3991
2024-04-02 07:34:51 +00:00
psi29a
46bf6c12b6 Merge branch 'equipunequipwhatsthedifference' into 'master'
Allow weapon equip/unequip animations to intersect (#7886)

Closes #7886

See merge request OpenMW/openmw!3951
2024-04-02 07:34:31 +00:00
psi29a
a7c6297240 Merge branch 'sorewaai' into 'master'
Expose AI stats to Lua

Closes #7860

See merge request OpenMW/openmw!3997
2024-04-01 20:49:38 +00:00
Dave Corley
7a291e5025 FIX(CS): Re-add gold value column for objects 2024-03-31 05:34:11 -05:00
Evil Eye
cb357997c9 Copy DIAL type to INFO when saving 2024-03-30 14:36:45 +01:00
psi29a
3da6b4f529 Merge branch 'more_stats' into 'master'
Report more stats in F4

See merge request OpenMW/openmw!3956
2024-03-30 08:41:29 +00:00
Evil Eye
d08e47bc40 Expose AI stats to Lua 2024-03-29 22:34:53 +01:00
Evil Eye
f70bf42a9e Remove superfluous Trading class 2024-03-29 21:50:45 +01:00
elsid
215404e126
Report more stats from caches 2024-03-29 14:25:39 +01:00
elsid
ae41ebfc83
Report CellPreloader stats 2024-03-29 14:05:26 +01:00
elsid
9a24e77d3f
Show F4 stats in pages 2024-03-29 14:05:25 +01:00
Andrei Kortunov
3d83585c46 Make binding names layout-independent (bug 7908) 2024-03-29 12:02:06 +04:00
Alexei Kotov
76105cc2d1 Make sunlight scattering and wobbly shores optional 2024-03-29 10:41:04 +03:00
Alexei Kotov
359600db83 Merge branch 'im-not-taking-you-anywhere' into 'master'
Fix #7901, make teleport fields non-interactive when mTeleport is false

Closes #7901

See merge request OpenMW/openmw!3986
2024-03-29 03:48:18 +00:00
psi29a
2056da358d Merge branch 'opencs-projectile-speed' into 'master'
OpenMW-CS: Editing and verifying of projectile speed for magic effects

See merge request OpenMW/openmw!3939
2024-03-28 09:04:50 +00:00
Dave Corley
b8a17b16f7 Cleanup(CS): Make TeleportColumn take flags as argument 2024-03-27 17:53:23 -05:00
Dave Corley
4e59246d2d Fix(columnimp.hpp): Use QVariant() constructor instead of UserType to
hide unused subs from view and make a member variable to tell if the
column is used for a door or a regular position
2024-03-27 17:53:23 -05:00
Dave Corley
1360eeb839 Fix #7901, make teleport fields non-interactive when mTeleport is false 2024-03-27 17:53:12 -05:00
AnyOldName3
47ef2d018f Always set userrole for archive list 2024-03-27 22:25:32 +00:00
psi29a
e8038d353f Merge branch 'esmstuff' into 'master'
Use more decomposition, string_view, and implicit sizes in ESM code

See merge request OpenMW/openmw!3975
2024-03-27 19:40:18 +00:00
psi29a
3fcf3aca77 Merge branch 'modalsettingsmodal' into 'master'
Reimplement the Settings window as a normal window (#7845, #7870)

Closes #7845 and #7870

See merge request OpenMW/openmw!3895
2024-03-27 17:59:41 +00:00
AnyOldName3
e735bf67e1 Brace-initialise SettingValue
Clang didn't like it otherwise
2024-03-27 14:04:08 +00:00
AnyOldName3
a98a824f80 Config paths to info log, not verbose 2024-03-27 13:58:36 +00:00
Sam Hellawell
e87c39eeb3 OpenCS: Editing and verifying of projectile speed for magic effects 2024-03-27 09:26:03 +00:00
psi29a
f7f7502d60 Merge branch 'i-said-it-was-unlocked-damn-you' into 'master'
Fix(CS): Actually allow unlocking doors ( #7899 )

Closes #7899

See merge request OpenMW/openmw!3982
2024-03-27 07:32:53 +00:00
Dave Corley
2e68786331 Fix(CS): Actually allow unlocking doors ( #7899 ) 2024-03-27 07:32:53 +00:00
psi29a
b70f1d86c5 Merge branch 'fix-sheathing-non-nifs' into 'master'
Fix weapon and shield sheathing for non-nif meshes

See merge request OpenMW/openmw!3985
2024-03-27 07:30:14 +00:00
AnyOldName3
59334f694d Don't forget to add path to UserRole 2024-03-26 23:11:54 +00:00
psi29a
58632218fb Merge branch 'you-can-only-grow-up-to-be-so-big' into 'master'
FIX(CS): Limit scale for references to TES3 values (Close #7898 )

Closes #7898

See merge request OpenMW/openmw!3981
2024-03-26 09:05:21 +00:00
psi29a
c8560c63eb Merge branch 'regressionfixesofdubiousauthenticity' into 'master'
Rendering regression fixes of dubious authenticity (#7587, #7720)

Closes #7587 and #7720

See merge request OpenMW/openmw!3979
2024-03-26 09:04:41 +00:00
Sam Hellawell
7897ff7ac9 Fix weapon sheathing for non-nif meshes 2024-03-25 21:03:59 +00:00
psi29a
012d10703f Merge branch 'spellcast-refactor' into 'master'
Spellcast related Lua API + spellcasting/activespell refactor

See merge request OpenMW/openmw!3922
2024-03-25 13:50:23 +00:00
Mads Buvik Sandvei
320d8ef014 Spellcast related Lua API + spellcasting/activespell refactor 2024-03-25 13:50:23 +00:00
psi29a
e62089d102 Merge branch 'lua_records_fix' into 'master'
Lua: Standardize record stores

See merge request OpenMW/openmw!3523
2024-03-25 13:46:24 +00:00
Zackhasacat
6d529835ae Lua: Standardize record stores 2024-03-25 13:46:23 +00:00
psi29a
628480357b Merge branch 'soumd_followup' into 'master'
Modify sound API permissions

See merge request OpenMW/openmw!3952
2024-03-25 13:45:37 +00:00
psi29a
ef5314c247 Merge branch 'herebedragons' into 'master'
Exterior cell naming corrections

See merge request OpenMW/openmw!3976
2024-03-25 13:45:12 +00:00
psi29a
666d2835ab Merge branch 'mgefverify' into 'master'
Use the right ID for magic effect verifier messages (#7894)

Closes #7894

See merge request OpenMW/openmw!3971
2024-03-25 13:44:38 +00:00
AnyOldName3
0e2f28156d Restore logging of openmw.cfg paths in launcher
Removed here https://gitlab.com/OpenMW/openmw/-/merge_requests/2650/diffs#be09c16519a3f26f4306b920c50e0e4215dffaee_329_328
2024-03-24 23:48:37 +00:00
Dave Corley
c59d097ab2 FIX(#7898): Limit scale for references TES3 values 2024-03-24 16:37:48 -05:00
Alexei Kotov
d7257e056c Merge branch 'remove-unused-regionmap-constructor' into 'master'
Minor cleanup: Remove unused regionmap CellDescription constructor

See merge request OpenMW/openmw!3973
2024-03-24 13:08:24 +00:00
Alexei Kotov
ba69e1737c Use the right shader for 360-degree screenshots
Doesn't fix #7720
2024-03-24 13:45:46 +03:00
Alexei Kotov
0f7b4fc6e6 Consistently avoid null pointer dereferencing in postprocessor (#7587) 2024-03-24 13:40:45 +03:00
Alexei Kotov
38eb741bfd Merge branch 'fix_global_iteration' into 'master'
Lua: Fix Global Variable Iteration

See merge request OpenMW/openmw!3835
2024-03-24 09:44:15 +00:00
jvoisin
79a62b3ad3 Merge branch 'enable_normals_for_all' into 'master'
Restructure colormasks at higher level

See merge request OpenMW/openmw!3970
2024-03-23 21:56:30 +00:00
Cody Glassman
a4dd9224df Restructure colormasks at higher level 2024-03-23 21:56:30 +00:00
Alexei Kotov
24913687cd Exterior cell naming corrections
Use the ID for anonymous regions
Try to use the name of the worldspace for ESM4
2024-03-23 17:24:33 +03:00
Evil Eye
5a0aed3a78 Use more decomposition, string_view, and implicit sizes in ESM code 2024-03-23 12:15:09 +01:00
Evil Eye
781e797810 Merge branch 'instanceselectionmode' into 'master'
Fix instance selection mode destruction (#7447)

Closes #7447

See merge request OpenMW/openmw!3945
2024-03-23 08:08:15 +00:00
Evil Eye
bf708acfac Merge branch 'goddamnit-there-are-more' into 'master'
Even more MSVC-specific warnings that evaded detection in CI

See merge request OpenMW/openmw!3968
2024-03-23 08:07:28 +00:00
Evil Eye
c92e63aaf2 Merge branch 'cleanup_includes' into 'master'
Cleanup includes

See merge request OpenMW/openmw!3916
2024-03-23 08:06:12 +00:00
Alexei Kotov
63276e0f1f Merge branch 'avoid_copy' into 'master'
Follow-up for YAML API

See merge request OpenMW/openmw!3961
2024-03-23 07:13:39 +00:00
AnyOldName3
7c85755950 Warning that doesn't fire with MSVC 2022
Hopefully this fixes it.
I've only tried MSVC 2022 locally, so can't verify this fix.
2024-03-23 02:34:57 +00:00
AnyOldName3
1aff88e6a3 Even more warning fixes 2024-03-23 00:33:50 +00:00
Zackhasacat
d6241dd1c5 Add back new_index 2024-03-22 17:41:12 -05:00
Sam Hellawell
c20a23b694 Remove unused regionmap CellDescription constructor 2024-03-22 03:13:04 +00:00
Alexei Kotov
79039f88df Use the right ID for magic effect verifier messages (#7894) 2024-03-22 04:34:38 +03:00
Cody Glassman
098396822f add choice widget type to postprocessing uniforms 2024-03-21 17:48:30 -07:00
AnyOldName3
da8150e2e4 Even more MSVC-specific warnings that evaded detection in CI 2024-03-21 15:51:29 +00:00
elsid
37b695a0cf
Cleanup includes 2024-03-21 11:14:01 +01:00
psi29a
82bc6674dc Merge branch 'that-one-issue-sophie-keeps-nagging-about' into 'master'
Don't throw away user-provided shadow map resolutions

Closes #7891

See merge request OpenMW/openmw!3965
2024-03-21 07:45:26 +00:00
psi29a
af9f1b54da Merge branch 'lost-warnings' into 'master'
Fixes for a whole bunch of warnings

See merge request OpenMW/openmw!3950
2024-03-21 07:45:21 +00:00
AnyOldName3
0371791cce Break 2024-03-20 23:12:19 +00:00
AnyOldName3
b15f7857c0 currentDir.value is already canonicalised 2024-03-20 14:34:23 +00:00
AnyOldName3
f49d270c26 Don't throw away user-provided shadow map resolutions
Resolves https://gitlab.com/OpenMW/openmw/-/issues/7891

I think this is better than just adding 8192 as an allowed option as the vast majority of GPUs would be too slow given what we know about the cost if that setting (maybe that'll change if we get rid of the unconditional conditional discard I suspect is the cause of the slowness that's there for no good reason since the shadowsbin already moves most drawables to a known alpha-free stateset).
2024-03-20 00:54:12 +00:00
Alexei Kotov
974415addf Allow weapon equip/unequip animations to intersect (#7886) 2024-03-19 13:55:23 +03:00
psi29a
7dcd127295 Merge branch 'openmw-cs-regionmap-improvements' into 'master'
OpenMW CS: Minor region map fixes and improvements

See merge request OpenMW/openmw!3959
2024-03-19 09:24:48 +00:00
Andrei Kortunov
2d3a8ca0fc Do not use an inner namespace 2024-03-17 18:15:23 +04:00
Andrei Kortunov
2523afe9c2 Use namespace instead of static class 2024-03-16 22:06:28 +04:00
Andrei Kortunov
b657cb2e4c Simplify code 2024-03-16 22:06:28 +04:00
Andrei Kortunov
8037ad7f00 Remove unused includes 2024-03-16 22:06:15 +04:00
Sam Hellawell
a62da201e5 check for land index not -1, fix warning
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-16 09:02:47 +00:00
Sam Hellawell
5fca45565c Feature: display different brush for land vs water 2024-03-16 07:48:40 +00:00
Sam Hellawell
aa0c9fb4cb Fix: cannot drag region into map, map columns are rectangular 2024-03-16 07:48:40 +00:00
elsid
9ae7b542c6
Fix warning: -Wmaybe-uninitialized
In file included from apps/opencs/model/world/pathgrid.hpp:7,
                 from apps/opencs/model/world/idcollection.hpp:15,
                 from apps/opencs/model/world/idcollection.cpp:1:
In constructor ‘constexpr ESM::Pathgrid::Pathgrid(ESM::Pathgrid&&)’,
    inlined from ‘constexpr CSMWorld::Pathgrid::Pathgrid(CSMWorld::Pathgrid&&)’ at apps/opencs/model/world/pathgrid.hpp:24:12,
    inlined from ‘constexpr CSMWorld::Record<CSMWorld::Pathgrid>::Record(CSMWorld::Record<CSMWorld::Pathgrid>&&)’ at apps/opencs/model/world/record.hpp:39:12,
    inlined from ‘std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = CSMWorld::Record<CSMWorld::Pathgrid>; _Args = {CSMWorld::Record<CSMWorld::Pathgrid>}]’ at /usr/include/c++/13.2.1/bits/unique_ptr.h:1070:30,
    inlined from ‘std::unique_ptr<CSMWorld::RecordBase> CSMWorld::Record<ESXRecordT>::modifiedCopy() const [with ESXRecordT = CSMWorld::Pathgrid]’ at apps/opencs/model/world/record.hpp:92:116:
components/esm3/loadpgrd.hpp:19:12: warning: ‘<unnamed>.CSMWorld::Record<CSMWorld::Pathgrid>::mBase.CSMWorld::Pathgrid::<unnamed>.ESM::Pathgrid::mData’ may be used uninitialized [-Wmaybe-uninitialized]
   19 |     struct Pathgrid
      |            ^~~~~~~~
In file included from apps/opencs/model/world/idcollection.hpp:8:
apps/opencs/model/world/record.hpp: In member function ‘std::unique_ptr<CSMWorld::RecordBase> CSMWorld::Record<ESXRecordT>::modifiedCopy() const [with ESXRecordT = CSMWorld::Pathgrid]’:
apps/opencs/model/world/record.hpp:92:53: note: ‘<anonymous>’ declared here
   92 |         return std::make_unique<Record<ESXRecordT>>(Record<ESXRecordT>(State_ModifiedOnly, nullptr, &(this->get())));
      |                                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2024-03-16 02:34:50 +01:00
elsid
9b412bc802
Fix benchmark warning: -Wdeprecated-declarations
Example:

apps/benchmarks/settings/access.cpp: In function ‘void {anonymous}::localStatic(benchmark::State&)’:
apps/benchmarks/settings/access.cpp:43:37: warning: ‘typename std::enable_if<(std::is_trivially_copyable<_Tp>::value && (sizeof (Tp) <= sizeof (Tp*)))>::type benchmark::DoNotOptimize(const Tp&) [with Tp = float; typename std::enable_if<(std::is_trivially_copyable<_Tp>::value && (sizeof (Tp) <= sizeof (Tp*)))>::type = void]’ is deprecated: The const-ref version of this method can permit undesired compiler optimizations in benchmarks [-Wdeprecated-declarations]
   43 |             benchmark::DoNotOptimize(v);
      |             ~~~~~~~~~~~~~~~~~~~~~~~~^~~
2024-03-16 01:58:12 +01:00
AnyOldName3
ddb2c15bc9 Review 2024-03-15 16:31:02 +00:00
Andrei Kortunov
009ccca978 Modify sound API permissions 2024-03-15 19:48:43 +04:00
AnyOldName3
b5f61a119a min 2024-03-15 13:42:28 +00:00
psi29a
090e57b27c Merge branch 'esm3structs' into 'master'
Replace fixed size writeHNT calls with decomposition

See merge request OpenMW/openmw!3914
2024-03-15 11:02:42 +00:00
psi29a
d746918563 Merge branch 'yaml_parse' into 'master'
Load YAML files via Lua

Closes #7590

See merge request OpenMW/openmw!3924
2024-03-15 11:02:05 +00:00
AnyOldName3
dd18e17c97 And now Clang's noticed questionable type conversions 2024-03-15 00:47:09 +00:00
AnyOldName3
9638fbabb4 https://www.youtube.com/watch?v=2_6U9gkQeqY 2024-03-15 00:11:19 +00:00
AnyOldName3
ff3ffa13b6 Auto format 2024-03-14 23:54:22 +00:00
AnyOldName3
28131fd62b Fixes for a whole bunch of warnings
These warnings were always enabled, but we didn't see them due to https://gitlab.com/OpenMW/openmw/-/issues/7882.
I do not fully understand the cause of 7822 as I can't repro it in a minimal CMake project.

Some of these fixes are thought through.
Some are sensible best guesses.
Some are kind of a stab in the dark as I don't know whether there was a
possible bug the warning was telling me about that I've done nothing to
help by introducing a static_cast.

Nearly all of these warnings were about some kind of narrowing
conversion, so I'm not sure why they weren't firing with GCC and Clang,
which have -Wall -Wextra -pedantic set, which should imply -Wnarrowing,
and they can't have been affected by 7882.

There were also some warnings being triggered from Boost code.
The vast majority of library headers that do questionable things weren't
firing warnings off, but for some reason, /external:I wasn't putting
these Boost headers into external mode.

We need these warnings dealt with one way or another so we can switch
the default Windows CI from MSBuild (which doesn't do ccache) to Ninja
(which does).
I have the necessary magic for that on a branch, but the branch won't
build because of these warnings.
2024-03-14 23:39:33 +00:00
Andrei Kortunov
715efe892f Load YAML files via Lua (feature 7590) 2024-03-14 16:29:21 +04:00
Alexei Kotov
288a911ece Merge branch 'vfs_normalized_path_5' into 'master'
Use normalized path for NifFileManager::get

See merge request OpenMW/openmw!3944
2024-03-13 19:18:39 +00:00
Evil Eye
0fdc432eb2 Format probability 2024-03-12 20:09:04 +01:00
Evil Eye
c0578613af Remove superfluous members 2024-03-12 20:09:04 +01:00
Evil Eye
1d69d38081 Add an actual probability column 2024-03-12 20:09:04 +01:00
Evil Eye
f9da2b6b26 Roll for each region sound 2024-03-12 20:09:02 +01:00
Zackhasacat
59a25291f8 Fix errors 2024-03-12 07:29:48 -05:00
Zackhasacat
8b75932f50 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-03-12 06:54:15 -05:00
psi29a
df1be7102f Merge branch 'resolution_follow_up' into 'master'
Partially revert 5dcac4c48f

See merge request OpenMW/openmw!3940
2024-03-12 08:17:18 +00:00
Alexei Kotov
cdbe6adfc3 Fix instance selection mode destruction (#7447) 2024-03-12 03:39:14 +03:00
elsid
a98ce7f76a
Replace std::filesystem::path by std::string_view in Files::getHash argument 2024-03-11 22:07:37 +01:00
elsid
79b73e45a1
Replace std::filesystem::path by std::string and std::string_view in nif code
It's used only for error reporting.
2024-03-11 22:07:37 +01:00
Alexei Kotov
6232b4f9e8 Reimplement the Settings window as a normal window (#7845, #7870) 2024-03-11 23:48:44 +03:00
psi29a
3cb8d05fe5 Merge branch 'vfs_normalized_path_4' into 'master'
Use VFS::Path::Normalized in few more places

See merge request OpenMW/openmw!3934
2024-03-11 07:29:55 +00:00
Andrei Kortunov
f7e5ef74c6 Partially revert 5dcac4c48f 2024-03-10 14:53:55 +04:00
Alexei Kotov
30f314025a Log whether shaders or FFP are used for rendering 2024-03-10 04:53:30 +03:00
psi29a
6f9ceff3f3 Merge branch 'windows_build' into 'master'
Add option to disable precompiled headers

See merge request OpenMW/openmw!3933
2024-03-09 09:48:57 +00:00
psi29a
ef8228f2f3 Merge branch 'fix/hardcoded-weather-meshes' into 'master'
Fix: hardcoded weather meshes, use settings instead

See merge request OpenMW/openmw!3880
2024-03-09 09:48:26 +00:00
psi29a
c3a44ca74a Merge branch 'mapped' into 'master'
Track map position using MWWorld::Cell

See merge request OpenMW/openmw!3932
2024-03-09 09:48:14 +00:00
elsid
ffbeb5ab98
Build localization path using VFS::Path::Normalized 2024-03-09 00:21:17 +01:00
elsid
84adb0a148
Make VFS::Path::Normalized constructor from std::string_view explicit 2024-03-09 00:21:16 +01:00
Evil Eye
504a9e7d43 Address feedback 2024-03-08 17:09:49 +01:00
psi29a
a926f4a5a9 Merge branch 'alt_tab_fix' into 'master'
Do not treat Alt-Tab as resolution change

Closes #7866

See merge request OpenMW/openmw!3931
2024-03-08 08:41:55 +00:00
elsid
5859fd464c
Add option to disable precompiled headers
To be able to use ccache.

Also fix compilation errors appeared due to absence of precompiled
headers.
2024-03-08 02:11:51 +01:00
Evil Eye
b055367b3b Track map position using MWWorld::Cell 2024-03-07 21:36:21 +01:00
Andrei Kortunov
5dcac4c48f Do not treat Alt-Tab as resolution change (bug 7866) 2024-03-07 15:43:35 +04:00
Sam Hellawell
c6ee01b0be Apply fix to sky manager
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-07 04:49:48 +00:00
Sam Hellawell
bf7819f71d fix clang format 2024-03-07 02:28:14 +00:00
Sam Hellawell
f28b3f6601 Style tweak
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-07 02:28:14 +00:00
Sam Hellawell
af8c2a94df Fix: hardcoded weather meshes, use settings instead
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
2024-03-07 02:28:14 +00:00
uramer
9ae61f1932 Fix child UI Elements created in the same frame as parent 2024-03-06 23:16:02 +01:00
AnyOldName3
7f1a6a8187 Fix file that's not used on Windows 2024-03-06 01:37:40 +00:00
AnyOldName3
a130ca57a4 Track source of settings
This one's a biggie.

The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.

This had fairly wide-reaching implications.

The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.

Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.

Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.

One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
2024-03-06 00:36:13 +00:00
psi29a
effb4fc383 Merge branch 'whoanotouchy' into 'master'
Properly calculate touch spell hit position (#6156)

Closes #6156

See merge request OpenMW/openmw!3920
2024-03-05 09:24:35 +00:00
psi29a
9434f52c14 Merge branch 'fix/less-strict-ids' into 'master'
Fix(idvalidator): Allow any printable character in refIds

Closes #7721

See merge request OpenMW/openmw!3896
2024-03-05 09:23:44 +00:00
psi29a
e340b06411 Merge branch 'get-glextensions-properly' into 'master'
Get the GLExtensions instance when a context is created

Closes #7351

See merge request OpenMW/openmw!3022
2024-03-04 15:05:23 +00:00
psi29a
61f5a13c02 Merge branch 'check-osg-plugins' into 'master'
Check for dynamic OSG plugins on launch

Closes #7736

See merge request OpenMW/openmw!3748
2024-03-04 08:00:16 +00:00