1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 23:15:35 +00:00
Commit graph

21859 commits

Author SHA1 Message Date
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
f80cd06256 Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us 2023-12-12 22:06:52 +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
Evil Eye
ad68b7e18b Turn onDeath the engine handler into OnDeath the regular event 2023-12-04 17:32:38 +01:00
Evil Eye
8cf99822ed Add a death event to the Lua API 2023-12-04 17:11:51 +01:00
Alexei Kotov
b93291840e BulletNifLoader: Handle NiSkinPartition
Add NiSkinPartition recovery helper method
2023-12-04 15:53:24 +03:00
Alexei Kotov
53f5e4dd3c Merge branch 'highlight_color' into 'master'
Highlight new items in launcher by text formatting, not by color

See merge request OpenMW/openmw!3625
2023-12-03 20:29:25 +00:00
Alexei Kotov
98dfb68d4a Merge branch 'ejaansalah' into 'master'
Fix the spelling of expel in lua api

See merge request OpenMW/openmw!3608
2023-12-03 20:28:01 +00:00
elsid
e1a68d8cf5
Ignore absent default setting value 2023-12-03 17:18:26 +01:00
elsid
4c13ecea23
Use settings values for editor 2023-12-03 17:18:26 +01:00
elsid
88a6ecabae
Add lookup index to editor settings category
Prevent adding duplicate settings there.
2023-12-03 17:18:25 +01:00
Alexei Kotov
7c63522870 Merge branch 'settings_values_editor_1' into 'master'
Define editor settings as typed struct members (#6876)

See merge request OpenMW/openmw!3597
2023-12-02 13:51:00 +00:00
Alexei Kotov
152a5aafdb Merge branch 'Slidy-creep' into 'master'
Update idle state when anim queue is not empty.

See merge request OpenMW/openmw!3602
2023-12-01 20:24:04 +00:00
Evil Eye
194bcb0187 Drop support for save game format 0 (pre 0.37) 2023-12-01 16:37:29 +01:00
Evil Eye
23aacbd914 Introduce a minimum supported save game format 2023-12-01 16:37:29 +01:00
Evil Eye
8d8e970aba Merge branch 'message_formatting' into 'master'
Do not include formatting spaces to localizable strings

See merge request OpenMW/openmw!3624
2023-12-01 15:36:22 +00:00
Mads Buvik Sandvei
f4cc16e469 feedback 2023-11-30 21:46:00 +01:00
Mads Buvik Sandvei
b7a4cb0c83 The anim queue should still update when underwater. CharState_SpecialIdle should be retained until the animation queue is done. 2023-11-30 21:45:59 +01:00
Alexei Kotov
b96600a7fb Make niftest exceptions more informative 2023-11-30 22:35:46 +03:00
Andrei Kortunov
c5b16d1ba2 Do not include formatting spaces to localizable strings 2023-11-30 13:06:50 +04:00
Evil Eye
76172c73f3 Merge branch 'fix_restocking_remove' into 'master'
Fix Lua remove interacting with restocking items

See merge request OpenMW/openmw!3615
2023-11-29 15:43:23 +00:00
jvoisin
d230c89a56 Merge branch 'rework_resolutions' into 'master'
Rework resolution selection

Closes #7709

See merge request OpenMW/openmw!3622
2023-11-29 13:18:20 +00:00
Andrei Kortunov
5e96825e6b Highlight new items in launcher by text formatting, not by color 2023-11-29 11:14:44 +04:00
Zackhasacat
ae3f9f8dcf Merge branch 'lua_ui_child_element' into 'master'
Lua Element as layout children

See merge request OpenMW/openmw!3582
2023-11-28 21:54:55 +00:00
Andrei Kortunov
623510c073 Use multiplication character in the launcher instead of 'x' 2023-11-28 22:47:27 +04:00
Andrei Kortunov
81a6a7cd2f Rework resolution selection (feature 7709) 2023-11-28 22:22:34 +04:00
Alexei Kotov
3bf5b150c5 bsatool: Support extracting files with forward slash paths 2023-11-27 03:09:38 +03:00
Alexei Kotov
3be0ee824a niftest updates
Properly read archives within the supplied data directories
Don't print quote marks redundantly
Reduce code duplication
Improve logging
2023-11-27 03:09:38 +03:00
Andrei Kortunov
c945735f3b Fix resolution dropdown in the launcher 2023-11-26 19:07:38 +04:00
uramer
1841341da2 Fix Lua remove interacting with restocking items 2023-11-25 17:39:00 +01:00
jvoisin
d1fc34a0d9 Merge branch 'sdl2_cmake' into 'master'
Use SDL2 generate cmake files to find the package

See merge request OpenMW/openmw!3612
2023-11-25 15:02:47 +00:00
jvoisin
881f41cf79 Merge branch 'fix_hud' into 'master'
Fix HUD cleanup from main menu

See merge request OpenMW/openmw!3596
2023-11-25 15:02:13 +00:00
uramer
22dbb3e09a Merge branch 'ustringmestring' into 'master'
Use MyGUI::UString's new string_view support

See merge request OpenMW/openmw!3610
2023-11-25 14:23:59 +00:00
uramer
416fa331f1 Implement UI Element tostring 2023-11-24 20:36:45 +01:00
elsid
f08ab9af56
Use SDL2 generate cmake files to find the package 2023-11-24 15:56:54 +01:00
Alexei Kotov
9873ab25df Merge branch 'endoftheearth' into 'master'
Don't try to escort to nowhere

See merge request OpenMW/openmw!3603
2023-11-24 11:30:18 +00:00
Zackhasacat
5623a5cf01 Merge branch 'lua_sgetcurrent_conditionofitem_itemdata_idea' into 'master'
Lua API to get/set item condition

See merge request OpenMW/openmw!3421
2023-11-23 23:10:39 +00:00
Evil Eye
81b8328bdd Include UString 2023-11-23 19:52:18 +01:00
Evil Eye
da9b0c5119 Use MyGUI::UString's new string_view support 2023-11-22 22:02:06 +01:00
Zackhasacat
a38d17a918 Merge branch 'api_inconsistencies' into 'master'
Minor API inconsistencies

See merge request OpenMW/openmw!3601
2023-11-21 03:04:24 +00:00
uramer
c9eaeb47d5 Minor API inconsistencies 2023-11-21 03:04:24 +00:00
Zackhasacat
ad1d6c0d0f Merge branch 'find_nearest_nav_mesh_position' into 'master'
Add Navigator and Lua API function to find nearest position on navmesh

See merge request OpenMW/openmw!2681
2023-11-21 03:01:51 +00:00
Zackhasacat
f3770a2364 Merge branch 'i-know-what-time-it-is' into 'master'
Fix(Log): Don't Put Timestamps Mid-Message

Closes #6982

See merge request OpenMW/openmw!3593
2023-11-21 03:00:36 +00:00
Dave Corley
5cc1b117ea Fix(Log): Don't Put Timestamps Mid-Message 2023-11-21 03:00:36 +00:00
Zackhasacat
abd2c5326f Merge branch 'makealchemygreatagain' into 'master'
Allow choosing different apparatus in alchemy window

Closes #7665

See merge request OpenMW/openmw!3580
2023-11-20 18:08:06 +00:00
kuyondo
9ebbdc3a22 expell->expel 2023-11-20 15:59:11 +08:00
Zackhasacat
6fb6c7a32f Merge branch 'misisng_plugins' into 'master'
Display missing plugins upon savegame loading

Closes #7608

See merge request OpenMW/openmw!3594
2023-11-20 00:19:43 +00:00
kuyondo
a96c038f19 prefer previous tools over best tools 2023-11-19 19:10:12 +08:00
Evil Eye
8ca6f1ad49 Use destination cell 2023-11-19 10:53:50 +01:00
Evil Eye
1b820b980a Don't try to escort to nowhere 2023-11-19 10:25:20 +01:00
elsid
94b085af9e
Add Navigator and Lua API function to find nearest position on navmesh 2023-11-18 23:54:37 +01:00
elsid
1322f7b75b
Deduplicate height field data definition 2023-11-18 22:38:00 +01:00
elsid
9c526b6639
Add Navigator test for zero distance path 2023-11-18 22:35:10 +01:00
Evil Eye
5a1a54b959 Merge branch 'lua_class_data' into 'master'
Add class records to lua

See merge request OpenMW/openmw!3515
2023-11-18 20:55:45 +00:00
Andrei Kortunov
9bbb89e268 Allow to set default focus for interactive messagebox 2023-11-18 18:00:40 +04:00
Andrei Kortunov
ff418f16f2 Do not wait one frame for blocking messageboxes 2023-11-18 16:47:06 +04:00
Andrei Kortunov
f88b99201a Display missing plugins upon savegame loading (feature 7608) 2023-11-18 14:12:18 +04:00
Evil Eye
63875a7954 Merge branch 'concepts' into 'master'
Use concepts for some argument types

See merge request OpenMW/openmw!3598
2023-11-18 09:59:39 +00:00
jvoisin
2150e4cae6 Merge branch 'warningfixes' into 'master'
Fix warnings

See merge request OpenMW/openmw!3587
2023-11-17 23:41:47 +00:00
Zackhasacat
3e3a39539c Reorder, remove comment 2023-11-17 14:51:19 -06:00
Zackhasacat
13deb0fba8 Merge branch 'imod' into 'master'
Fill out item modification records and add them to the scene

See merge request OpenMW/openmw!3540
2023-11-17 18:22:17 +00:00
kuyondo
d2d99a4348 give gcc satisfaction 2023-11-18 01:04:31 +08:00
kuyondo
f3ad16620a refactor and maintenance alchemywindow and alchemy 2023-11-18 00:41:44 +08:00
kuyondo
60711cedb0 use std::distance 2023-11-17 23:20:20 +08:00
Kindi
6d0dceae34 Allow choosing different apparatus in alchemy window 2023-11-17 23:16:09 +08:00
Andrei Kortunov
99939022bd Remove redundant code 2023-11-17 11:18:59 +04:00
Andrei Kortunov
fa8f92b5ab Do not keep outdated references in the UserData 2023-11-17 11:13:13 +04:00
Andrei Kortunov
1440bcaf2a Fix HUD cleanup from main menu 2023-11-17 10:38:58 +04:00
elsid
b17afc4641
Use concepts for some argument types 2023-11-16 22:22:46 +01:00
elsid
fb0b95a2dd
Define editor settings as typed struct members 2023-11-16 22:14:58 +01:00
elsid
755fef62f7
Mark State copy constructor and assignment operators as delete 2023-11-16 22:05:05 +01:00
elsid
e07d8f3066
Add separate setting type for subcategory 2023-11-16 22:05:05 +01:00
elsid
fb6e429dad
Remove "separators" from cs settings
Those are just empty widgets which do not make significant visible difference in
the UI.
2023-11-16 22:05:05 +01:00
elsid
335dbffe6e
Avoid std::string to QString conversion for label 2023-11-16 22:05:05 +01:00
Zackhasacat
35da9578ca Merge gitlab.com:openmw/openmw into lua_class_data 2023-11-16 11:33:44 -06:00
Zackhasacat
bc63737488 Update Formatting 2023-11-16 11:20:08 -06:00
uramer
6484e2e411 Merge branch 'serices_are_readonly' into 'master'
Make actor.providedServices read only

See merge request OpenMW/openmw!3570
2023-11-16 15:23:09 +00:00
Zackhasacat
cbfcd21d98 Make actor.providedServices read only 2023-11-16 15:23:09 +00:00
Andrei Kortunov
ba71eefbae Fix GCC warnings 2023-11-16 18:53:46 +04:00
Zackhasacat
16f178b80e Remove character 2023-11-16 07:43:45 -06:00
Zackhasacat
10030a55e0 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-11-16 07:37:03 -06:00
Zackhasacat
a2b47f44d2 Fix misspelling 2023-11-16 07:36:40 -06:00
Alexei Kotov
d495e5af62 Merge branch 'missing_settings_values' into 'master'
Use settings values for missed cases (#6876)

See merge request OpenMW/openmw!3589
2023-11-16 11:54:04 +00:00
jvoisin
edd69885ce Merge branch 'fixpartialequipagain' into 'master'
Properly reset variable for partial equipping

See merge request OpenMW/openmw!3586
2023-11-15 22:39:34 +00:00
jvoisin
9b1cb99b1a Merge branch 'ncroot' into 'master'
Improve BulletNifLoader handling of extra data

See merge request OpenMW/openmw!3590
2023-11-15 22:37:57 +00:00
jvoisin
710b560f91 Merge branch 'dont_reset_luminance' into 'master'
consistent average scene luminance (#7679)

See merge request OpenMW/openmw!3579
2023-11-14 10:56:26 +00:00
Alexei Kotov
c7d5ea9fbf Improve BulletNifLoader handling of extra data
Only handle extra data for the root node(s)
Properly handle MRK flag editor marker filtering
Fix BSXFlags test
2023-11-14 01:30:36 +03:00
elsid
1fa5d2ca98
Use settings values for GUI tags 2023-11-12 16:33:48 +01:00
elsid
8f27178a0b
Use settings values for navigator in the launcher 2023-11-12 16:33:44 +01:00
elsid
01316f15b8
Avoid redundant conversion to string 2023-11-12 16:33:38 +01:00
Andrei Kortunov
155b07f341 Do not update WindowManager by world data when there is no game 2023-11-12 12:23:29 +04:00
kuyondo
a2de470804 minor partial equipping fix 2023-11-12 12:22:35 +08:00
uramer
fe68ff7807 Merge branch 'controller_can_tab' into 'master'
Allow Shoulder Buttons on Controller to act as Tab and Shift Tab in menus

Closes #7554

See merge request OpenMW/openmw!3397
2023-11-11 16:30:16 +00:00
Zackhasacat
96178a2605 Allow Shoulder Buttons on Controller to act as Tab and Shift Tab in menus 2023-11-11 16:30:16 +00:00
Cody Glassman
85fcfbafda apply same logic to render targets, remove UB 2023-11-10 21:22:11 -08:00
Cody Glassman
dec120f38c consistent average scene luminance 2023-11-10 21:00:47 -08:00
Alexei Kotov
49f13c53c0 Merge branch 'makeunlocksoundwhenlocking' into 'master'
Play a sound when lock spell succeeds

See merge request OpenMW/openmw!3578
2023-11-09 20:00:55 +00:00
jvoisin
9fb5fe26e6 Merge branch 'render_target_fixes' into 'master'
[Postprocessing] Fix dirty flag and share luminance calculator between frames

See merge request OpenMW/openmw!3566
2023-11-08 22:50:51 +00:00
Cody Glassman
cdaa44f24c [Postprocessing] Fix dirty flag and share luminance calculator between frames 2023-11-08 22:50:50 +00:00
jvoisin
32a9581394 Merge branch 'deepdepths' into 'master'
Depth flag handling fixes (bug #7380)

See merge request OpenMW/openmw!3568
2023-11-08 22:47:29 +00:00
AnyOldName3
9b6d82566f Merge branch 'unbound' into 'master'
Don't use Bounding Box node bounds as the original collision shape

See merge request OpenMW/openmw!3562
2023-11-08 16:33:16 +00:00
Kindi
a7a48aaa91 make successful lockspell play unlock sound 2023-11-09 00:27:07 +08:00
Zackhasacat
ec81bd7f1b rename specilizationIndexToLuaId 2023-11-07 12:01:54 -06:00
Zackhasacat
cb705ff02a Revert redundant changes 2023-11-07 11:52:53 -06:00
Zackhasacat
ae4eafdfd4 Move classes to types.NPC 2023-11-07 11:50:09 -06:00
Zackhasacat
81da58478d Remove test use 2023-11-07 11:41:14 -06:00
Zackhasacat
76f872aaa2 use std:;array 2023-11-07 11:40:43 -06:00
Evil Eye
76843aff19 Merge branch 'getcellnametes4' into 'master'
Use the display name instead of the editor ID for World::getCellName

See merge request OpenMW/openmw!3564
2023-11-07 16:45:55 +00:00
Evil Eye
5356f54526 Merge branch 'savedgamehealth' into 'master'
Cast displayed health to int in saved game dialog (#7656)

Closes #7656

See merge request OpenMW/openmw!3563
2023-11-07 16:45:42 +00:00
Alexei Kotov
48c1c2cf08 Merge branch 'partialequippingp2' into 'master'
Fix partial ammo equipping

See merge request OpenMW/openmw!3434
2023-11-07 03:55:58 +00:00
Zackhasacat
5a0de322a3 Merge branch 'fix_use_item' into 'master'
Fix #7674

Closes #7674

See merge request OpenMW/openmw!3567
2023-11-07 03:07:43 +00:00
Alexei Kotov
bdc019647a Merge branch 'figure-skaters' into 'master'
Use accumulated movement when possible

Closes #5062

See merge request OpenMW/openmw!3549
2023-11-07 03:01:56 +00:00
Alexei Kotov
d5dbbfb570 Merge branch '75_chameleon' into 'master'
Make "isTargetMagicallyHidden" include 75% Chameleon

See merge request OpenMW/openmw!3565
2023-11-07 02:59:37 +00:00
Abdu Sharif
0f3dba28a7 Consider 75% Chameleon magical invisibility as well 2023-11-07 02:59:37 +00:00
Alexei Kotov
116ef1c62b Depth flag handling fixes (bug #7380)
Properly disable depth test while allowing depth writes to happen
Remove NiStencilProperty interaction
Don't set up depth flags for BSShaderPPLightingProperty
2023-11-06 02:19:56 +03:00
Petr Mikheev
a60726ce35 Fix #7674 2023-11-05 21:32:18 +01:00
Zackhasacat
231803c6ea Merge branch 'sunvisibility' into 'master'
Make sun specularity behavior more intuitive (bug #6190)

Closes #6190

See merge request OpenMW/openmw!3535
2023-11-05 17:55:27 +00:00
jvoisin
e88f8e09c3 Merge branch 'fixed' into 'master'
Replace more variable width integers in ESM code

See merge request OpenMW/openmw!3518
2023-11-05 16:36:13 +00:00
jvoisin
e4c5c1bc43 Merge branch 'govna' into 'master'
Expose governing attributes to Lua

See merge request OpenMW/openmw!3556
2023-11-05 16:35:27 +00:00
jvoisin
44dc29e675 Merge branch 'forurm' into 'master'
Add types.Actor.isDead

See merge request OpenMW/openmw!3557
2023-11-05 16:35:09 +00:00
Mads Buvik Sandvei
acf6178ea5 movement = movementFromAnimation; also when speed is 0. 2023-11-05 16:46:11 +01:00
Evil Eye
9fe0e4c035 Merge branch 'bsshaderdepth' into 'master'
Support BSShader/BSLightingShader depth flags

See merge request OpenMW/openmw!3560
2023-11-05 09:03:31 +00:00
Evil Eye
776677fd70 Merge branch 'enchantmenttooltips' into 'master'
Validate enchantment records (bug #7654)

Closes #7654

See merge request OpenMW/openmw!3531
2023-11-05 09:02:14 +00:00
Alexei Kotov
88749b03d4 Use display name instead of editor ID for World::getCellName
Doesn't affect Morrowind cells, but allows TES4+ cells to have legible names
2023-11-05 05:07:04 +03:00
Mads Buvik Sandvei
e86a4ebafe Fixes based on comments by capo 2023-11-04 21:01:06 +01:00
Alexei Kotov
255d509c84 Merge branch 'fix_esmtool_output' into 'master'
Print uint8_t as unsigned in esmtool

See merge request OpenMW/openmw!3561
2023-11-04 18:51:06 +00:00
Mads Buvik Sandvei
9ebec27daf use const. 2023-11-04 16:18:36 +01:00
Mads Buvik Sandvei
c7c3a52e6a Clang 2023-11-04 14:41:08 +01:00
Mads Buvik Sandvei
475bb1af65 Move calculating the animation direction into its own function to help simplify update(). Eliminate a pointless epsilon. 2023-11-04 14:34:41 +01:00
Mads Buvik Sandvei
1edc82062d Account for strafing when draw state is not nothing, and "turn to movement direction" is true 2023-11-04 14:13:02 +01:00
Mads Buvik Sandvei
68fe1361f1 Attempt at clarifying the code 2023-11-04 14:00:13 +01:00
Alexei Kotov
515a90e9e0 Cast displayed health to int in saved game dialog (#7656) 2023-11-04 04:30:40 +03:00
Zackhasacat
c311caef9a Redo specialization field 2023-11-03 17:19:53 -05:00
Alexei Kotov
2c1db92d04 Don't use Bounding Box node bounds as the original collision shape
Bounding Box node bounds are not used for non-actor collision in Morrowind and the generated box isn't actually used for actor collision in OpenMW
Preserving btBoxShape cloning code because it might get used in the future
2023-11-04 00:56:14 +03:00
elsid
7a0d1a0868
Print uint8_t as unsigned 2023-11-03 21:23:37 +01:00
Cody Glassman
9a5fa9b8d6 fix persistent buffers and glsl_version 2023-11-03 12:59:23 -07:00
AnyOldName3
e67135a517 Merge branch 'expiredborders' into 'master'
Fix #7621

Closes #7621

See merge request OpenMW/openmw!3533
2023-11-03 18:13:02 +00:00
Evil Eye
eb0ddf72d8 Merge branch 'fix_my_errors' into 'master'
Fix minor doc error, throw error when attempting to assign a value to a non-existing global variable in lua

See merge request OpenMW/openmw!3548
2023-11-03 16:31:23 +00:00
Zackhasacat
dd87d01f06 Fix minor doc error, throw error when attempting to assign a value to a non-existing global variable in lua 2023-11-03 16:31:23 +00:00
Alexei Kotov
af08205f19 Support BSShader/BSLightingShader depth flags 2023-11-03 18:38:01 +03:00
Alexei Kotov
876f6ea2da Validate enchantment records (bug #7654)
Clean up spell validation
Fix a flaw in spell effect tooltip code
2023-11-03 15:08:16 +03:00
AnyOldName3
07594037ca Merge branch 'settings_values_shadows' into 'master'
Use settings values for Shadows settings (#6876)

See merge request OpenMW/openmw!3550
2023-11-03 11:35:58 +00:00
Alexei Kotov
410fc17159 Merge branch 'fo4_abc' into 'master'
Use correct template flags for FO4 NPCs

See merge request OpenMW/openmw!3544
2023-11-03 01:30:08 +00:00
Evil Eye
1e06d74f82 Fix #7621 2023-11-02 21:53:22 +01:00
Mads Buvik Sandvei
9c93d907dc Settings page entry for the "player movement ignores animation" setting. 2023-11-02 19:30:51 +01:00
Evil Eye
2d90176fe9 Add types.Actor.isDead 2023-11-02 19:29:26 +01:00
Zackhasacat
ea3eeb6bad Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-11-02 13:00:20 -05:00
Zackhasacat
859b6c823f Fix includes 2023-11-02 12:21:59 -05:00
Zackhasacat
25fe42de10 Spacing 2023-11-02 12:17:55 -05:00
Zackhasacat
3c0c699e42 Do not use const 2023-11-02 12:15:48 -05:00
Zackhasacat
685c02bd73 Re-add missing line 2023-11-02 12:10:52 -05:00
Zackhasacat
e54eba7043 Formatting fixes 2023-11-02 12:08:07 -05:00
Evil Eye
a88f0ecc95 Expose governing attributes to Lua 2023-11-02 17:43:09 +01:00
Evil Eye
3baefdf29e Merge branch 'invisibilityagain' into 'master'
Improve invisibility breaking consistency (bug #7660)

Closes #7660

See merge request OpenMW/openmw!3539
2023-11-02 16:00:41 +00:00
elsid
f4efbcc1c4
Use settings values for Shadows settings 2023-11-02 16:36:44 +01:00
Alexei Kotov
4445a55084 Merge branch 'font_fix' into 'master'
Fix TrueType fonts scaling

See merge request OpenMW/openmw!3541
2023-11-02 13:09:17 +00:00
Mads Buvik Sandvei
452f7a470e fabsf -> abs 2023-11-01 23:19:13 +01:00
Mads Buvik Sandvei
a0f8bbc621 Bad merge 2023-11-01 20:34:39 +01:00
Mads Buvik Sandvei
f41de6b02d Use accumulated movement whenever possible. Apply diagonal movement by rotating accumulated movement and sliding based on that, rather than ignoring accumulated movement. 2023-11-01 20:31:57 +01:00
Mads Buvik Sandvei
93b723a066 Apply legs yaw to accumulated movement. 2023-11-01 20:30:26 +01:00
Zackhasacat
67e74936ff Make classes Read Only 2023-11-01 13:23:32 -05:00
Zackhasacat
482d174ef2 Read only, add skill spec to docs 2023-11-01 13:21:14 -05:00
jvoisin
d3ccc246c5 Apply 1 suggestion(s) to 1 file(s) 2023-11-01 12:03:49 +00:00
Petr Mikheev
4c6e081da3 Skip zero links to ArmorAddons 2023-11-01 10:30:19 +01:00
Zackhasacat
371eeddf85 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-10-31 22:23:45 -05:00
Petr Mikheev
6c01ce2672 Use correct template flags for FONV and FO4 NPCs 2023-10-31 23:48:29 +01:00
Cody Glassman
7e9690e531 [renderer] render scene exclusively to fbo 2023-10-31 14:45:31 -07:00
Alexei Kotov
bff4666b7b Merge branch 'dont_save_esm4' into 'master'
Stop trying to save ESM4 objects in omwsave files

See merge request OpenMW/openmw!3537
2023-10-31 21:33:34 +00:00
Alexei Kotov
629fe8ce81 Merge branch 'we-all-know-actors-cant-read' into 'master'
Some cleanup of scripted animation handling.

Closes #4742, #7637, and #7636

See merge request OpenMW/openmw!3522
2023-10-31 21:31:58 +00:00
Alexei Kotov
6e069161a4 Merge branch 'sortalphabetcalinrechargeandrepairmenu' into 'master'
Sort repair and recharge menu list alphabetically

See merge request OpenMW/openmw!3524
2023-10-31 21:27:43 +00:00
Kindi
733a6e01ad Sort repair and recharge menu list alphabetically (bug #7642) 2023-10-31 21:27:42 +00:00
Alexei Kotov
0b8739711e Merge branch 'settings_values_video' into 'master'
Use settings values for Video settings (#6876)

See merge request OpenMW/openmw!3527
2023-10-31 21:24:53 +00:00
Alexei Kotov
c49c401441 Merge branch 'settings_values_stereo' into 'master'
Use settings values for Stereo settings (#6876)

See merge request OpenMW/openmw!3530
2023-10-31 21:21:32 +00:00
Petr Mikheev
dafe858cb4 Add types.Player.sendMenuEvent 2023-10-31 11:05:00 +01:00
Petr Mikheev
1490f6f082 Fix: lower content file names in menu.getSaves 2023-10-31 11:05:00 +01:00
Petr Mikheev
889ddc10d6 Enable openmw.input in menu scripts 2023-10-31 11:05:00 +01:00
Petr Mikheev
1dd7a15255 Draft: add new type of Lua scripts - menu scripts 2023-10-31 10:29:24 +01:00
Andrei Kortunov
377d8c905c Fix TrueType fonts scaling 2023-10-31 10:59:57 +04:00
Alexei Kotov
03c3818229 Place ESM4::ItemMod into the scene 2023-10-31 00:54:44 +03:00
Alexei Kotov
3d5b06a78e Sort inactive shader list (#7652) 2023-10-30 23:46:25 +03:00
Alexei Kotov
2d38ca4c35 Improve invisibility breaking consistency (bug #7660)
- Break on recharge attempts
- Break on repair attempts
- Break on potion creation attempts
- Don't break on failed ingredient consuming
2023-10-30 15:30:01 +03:00
Kindi
3761797467 reimplement partial equipping 2023-10-30 11:20:34 +08:00
Petr Mikheev
e51dfca488 Stop trying to save ESM4 objects in omwsave files because they currently can not be saved and only lead to errors in logs. 2023-10-29 22:41:53 +01:00
Petr Mikheev
62b787a214 Merge branch 'ltexmstt' into 'master'
Add movable static and ESM4 land texture stores, don't show tooltips for unnamed ESM4Named objects

See merge request OpenMW/openmw!3528
2023-10-29 20:02:07 +00:00
Alexei Kotov
a891965d20 Merge branch 'uimodechanged' into 'master'
Queue Lua handler `uiModeChanged`

See merge request OpenMW/openmw!3509
2023-10-29 19:20:59 +00:00
Mads Buvik Sandvei
58e3fdac36 Clang format 2023-10-29 16:32:35 +01:00
Mads Buvik Sandvei
85f104fefe Comments from Capo 2023-10-29 15:33:07 +01:00
Mads Buvik Sandvei
afb9fa06d7 clang format 2023-10-29 14:54:01 +01:00
Mads Buvik Sandvei
70f41b22b6 Based on the reason for closing !1845, we *should* let a scripted animation get stuck forever if the animation was already playing. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
cf5b782c76 More persist -> script language. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
426f5952a5 Prevent movement only when *scripted* animations are playing. Otherwise idle animations of wandering NPCs will slide. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
a9ade184d8 mLoopCount is the number of *remaining* loops. So we should be checking for >0, not >1. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
92a5e52407 rename "persisted" animations to "scripted", because that is what they actually are. And begin teaching the animation system to distinguish between a scripted and an unscripted animation. 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
24890a729b clang'd 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
8792e76f5d explicitly prevent movement whenever playing scripted animations 2023-10-29 14:53:03 +01:00
Mads Buvik Sandvei
cdb325f19a Rewrite CharacterController::updateAnimQueue() to properly maintain the animation queue and clean up finished animations. 2023-10-29 14:53:03 +01:00
Alexei Kotov
50f3b81096 Merge branch 'settings_values_terrain' into 'master'
Use settings values for Terrain settings (#6876)

See merge request OpenMW/openmw!3529
2023-10-29 13:15:54 +00:00
Alexei Kotov
e6137cff73 Merge branch 'tapdancers' into 'master'
AiWander must update wandering manually flag when resuming existing path.

Closes #7647

See merge request OpenMW/openmw!3526
2023-10-29 13:10:01 +00:00
uramer
1ec4681e40 Merge branch 'areyouthere' into 'master'
Add record presence early-outs for various script instructions (feature #7625)

Closes #7625

See merge request OpenMW/openmw!3501
2023-10-29 12:15:48 +00:00
Alexei Kotov
12abd30e9f Make sun specularity behavior more intuitive (bug #6190)
Remove sun visibility influence on object specularity
Subdue sun visibility influence on water specularity
2023-10-29 04:11:40 +03:00
Mads Buvik Sandvei
24bac3ebd4 AiWander must update mIsWanderingManually when resuming wander. 2023-10-29 01:07:46 +02:00
Evil Eye
6cd5734fb3 Rate weapons as useless if the actor's skill is 0 2023-10-28 10:49:18 +02:00
elsid
bb7ac64f19
Use settings values for Stereo and Stereo View settings 2023-10-27 23:30:17 +02:00
elsid
561a6bf854
Avoid using camera settings from stereo manager 2023-10-27 23:29:07 +02:00
elsid
7e5a1cec04
Use settings values for Terrain settings 2023-10-27 22:32:20 +02:00
Alexei Kotov
84cad3de01 Don't show tooltips for unnamed ESM4Named 2023-10-27 22:53:40 +03:00
Alexei Kotov
3f4591eb3b Add movable static and ESM4 land texture stores 2023-10-27 22:53:40 +03:00
psi29a
f724b05c57 Merge branch 'teleport_block' into 'master'
Lua: Add isTeleportingEnabled and setTeleportingEnabled to types.Player

See merge request OpenMW/openmw!3519
2023-10-27 17:37:04 +00:00
elsid
dcd81d026f
Use settings values for Video settings
* Convert window mode, vsync mode into enums, screenshot type into a struct.
* Add missing doc for screenshot type.
2023-10-27 14:31:23 +02:00
Zackhasacat
6a671186ee Removed unused var 2023-10-26 11:50:50 -05:00
psi29a
8380da2e1d Merge branch 'missmewiththatscript' into 'master'
Remove missing scripts from actors much like is done for items

Closes #7204

See merge request OpenMW/openmw!3502
2023-10-26 16:24:35 +00:00
psi29a
664caa2fc1 Merge branch 'iseeyou' into 'master'
Prevent fleeing in inappropriate situations (bug #6932)

Closes #6932

See merge request OpenMW/openmw!3508
2023-10-26 16:24:10 +00:00
psi29a
bdd0299fe7 Merge branch 'flyyouscamps' into 'master'
Allow talking with fleeing creatures (bug #7631)

Closes #7631

See merge request OpenMW/openmw!3510
2023-10-26 16:23:57 +00:00
psi29a
035004170c Merge branch 'datadirs' into 'master'
Launcher: Improve directory appending UX and heuristics (bug #7502)

Closes #7502

See merge request OpenMW/openmw!3490
2023-10-26 16:23:28 +00:00
Zackhasacat
c2943e2fd0 Use int32_t 2023-10-25 21:47:00 -05:00
Zackhasacat
2f16a104dc Revise record store, add specialization function 2023-10-25 21:38:42 -05:00
Zackhasacat
909be9cf35 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-10-25 21:05:35 -05:00
Zackhasacat
f0640da21e Add character to core 2023-10-25 21:05:14 -05:00
Zackhasacat
3e31142c0b Remove lua action 2023-10-25 17:24:18 -05:00
Kindi
1bff02e3b0 add docs 2023-10-26 03:32:15 +08:00
psi29a
6a87ba8f33 Merge branch 'mygui343_fix' into 'master'
Fix MyGUI 3.4.3 issues [#7528]

See merge request OpenMW/openmw!3319
2023-10-25 12:35:13 +00:00
psi29a
f3931c8321 Merge branch 'lua_hud_hide' into 'master'
Add functions to lua ui library to toggle HUD visibility, and check current status.

See merge request OpenMW/openmw!3450
2023-10-25 12:34:56 +00:00
Zackhasacat
ac9cfc782a Add functions to lua ui library to toggle HUD visibility, and check current status. 2023-10-25 12:34:56 +00:00
Alexei Kotov
e6c02efbb7 Add record presence early-outs for various script instructions (feature #7625)
AddItem, RemoveItem, StartScript, StopScript, AddTopic
2023-10-24 23:19:53 +03:00
Evil Eye
23bf6ed878 Remove missing scripts from actors much like is done for items 2023-10-24 20:59:45 +02:00
Zackhasacat
f4d349070c Add isTeleportingEnabled and setTeleportingEnabled 2023-10-24 13:51:12 -05:00
Evil Eye
dc781bad5d Use fixed size unsigned ints for inventory offsets 2023-10-24 17:51:12 +02:00
Zackhasacat
15bee21286 Fix caps 2023-10-24 09:30:00 -05:00
Petr Mikheev
f547cd5934 Merge branch 'lua_object_var' into 'master'
Add lua binding for gameObject globalVariable

See merge request OpenMW/openmw!3483
2023-10-24 13:55:51 +00:00
Zackhasacat
78e9a1753e Add lua binding for gameObject globalVariable 2023-10-24 13:55:50 +00:00
Petr Mikheev
31f5c8826b Merge branch 'lua_global_new' into 'master'
Add global variable access to world.mwscript (#7597)

See merge request OpenMW/openmw!3491
2023-10-24 09:23:25 +00:00
Zackhasacat
db42a91867 Add global variable access to world.mwscript (#7597) 2023-10-24 09:23:25 +00:00
Zackhasacat
254bf7c5d8 class -> classes 2023-10-23 22:23:30 -05:00
Zackhasacat
611f96ce65 Add class bindings 2023-10-23 22:19:16 -05:00
Mads Buvik Sandvei
354b028072 isMovementAnimationControlled should be private. 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
e893767ed0 Redundant line 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
45a2b8042d Derive the value of MovementAnimationControlled instead of storing it. 2023-10-22 17:23:27 +02:00
Mads Buvik Sandvei
dcf6a1fc3c Refresh mMovementAnimationControlled when refreshing idle animations. 2023-10-22 17:22:50 +02:00
Alexei Kotov
f68bd3ba97 Launcher: Improve directory appending UX and heuristics (bug #7502)
- Recognize more asset directories and omwgame files
- Always let the user append the selected directory
- Automatically pick the user-selected directory if it's the only valid directory
- Add a caption to directory selection dialog, properly handle cancellation
2023-10-22 16:20:19 +03:00
Alexei Kotov
3330907d7b Combat AI: Prefer picking reachable/visible targets (bug #6932) 2023-10-22 16:20:02 +03:00
Alexei Kotov
ee5ca066fd Allow talking with fleeing creatures (bug #7631) 2023-10-22 16:18:52 +03:00
Bret Curtis
1bd4860026 no more obsolete mygui shizzle for macos 2023-10-22 11:25:39 +02:00
psi29a
a08ca11c34 Merge branch 'boundingboxing' into 'master'
BulletNifLoader: Replicate node bounds handling more closely

See merge request OpenMW/openmw!3505
2023-10-22 08:52:23 +00:00
psi29a
631a3954b1 Merge branch 'notsocharmingnow' into 'master'
Don't apply Charm to creatures (bug #7630)

Closes #7630

See merge request OpenMW/openmw!3507
2023-10-22 08:52:04 +00:00
Petr Mikheev
4d66679204 Queue Lua handler uiModeChanged 2023-10-21 13:04:02 +02:00
Alexei Kotov
d0ffe6e2f9 Don't apply Charm to creatures (bug #7630) 2023-10-21 07:10:16 +03:00
Alexei Kotov
9405e5cb3c BulletNifLoader: Replicate node bounds handling more closely 2023-10-19 03:11:55 +03:00
Cody Glassman
5fc46b166a track debug window size and dimensions between sessions 2023-10-18 09:04:57 -07:00
Evil Eye
97009f1e23 Merge Assumeru/mystringvui 2023-10-17 23:53:04 +02:00
Bret Curtis
e97b07b6a4 additional cleanup 2023-10-17 23:53:04 +02:00
Bret Curtis
43a931d3c4 [#7528] Fix MyGUI 3.4.3 issues 2023-10-17 23:53:04 +02:00
psi29a
ed2e969802 Fix build 2023-10-17 20:10:19 +00:00
psi29a
798ff7062b Merge branch 'bullet' into 'master'
BulletNifLoader updates

See merge request OpenMW/openmw!3498
2023-10-17 07:40:45 +00:00
psi29a
9259f5c056 Merge branch 'merryweather' into 'master'
Replace more sized reads and change weather loading

See merge request OpenMW/openmw!3496
2023-10-16 20:06:59 +00:00
psi29a
97d9f9c4f3 Merge branch 'dont-lose-your-head' into 'master'
Add missing headers to components/CMakeLists.txt

See merge request OpenMW/openmw!3499
2023-10-16 20:06:47 +00:00
elsid
7ac402390a
Use settings values for Water settings 2023-10-15 23:24:46 +02:00
AnyOldName3
2ed584428c Add missing headers to components/CMakeLists.txt
Otherwise, they won't show up as part of the project in IDEs.
2023-10-15 15:44:24 +01:00
Kindi
7e087707cd fix potential miscalculation 2023-10-15 21:26:47 +08:00
Alexei Kotov
8db631c6b6 Update BSXFlags test 2023-10-15 15:32:59 +03:00
psi29a
febfa353e0 Merge branch 'save_metadata' into 'master'
Add additional fields to save metadata

See merge request OpenMW/openmw!3493
2023-10-15 11:42:02 +00:00
psi29a
03fa273394 Merge branch 'settings_values_sound' into 'master'
Use settings values for Sound settings (#6876)

See merge request OpenMW/openmw!3494
2023-10-15 11:41:30 +00:00
Evil Eye
fbafa13b3d Appease the compiler 2023-10-14 17:01:55 +02:00
Evil Eye
514723a4e6 Use fixed size ints for Region and use an array for weather odds 2023-10-14 16:36:45 +02:00
Evil Eye
2ebd544dfb Fix #7624 2023-10-14 14:18:50 +02:00
Andrei Kortunov
fc74cc49dd Add additional fields to save metadata (feature 7618) 2023-10-14 09:53:44 +04:00
elsid
a84e412a37
Use settings values for Sound settings 2023-10-13 12:58:58 +02:00
psi29a
fe5dbb7a25 Merge branch 'bsatool' into 'master'
Fix creating archives in bsatool

See merge request OpenMW/openmw!3484
2023-10-13 07:34:51 +00:00
psi29a
de11bbc008 Merge branch 'settings_values_shaders' into 'master'
Use settings values for Shaders settings (#6876)

See merge request OpenMW/openmw!3489
2023-10-13 07:34:43 +00:00
uramer
99461fd9b2 Merge branch 'control_switch' into 'master'
[Lua] Add CONTROL_SWITCH functions to `types.Player` and deprecate them in `openmw.input`

See merge request OpenMW/openmw!3487
2023-10-13 07:00:34 +00:00
elsid
08902371b4
Use settings values for Shaders settings 2023-10-12 20:43:53 +02:00
Kindi
58a16dacbe take2 resolve 2023-10-13 00:53:59 +08:00
Alexei Kotov
4b4c46fa70 Merge branch 'settings_values_saves' into 'master'
Use settings values for Saves settings (#6876)

See merge request OpenMW/openmw!3486
2023-10-11 21:35:48 +00:00
Alexei Kotov
8c58ec9c32 Merge branch 'esm4actors' into 'master'
Show ESM4 NPCs

See merge request OpenMW/openmw!3312
2023-10-11 21:33:14 +00:00
elsid
1038a68fbf
Use settings values for Saves settings 2023-10-10 20:39:52 +02:00
psi29a
01ee448c61 Merge branch 'settings_values_navigator' into 'master'
Use settings values for Navigator settings (#6876)

See merge request OpenMW/openmw!3468
2023-10-10 03:24:33 +00:00
Petr Mikheev
15306c7d49 [Lua] Add CONTROL_SWITCH functions to types.Player and deprecate them in openmw.input 2023-10-10 01:15:09 +02:00
psi29a
fb9fc91710 Merge branch 'settings_values_post_processing' into 'master'
Use settings values for Post Processing settings (#6876)

See merge request OpenMW/openmw!3480
2023-10-09 11:35:53 +00:00
psi29a
9534130906 Merge branch 'settings_values_physics' into 'master'
Use settings values for Physics settings (#6876)

See merge request OpenMW/openmw!3481
2023-10-09 11:35:43 +00:00
psi29a
ab631fcd70 Merge branch 'whosabaddoggo' into 'master'
Handle AllowWerewolfForceGreeting variable (bug #7609)

Closes #7609

See merge request OpenMW/openmw!3476
2023-10-09 11:35:16 +00:00
Alexei Kotov
1bd388faf3 Fix creating archives in bsatool 2023-10-09 07:07:53 +03:00
elsid
4a7886816e
Use settings values for Physics settings 2023-10-08 12:19:02 +02:00
elsid
7b4b8763ff
Use settings values for Post Processing settings 2023-10-08 11:58:16 +02:00
psi29a
575f43876b Merge branch 'fixedpath' into 'master'
Replace more sized reads and change path grid loading

See merge request OpenMW/openmw!3475
2023-10-08 02:18:43 +00:00
Petr Mikheev
3882a5f25a update 2023-10-07 17:21:25 +02:00
Petr Mikheev
b4552d47f6 Don't use ESM4 mHeadFeamleParts; switch from manually adding "meshes\\" to correctMeshPath 2023-10-07 17:21:25 +02:00
Petr Mikheev
1acac873cf Use "setObjectRoot" in esm4npcanimation.cpp 2023-10-07 17:21:25 +02:00
Petr Mikheev
4beed29404 Changes required during review 2023-10-07 17:21:25 +02:00
Petr Mikheev
2900351777 Render ESM4 NPCs 2023-10-07 17:21:25 +02:00
psi29a
d43493dd4c Merge branch 'idlestorm' into 'master'
Avoid redundant animation resets in updateIdleStormState

See merge request OpenMW/openmw!3473
2023-10-07 01:41:36 +00:00
Alexei Kotov
cecb2b71ea Handle AllowWerewolfForceGreeting variable (bug #7609) 2023-10-06 23:17:32 +03:00
Evil Eye
b99f58613e Remove signed/unsigned conversions in pathgrid loading code and use meaningful member names 2023-10-06 16:46:09 +02:00
psi29a
2c81220cf7 Merge branch 'book' into 'master'
Reading ESM4 books

See merge request OpenMW/openmw!3471
2023-10-05 17:24:50 +00:00
Alexei Kotov
79bda2e694 Avoid redundant animation resets in updateIdleStormState 2023-10-04 22:26:52 +03:00
psi29a
d9f8757f33 Merge branch 'goblinsnacks' into 'master'
Allow creatures to use potions

Closes #7604

See merge request OpenMW/openmw!3469
2023-10-04 03:46:51 +00:00
Petr Mikheev
6161953106 Allow reading ESM4 books 2023-10-03 10:55:12 +02:00
Alexei Kotov
b6d2fa5f9d Merge branch 'initially_disabled' into 'master'
Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled

See merge request OpenMW/openmw!3461
2023-10-02 18:28:29 +00:00
Evil Eye
0814ef5697 Allow creatures to use potions 2023-10-01 11:22:20 +02:00
elsid
68de5690ef
Use settings values for Navigator settings 2023-10-01 11:10:04 +02:00
elsid
b3c8a15af1
Parse navmesh render mode on reading settings 2023-10-01 11:09:59 +02:00
psi29a
08ff69f199 Merge branch 'menu_fix' into 'master'
Update canvas size every frame when it is visible

See merge request OpenMW/openmw!3463
2023-09-29 11:25:09 +00:00
Andrei Kortunov
1ac0a3b25b Update canvas size every frame when it is visible (bug 7603) 2023-09-29 13:34:04 +04:00
psi29a
df1063be5d Merge branch 'thedichotomyof4' into 'master'
ESM4 upd8s: Fours and Worlds

Closes #7445

See merge request OpenMW/openmw!3454
2023-09-29 08:16:30 +00:00
Petr Mikheev
02de5e82d8 Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled. 2023-09-28 23:09:09 +02:00
psi29a
3ea14e904d Merge branch 'actors_range' into 'master'
Handle actors processing range in Lua

See merge request OpenMW/openmw!3458
2023-09-28 08:33:46 +00:00
psi29a
6c39e3f817 Merge branch 'draft' into 'master'
Treat teleportation out of the draft cell as object creation

Closes #7588 and #7453

See merge request OpenMW/openmw!3455
2023-09-28 08:33:10 +00:00
psi29a
f9bba096db Merge branch 'fix_editor_model' into 'master'
Avoid using settings in components to get actor model (#7596)

Closes #7596

See merge request OpenMW/openmw!3460
2023-09-28 08:32:52 +00:00
psi29a
bae8d585fe Merge branch 'lua/capacity_encum_bindings' into 'master'
Add more lua bindings for encumbrance and capacity

See merge request OpenMW/openmw!3462
2023-09-28 08:32:38 +00:00
glassmancody.info
9aa992eede add more lua bindings for encumbrance and capacity 2023-09-27 17:19:08 -07:00
Evil Eye
7594d94024 Prevent re-adding local scripts 2023-09-27 22:24:28 +02:00
Evil Eye
f6626e36cf Unbreak respawns and fix #7588 2023-09-27 22:07:55 +02:00
Evil Eye
33b57d9134 Use moveToCell and init mwscript 2023-09-27 21:23:07 +02:00
elsid
1d94527a19
Avoid using settings in components to get actor model
Settings::Values are initialized only for engine. Accessing them from other
binaries leads to a crash.
2023-09-27 21:00:46 +02:00
Andrei Kortunov
40c8783790 Handle actors processing range in Lua 2023-09-27 15:14:32 +04:00
psi29a
e090bc234b Merge branch 'simulation_fix' into 'master'
Decouple rendering simulation time from Lua simulation time (bug 7576)

Closes #7576

See merge request OpenMW/openmw!3457
2023-09-27 07:30:36 +00:00
Zackhasacat
cde2b49313 Fix recordDraft isScroll for types.book in lua 2023-09-27 07:30:27 +00:00
Andrei Kortunov
442c032373 Decouple rendering simulation time from Lua simulation time (bug 7576) 2023-09-26 14:39:38 +04:00
Evil Eye
641f34a3c9 Treat teleportation out of the draft cell as object creation 2023-09-25 21:01:32 +02:00
Alexei Kotov
8d655054f1 esmtool: Print human-readable ESM4 file format version 2023-09-25 21:40:14 +03:00
Alexei Kotov
9f8f2dd925 Use parent worldspace terrain when requested 2023-09-25 21:40:14 +03:00
Alexei Kotov
7e360df6c0 Place ESM4::Flora instances to the scene 2023-09-24 10:25:44 +03:00
psi29a
67075990bd Merge branch 'deprecations' into 'master'
Remove numeric magic school ids and deprecate the enum

See merge request OpenMW/openmw!3440
2023-09-23 11:59:22 +00:00
psi29a
6d32caa2d6 Merge branch 'somethinginparticlular' into 'master'
Read even more NIF records

See merge request OpenMW/openmw!3442
2023-09-23 11:59:06 +00:00
Alexei Kotov
c800152ca2 Diminish error marker prominence
Don't render ESM4 actors or SpeedTree objects
2023-09-22 01:01:19 +03:00
psi29a
84019e7998 Merge branch 'mobiusdoublereacharound' into 'master'
Rewrite melee hit target selection (bug #3438)

Closes #3438

See merge request OpenMW/openmw!3274
2023-09-21 20:31:18 +00:00
Evil Eye
90ca8a2f4e Remove ATTRIBUTE, SKILL, and SCHOOL enums 2023-09-21 19:34:13 +02:00
Evil Eye
6ed5cbb7d0 Remove numeric magic school ids and deprecate the enum 2023-09-20 19:51:29 +02:00
Alexei Kotov
440851ff48 Rewrite melee hit target selection (bug #3438) 2023-09-19 22:31:45 +03:00
Petr Mikheev
38f56cfcdd Fix #7453: wrong position of dynamically placed CreatureLevList 2023-09-19 11:22:58 +02:00
Petr Mikheev
95906a34b3 Fix #6146 (actor:setEquipment doesn't trigger mwscripts) 2023-09-19 10:59:20 +02:00
psi29a
38d0ece366 Merge branch 'titlefix' into 'master'
Repeat title music only in main menu

See merge request OpenMW/openmw!3436
2023-09-19 08:37:44 +00:00
psi29a
3ae189dda1 Merge branch 'nifcouriersix' into 'master'
Modernize NIF loader, part 6

See merge request OpenMW/openmw!3435
2023-09-19 08:37:23 +00:00
psi29a
1a5b63412a Merge branch 'fix-lua-layers' into 'master'
Fix Lua UI Layer bindings

See merge request OpenMW/openmw!3433
2023-09-18 08:37:29 +00:00
psi29a
1c8198242e Merge branch 'toggleai' into 'master'
Add a way to toggle AI to Lua debug package

See merge request OpenMW/openmw!3429
2023-09-18 08:37:19 +00:00
psi29a
eb688b603d Merge branch 'refnum_ref' into 'master'
Replace `const ESM::RefNum&` -> `ESM::RefNum`

See merge request OpenMW/openmw!3432
2023-09-18 08:35:45 +00:00
Andrei Kortunov
3ef9b850d7 Repeat title music only in main menu 2023-09-18 10:45:08 +04:00
Alexei Kotov
1b93e646b8 Rename Property->NiProperty 2023-09-18 06:44:44 +03:00
Alexei Kotov
1e3da5516a Fix BA2 handling in niftest 2023-09-17 19:30:30 +03:00
Alexei Kotov
9ae1077808 Update NIF property loading, first pass
Revise all FO3+ shader properties (attempt reading FO4, FO76 and Starfield properties)
Use constants for most instances of property flags
Drop invalid usage of non-existent double-sided flag for BSShader
Make formatting more consistent, drop unnecessary comments
2023-09-17 19:22:16 +03:00
psi29a
18b6eba709 Merge branch 'reloadlua' into 'master'
safe reloadlua on top of !3362

See merge request OpenMW/openmw!3412
2023-09-17 11:28:01 +00:00
Alexei Kotov
eb8242946a Improve node record consistency with NifTools 2023-09-16 19:17:40 +03:00
Alexei Kotov
bff9231c3b Refactor NiGeometry/BSTriShape
Don't pass invalid geometry data links to the loaders
2023-09-16 19:17:40 +03:00
uramer
cda5f12630 Fix Lua UI Layer bindings 2023-09-16 13:45:19 +02:00
Kindi
83ebaf27cc take2 2023-09-16 17:53:26 +08:00
Alexei Kotov
deb051639e Refactor NiBoundingVolume 2023-09-15 21:11:12 +03:00
Petr Mikheev
c67b866a11 Replace const ESM::RefNum& -> ESM::RefNum 2023-09-15 19:38:09 +02:00
Petr Mikheev
72b8ff82ff !3362 with safe reloadlua 2023-09-15 19:10:33 +02:00
Andrei Kortunov
56ea3e3879 Add a way to toggle AI to Lua debug package 2023-09-15 18:49:46 +04:00
psi29a
551f424c80 Merge branch 'silent_warning' into 'master'
Silent coverity warning

See merge request OpenMW/openmw!3423
2023-09-15 12:57:08 +00:00
Petr Mikheev
4fa8756791 Silent coverity warning 2023-09-15 11:05:40 +02:00
psi29a
12159d95f3 Merge branch 'music' into 'master'
Rework music system

See merge request OpenMW/openmw!3372
2023-09-15 07:11:31 +00:00
psi29a
ed022a6c14 Merge branch 'fix_use' into 'master'
Fix regression added in  !3354: Set `force` to false when applying UseItem from inventory.

See merge request OpenMW/openmw!3422
2023-09-15 07:03:34 +00:00
psi29a
59f8034442 Merge branch 'sizedreads' into 'master'
Replace more sized reads

See merge request OpenMW/openmw!3425
2023-09-15 07:03:18 +00:00
psi29a
64e4a33400 Merge branch 'nif' into 'master'
Modernize NIF loader, part 4

See merge request OpenMW/openmw!3427
2023-09-15 07:02:38 +00:00
Andrei Kortunov
db72a91180 Add a way to check if sound system is enabled 2023-09-14 13:02:20 +04:00
Andrei Kortunov
ebb75008f8 Do not use playlist for title music 2023-09-14 09:17:59 +04:00
Alexei Kotov
0fe095303f Rename Controller->NiTimeController, update NiTimeController and related code 2023-09-14 03:12:10 +03:00
Alexei Kotov
05d8975ed1 Revise various NIF controller records
Mostly those that don't require external changes
2023-09-14 01:44:41 +03:00
Evil Eye
b59739a529 Replace more sized reads 2023-09-13 21:51:42 +02:00
Andrei Kortunov
655c4442bc Implement isMusicPlaying 2023-09-13 17:48:49 +04:00
Bret Curtis
a285408212 small coverity fix 2023-09-13 12:28:38 +02:00
Kindi
ff16ee2d64 implement lua api for get/set item condition 2023-09-13 16:10:15 +08:00
Andrei Kortunov
cbb4c1bb9a Fix music during a new game start 2023-09-13 09:11:07 +04:00
Andrei Kortunov
e25e867d77 Remove 'music' package 2023-09-13 09:11:07 +04:00
Andrei Kortunov
18fe6a8ae7 Remove default argument 2023-09-13 09:11:07 +04:00
Andrei Kortunov
e1cae5a029 Rework music system 2023-09-13 09:11:07 +04:00
psi29a
090da90302 Merge branch 'factions' into 'master'
Implement Lua API for factions

See merge request OpenMW/openmw!3405
2023-09-12 19:41:54 +00:00
psi29a
42b77342c5 Merge branch 'nif' into 'master'
Modernize NIF loader, part 3

See merge request OpenMW/openmw!3418
2023-09-12 08:34:46 +00:00
Andrei Kortunov
02dcf1fb31 Split setFactionRank to separate functions 2023-09-12 11:57:19 +04:00
Andrei Kortunov
6ee86dea82 Implement Lua API for factions (feature 7468) 2023-09-12 09:49:03 +04:00
Petr Mikheev
fb8ccf52d8 Add missing argument force in UseItem 2023-09-11 16:21:34 +02:00
psi29a
9d186ee2cd
Merge branch 'ptrindex' into 'master'
Fix crash: PtrRegistry can contain pointers to already removed temporary ManualRefs

See merge request OpenMW/openmw!3411
2023-09-11 06:57:36 +00:00
psi29a
d87db1dc5f
Merge branch 'drainfatigue' into 'master'
Uncap Drain Fatigue again (bug #7573)

Closes #7573

See merge request OpenMW/openmw!3414
2023-09-11 06:57:25 +00:00
psi29a
39a209cb78
Merge branch 'settings_values_models' into 'master'
Use settings values for Models settings (#6876)

See merge request OpenMW/openmw!3413
2023-09-11 06:55:17 +00:00
psi29a
9d3eb1a901
Merge branch 'fix_crash' into 'master'
Fix crash on accessing cells settings from non engine binaries

Closes #7572

See merge request OpenMW/openmw!3415
2023-09-10 15:23:57 +00:00
psi29a
4deb012edf
Merge branch 'centeroncell' into 'master'
Reset the rotation for ESM3 door-based COC destinations again (#7471)

Closes #7471

See merge request OpenMW/openmw!3416
2023-09-10 15:23:09 +00:00
Alexei Kotov
a7cc4e6ba6 Rename Node->NiAVObject and update everything directly related
Update NiNode
Simplify RootCollisionNode handling in BulletNifLoader
2023-09-10 07:18:39 +03:00
Alexei Kotov
6872c7144e Rename Transformation->NiTransform and update everything directly related 2023-09-10 07:18:39 +03:00
Alexei Kotov
ef896faa90 Rename Named->NiObjectNET and update everything directly related to it
BulletNifLoader: properly check if the node has animation controllers
Flatten extra data linked list
2023-09-10 07:18:39 +03:00
psi29a
9791fae2db
Merge branch 'statrecords' into 'master'
Expose skill and attribute records to Lua and deprecate their enums

See merge request OpenMW/openmw!3407
2023-09-09 20:39:45 +00:00
Petr Mikheev
892f6d1aee Make LiveCellRef to remove itself from PtrRegistry in destructor (to prevent potential use after free); Update ContainerStore::mPtr after copying container/actor. 2023-09-09 21:54:13 +02:00
Alexei Kotov
0f2e5f9db6 Uncap Drain effects again (bug #7573) 2023-09-09 22:46:11 +03:00
Alexei Kotov
817078cbea Reset the rotation for ESM3 door-based COC destinations again 2023-09-09 21:00:47 +03:00
elsid
053a3caf7b
Pass cache expiry delay to GenericResourceManager constructor 2023-09-09 19:35:20 +02:00
elsid
ad509bb954
Use settings values for Models settings 2023-09-09 13:12:08 +02:00
psi29a
bcc3365766
Merge branch 'fix_hidden_window' into 'master'
Fix bug related to !3236

See merge request OpenMW/openmw!3406
2023-09-09 08:06:47 +00:00
psi29a
0a47e927d5
Merge branch 'nif' into 'master'
Modernize NIF loader, part 2

See merge request OpenMW/openmw!3404
2023-09-09 08:06:32 +00:00
psi29a
45a211c098
Merge branch 'lua_nil' into 'master'
Return nil when we try to use an invalid store index from Lua

Closes #7550

See merge request OpenMW/openmw!3410
2023-09-09 08:06:19 +00:00
psi29a
cadb166b58
Merge branch 'companion_creatures' into 'master'
Allow creatures to be companions again

See merge request OpenMW/openmw!3409
2023-09-09 08:06:03 +00:00
Andrei Kortunov
5d211d3c93 Return nil when we try to use an invalid store index from Lua 2023-09-08 09:48:45 +04:00
Andrei Kortunov
7c5caec443 Allow creatures to be companions again 2023-09-08 08:30:06 +04:00
Evil Eye
cd0e612cb7 Expose skill and attribute records to Lua and deprecate their enums 2023-09-07 21:30:08 +02:00
Petr Mikheev
42f2ece8b3 Fix bug: UI modes that are added not through Lua don't show windows that were hidden by Lua in other mode. 2023-09-07 02:16:22 +02:00
Alexei Kotov
89774716fb Modernize NiGeometryData 2023-09-06 23:55:36 +03:00
Alexei Kotov
cfd37dbcc6 Modernize NiTriShapeData 2023-09-06 23:55:36 +03:00