1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 22:39:42 +00:00
Commit graph

21546 commits

Author SHA1 Message Date
elsid
71e33cf8b2
Add unit tests for GenericObjectCache 2023-12-25 14:12:16 +01:00
elsid
0d8dc5aabc
Use string_view for VFS lookups 2023-12-25 12:21:01 +01:00
AnyOldName3
01e2e56f97 Add game-independent VFS directory to CS' VFS
This should have been like this all along - all the other applications that use the game's VFS do this.
2023-12-24 17:55:49 +00:00
Andrei Kortunov
1ca2a0ef66 Store generated UI by pointer to avoid redundant processing 2023-12-24 20:35:19 +04:00
Andrei Kortunov
81f7149f42 Use a multiplication sign for custom resolution 2023-12-24 19:00:16 +04:00
Alexei Kotov
51b05647e2 Merge branch 'move_files' into 'master'
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
2023-12-24 09:58:24 +00:00
elsid
edaac852d1
Use settings values to declare bool settings 2023-12-24 00:25:18 +01:00
Dave Corley
25f3e09da9 Fix(CS): Correct build issues on some compilers 2023-12-23 15:05:13 -06:00
Dave Corley
33ce7782e9 Feat(worldspacewidget.cpp): Add shortcut to clear selection 2023-12-23 15:05:13 -06:00
Dave Corley
a7f8ee1106 Feat(instancemode.cpp): Implement save/load selection group functions 2023-12-23 15:05:13 -06:00
Dave Corley
23e75bed8f Feat(object.cpp): Make object outline an optional argument when selecting it 2023-12-23 15:05:13 -06:00
Dave Corley
f287914f1e Feat(cell.cpp): Add select/unhide functions in cell.cpp 2023-12-23 15:05:13 -06:00
Dave Corley
8edc148418 Feat(CS): Implement select/unhide functions into interior & exterior
worldspace widgets
2023-12-23 15:05:13 -06:00
Dave Corley
94eadd436d Feat(worldspacewidget.cpp): Implement shortcut for visibility switching
& unhiding all instances
2023-12-23 15:05:13 -06:00
Dave Corley
9d155afc15 Feat(worldspacewidget.hpp): Add virtual decs for selection functions 2023-12-23 15:05:13 -06:00
Dave Corley
cf098033b9 Feat(Mask.hpp): Add mask for hidden objects 2023-12-23 15:05:13 -06:00
Dave Corley
0ec6dcbf1f Feat(Settings): Implement shortcuts for hiding refs & selection groups 2023-12-23 15:05:13 -06:00
Dave Corley
24443e00bf Feat(CS): Implement selection groups into data model 2023-12-23 15:05:13 -06:00
Alexei Kotov
c6a1196ec7 Merge branch 'editor_int_settings' into 'master'
Use settings values to declare int settings (#6876)

See merge request OpenMW/openmw!3668
2023-12-23 15:48:43 +00:00
Evil Eye
af40d7ce80 End pursue package if the target doens't have a bounty 2023-12-23 15:50:36 +01:00
Alexei Kotov
099c39ae87 Use fallback weather ripple settings (bug #7292) 2023-12-23 11:46:08 +03:00
elsid
4067e10f3f
Use gamepad cursor speed setting 2023-12-22 19:24:02 +01:00
AnyOldName3
8cafcf702f Merge branch 'sdl_errors' into 'master'
Handle and log some controller related SDL errors (#7728)

Closes #7728

See merge request OpenMW/openmw!3669
2023-12-22 14:57:21 +00:00
Alexei Kotov
f11c66794b Merge branch 'advancedalchemy' into 'master'
Make ingredient order affect effect order

Closes #7676

See merge request OpenMW/openmw!3667
2023-12-22 08:25:24 +00:00
jvoisin
2873f971a6 Merge branch 'downsized' into 'master'
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
2023-12-21 22:50:10 +00:00
Cody Glassman
187f63d3d3 support postprocess distortion 2023-12-21 10:56:38 -08:00
Alexei Kotov
51cb3b08cb Merge branch 'followthecrab' into 'master'
Stop combat when stacking a new AI package

Closes #7661

See merge request OpenMW/openmw!3665
2023-12-21 07:08:36 +00:00
elsid
78a0e0eb3b
Handle and log some controller related SDL errors
SDL_GameControllerNameForIndex may return nullptr indicating an error which
causes a crash when passed to log.
2023-12-21 02:19:24 +01:00
Evil Eye
532a330aac mac plz 2023-12-20 13:58:43 +01:00
Evil Eye
3e101ab409 Add a variadic getHNOT 2023-12-20 12:28:34 +01:00
elsid
66b1745520
Use settings values to declare int settings 2023-12-20 12:26:36 +01:00
Evil Eye
1223d12b29 Make ingredient order affect effect order 2023-12-20 11:56:12 +01:00
Alexei Kotov
78a8f9d692 Merge branch 'skating-olympics' into 'master'
De-jank stationary animations

Closes #3330

See merge request OpenMW/openmw!3631
2023-12-20 12:35:41 +03:00
Alexei Kotov
d97563c830 Merge branch 'csicorruption' into 'master'
Allow ModPCCrimeLevel to clear crimes and cap bounties

Closes #7416

See merge request OpenMW/openmw!3664
2023-12-20 08:24:14 +00:00
Alexei Kotov
7074ea02b7 Merge branch 'qt_fix' into 'master'
Register language selector properly

Closes #7727

See merge request OpenMW/openmw!3666
2023-12-20 04:15:17 +00:00
Evil Eye
8a1ca870eb Stop infighting when gaining new allies 2023-12-19 21:23:10 +01:00
Andrei Kortunov
e6690bbcc7 Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR 2023-12-19 19:58:52 +04:00
Evil Eye
36b61d7074 Merge branch 'copy-that' into 'master'
Feat(CS): Implement Instance Cloning

See merge request OpenMW/openmw!3654
2023-12-19 11:27:51 +00:00
Andrei Kortunov
2e041073fc Move *.ui files for different applications to different folders 2023-12-19 15:21:08 +04:00
Andrei Kortunov
8d06a99507 Register language selector properly 2023-12-19 10:20:31 +04:00
Mads Buvik Sandvei
00b1cd8c08 Replace movement() with eraseMovementIf() 2023-12-18 22:50:45 +01:00
Mads Buvik Sandvei
5a6dbf8714 Comments 2023-12-18 22:43:45 +01:00
Evil Eye
94b129cc62 Stop combat when stacking a new AI package 2023-12-18 22:18:26 +01:00
Evil Eye
77cf9284b7 Allow ModPCCrimeLevel to clear crimes and cap bounties 2023-12-18 21:52:17 +01:00
Alexei Kotov
7922f0e7f8 Merge branch 'editor_modifier_settings' into 'master'
Use settings values to declare modifier settings (#6876)

See merge request OpenMW/openmw!3656
2023-12-18 00:37:55 +00:00
jvoisin
2c1810c6db Merge branch 'hoteltransylvania' into 'master'
Outlaw vampires and werewolves (bugs #7723, #7724)

Closes #7723 and #7724

See merge request OpenMW/openmw!3661
2023-12-17 19:08:32 +00:00
Evil Eye
88731f864e Add imports 2023-12-17 15:21:12 +01:00
Evil Eye
37415b0382 Don't use getExact to read structs 2023-12-17 15:16:32 +01:00
Evil Eye
dbf9d42cc5 Remove sized reads from essimporter 2023-12-17 14:03:45 +01:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01:00
Alexei Kotov
82982bbc05 Outlaw vampires and werewolves (bugs #7723, #7724) 2023-12-15 23:46:10 +03:00
jvoisin
ec480db9ac Merge branch 'constanteffect' into 'master'
For constant enchantments, allow on-self range for any effect (bug #7643)

Closes #7643

See merge request OpenMW/openmw!3657
2023-12-15 13:35:47 +00:00
Alexei Kotov
46dc290b75 Merge branch 'more_localizable' into 'master'
Make hardcoded strings in Launcher and Wizard localizable

See merge request OpenMW/openmw!3630
2023-12-15 04:41:31 +00:00
Alexei Kotov
ba7932f21c Merge branch 'fix_cs_settings_key_bindings_page' into 'master'
Fix CS Key Binding settings page

See merge request OpenMW/openmw!3655
2023-12-15 03:31:55 +00:00
jvoisin
c969aa42b7 Merge branch 'aifollow' into 'master'
Base AiFollow activation range on follow distance (bug #7685)

Closes #7685

See merge request OpenMW/openmw!3652
2023-12-14 20:14:20 +00:00
Alexei Kotov
27bd70a976 For constant enchantments, allow on-self range for any effect (bug #7643) 2023-12-14 15:55:24 +03:00
elsid
a29ae07957
Fix CS Key Binding settings page
This got broken by e07d8f3066. Creating QGridLayout with parent and setting it
later has not the same effect.
2023-12-14 00:29:18 +01:00
elsid
11db9eec1d
Use settings values to declare modifier settings 2023-12-13 23:29:35 +01:00
Dave Corley
bc662aeb63 Fix(CS): Fix minor issue in deleteSelectedInstances impl which caused it
to run twice
2023-12-13 16:06:46 -06:00
Dave Corley
7069a970ae Feat(CS): Implement instance cloning 2023-12-13 16:06:46 -06:00
Dave Corley
2bb8ceef56 Fix(CS): Correct invalid refNum for cloned objects so they actually
appear ingame
2023-12-13 16:06:46 -06:00
Dave Corley
2a747529bb Feat(CS): Add new shortcut for duplicating instances 2023-12-13 16:06:46 -06:00
Alexei Kotov
2628b02b4e NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822) 2023-12-14 00:48:40 +03:00
Alexei Kotov
5b02b77a39 Base AiFollow activation range on follow distance (bug #7685) 2023-12-13 20:18:20 +03:00
Alexei Kotov
4dfd2b0f46 Merge branch 'lessassertiveschooling' into 'master'
Don't assert that spells have a school

See merge request OpenMW/openmw!3651
2023-12-13 17:14:29 +00:00
Alexei Kotov
7e3270abc9 Merge branch 'unsave' into 'master'
Drop support for saves made prior to 0.40

See merge request OpenMW/openmw!3645
2023-12-13 00:33:20 +00:00
Evil Eye
a0694d4134 Don't assert that spells have a school 2023-12-12 22:11:32 +01:00
Evil Eye
78da1eb41f Merge branch 'settings_values_editor_2' into 'master'
Use settings values for editor (#6876)

See merge request OpenMW/openmw!3633
2023-12-12 17:00:43 +00:00
Alexei Kotov
ad8392b7d1 Merge branch 'awholelottanothing' into 'master'
Don't crash on spells or enchantments without effects

Closes #7712

See merge request OpenMW/openmw!3643
2023-12-11 13:02:51 +00:00
Alexei Kotov
21ca9ba34b Merge branch 'crashtainer' into 'master'
Use the right getContainerStore

Closes #7658

See merge request OpenMW/openmw!3644
2023-12-11 12:25:33 +00:00
Andrei Kortunov
ca19f7006c Make hardcoded strings in Launcher and Wizard localizable 2023-12-11 12:02:43 +04:00
jvoisin
47b87f1ff2 Merge branch 'reanimaterescaling' into 'master'
Restore animated collision shape rescaling (take 3)

See merge request OpenMW/openmw!3635
2023-12-10 12:55:57 +00:00
Mads Buvik Sandvei
76232c49df clang format 2023-12-09 20:42:14 +01:00
Alexei Kotov
f269b25bd0 Remove unused field 2023-12-09 22:00:35 +03:00
Evil Eye
7b8c0d1d88 Remove dropped formats from tests 2023-12-09 19:00:42 +01:00
Evil Eye
41dc409238 Don't consider empty effect lists exceptional 2023-12-09 18:20:10 +01:00
Evil Eye
521cff08f8 Drop support for save game format 1 2023-12-09 17:22:11 +01:00
Mads Buvik Sandvei
c79446818e Add a flag for jump when queueing movement, so inertia can be added accurately. 2023-12-09 16:48:04 +01:00
Evil Eye
4062f0225b Use the right getContainerStore 2023-12-09 16:13:56 +01:00
Mads Buvik Sandvei
32d391f548 Revert accumulating movement in the reset accum root callback. 2023-12-09 15:50:17 +01:00
Evil Eye
0da620b3f9 Don't crash on spells or enchantments without effects 2023-12-09 15:40:23 +01:00
Mads Buvik Sandvei
af9312d869 clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
15c143e272 Comment 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
26817e9cc5 Change the comparison of positions to avoid a problem if both positions are large numbers. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
0037fd78c1 Use std::numeric_limits<float>::epsilon() instead of picking our own epsilon. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
edf8c3b81c mSteps should be an int. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
aa30ec81d6 more clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
18a6422c1c clang format 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
28eeef59bc Reduce movement solver same-position epsilon size. The previous value causes very stable idles to very slightly slide. 2023-12-09 14:50:02 +01:00
Mads Buvik Sandvei
81095686bf Reset mPreviousAccumulatePosition when not accumulating to avoid an instant transition when resuming idle anims. 2023-12-09 14:49:58 +01:00
Mads Buvik Sandvei
cedc5289d7 Dejank movement solver vs animation movement accumulation 2023-12-09 14:49:42 +01:00
elsid
1a39ef07c8
Fix build with Lua 5.4.6
/home/elsid/dev/openmw/apps/openmw/mwlua/luamanagerimp.cpp: In member function ‘void MWLua::LuaManager::update()’:
/home/elsid/dev/openmw/apps/openmw/mwlua/luamanagerimp.cpp:127:19: error: use of deleted function ‘Settings::SettingValue<T>::SettingValue(const Settings::SettingValue<T>&) [with T = int]’
  127 |             lua_gc(mLua.sol(), LUA_GCSTEP, Settings::lua().mGcStepsPerFrame);
      |             ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/elsid/dev/openmw/components/settings/categories/camera.hpp:5,
                 from /home/elsid/dev/openmw/components/settings/values.hpp:4,
                 from /home/elsid/dev/openmw/apps/openmw/mwlua/luamanagerimp.cpp:16:
/home/elsid/dev/openmw/components/settings/settingvalue.hpp:355:9: note: declared here
  355 |         SettingValue(const SettingValue& other) = delete;
      |         ^~~~~~~~~~~~
2023-12-08 00:46:15 +01:00
Alexei Kotov
571a097be7 Merge branch 'avoid_copies' into 'master'
Avoid redundant copies

See merge request OpenMW/openmw!3637
2023-12-07 18:42:42 +00:00
Andrei Kortunov
6f68df9ac2 Avoid redundant copies 2023-12-06 23:45:25 +04:00
jvoisin
b67d89f2e0 Merge branch 'saveformat' into 'master'
Drop support for old saves

See merge request OpenMW/openmw!3629
2023-12-06 12:33:07 +00:00
Zackhasacat
0ff9831c92 Merge branch 'ondeath' into 'master'
Add a death event to the Lua API

See merge request OpenMW/openmw!3555
2023-12-06 04:21:56 +00:00
Alexei Kotov
754c5a8e2a Restore animated collision shape rescaling 2023-12-06 00:54:54 +03:00
Mads Buvik Sandvei
f6a6c278dd More cleanup of scripted animations 2023-12-05 14:13:35 +00:00
Evil Eye
7cdf702a14 Merge branch 'niftestbsatool' into 'master'
bsatool and NIF debugging improvements

See merge request OpenMW/openmw!3619
2023-12-04 19:24:10 +00:00
Evil Eye
efb819b9d2 Rename to Died 2023-12-04 17:50:18 +01:00