mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity
32,780 Commits 18 Branches 66 Tags
Commit Graph

16226 Commits

Author SHA1 Message Date
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
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
521cff08f8 Drop support for save game format 1 2023-12-09 17:22:11 +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
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
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
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
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
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
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
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