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

22247 commits

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