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

22377 commits

Author SHA1 Message Date
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
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
Alexei Kotov
1f629b1368 Account for Hrnchamd's research in touch effect hit position calculation 2024-03-04 00:00:16 +03:00
Evil Eye
cef59e8928 Replace fixed size writeHNT calls with decomposition 2024-03-03 19:39:19 +01:00
Alexei Kotov
828bf3d11a Merge branch 'imperfectoil' into 'master'
Implement auto calculated potion values

Closes #7859

See merge request OpenMW/openmw!3918
2024-03-03 14:50:03 +00:00
Alexei Kotov
7a84f27eeb Properly calculate touch spell hit position (#6156)
Reorganize hit contact logic and remove dead code (distance checks, melee hit contact-relevant stuff)
2024-03-03 13:22:58 +03:00
psi29a
d168466034 Merge branch 'raciallybound' into 'master'
Expose races to Lua

See merge request OpenMW/openmw!3863
2024-03-02 20:14:27 +00:00