mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-01 16:04:32 +00:00
Code Issues Releases Wiki Activity
32773 commits 115 branches 76 tags 155 MiB
Commit graph

21413 commits

Author SHA1 Message Date
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
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
Alexei Kotov
f269b25bd0 Remove unused field 2023-12-09 22:00:35 +03:00
Evil Eye
41dc409238 Don't consider empty effect lists exceptional 2023-12-09 18:20:10 +01:00
Evil Eye
4062f0225b Use the right getContainerStore 2023-12-09 16:13:56 +01:00
Evil Eye
0da620b3f9 Don't crash on spells or enchantments without effects 2023-12-09 15:40:23 +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
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