mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity
32,798 Commits 19 Branches 66 Tags
Commit Graph

32798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evil Eye
8a1ca870eb Stop infighting when gaining new allies 2023-12-19 21:23:10 +01:00
Evil Eye
94b129cc62 Stop combat when stacking a new AI package 2023-12-18 22:18:26 +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
fc5f917b1a Merge branch 'discolighting' into 'master' 
Consolidate shader lighting

See merge request OpenMW/openmw!3660
 2023-12-17 19:20:15 +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
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
93ea9dbc3b Do all lighting calculations in one place, support per-vertex specularity 
Force PPL when specular maps are used
 2023-12-15 11:44:54 +03:00
Alexei Kotov
d1274fd3db Deduplicate lambert calculations, consolidate doLighting 2023-12-15 10:36:47 +03: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
jvoisin
3b1df3dd07 Merge branch 'tangentspace' into 'master' 
Untangle tangent space handling and parallax

See merge request OpenMW/openmw!3648
 2023-12-14 20:01:39 +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
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
Alexei Kotov
4a96885323 Untangle normals and parallax handling 
Move tangent space generation to the vertex shaders
Support diffuse parallax when no normal map is present
Don't use diffuse parallax if there's no diffuse map
Generalize normal-to-view conversion
Rewrite parallax
 2023-12-12 22:42:53 +03:00
jvoisin
abbb620ea2 Merge branch 'nifogproperty' into 'master' 
Handle NiFogProperty (feature #5173)

Closes #5173

See merge request OpenMW/openmw!3642
 2023-12-12 18:30:11 +00: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
e3e9b39a16 Merge branch 'skinning' into 'master' 
Streamline passing influence data to skinning

See merge request OpenMW/openmw!3641
 2023-12-10 12:56:08 +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
Evil Eye
623a610c5e Merge branch 'globalmap' into 'master' 
Remove unused global map field

See merge request OpenMW/openmw!3646
 2023-12-09 21:05:25 +00: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
b0ef42ae3c Drop support for save game format 3 2023-12-09 18:05:57 +01:00
Evil Eye
becc5ef8fa Drop support for save game format 2 2023-12-09 17:45:42 +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
Alexei Kotov
9cdaf2c29b Handle NiFogProperty (feature #5173) 2023-12-09 17:13:16 +03:00
Alexei Kotov
c1088e5f70 Streamline passing influence data to skinning 2023-12-08 20:58:34 +03:00
Alexei Kotov
102d2c4b43 Merge branch 'fix_lua_build' into 'master' 
Fix build with Lua 5.4.6

See merge request OpenMW/openmw!3640
 2023-12-08 17:26:10 +00:00
jvoisin
7894e7a748 Merge branch 'enable-jit' into 'master' 
Add `sol::lib::jit` to actually enable JIT

See merge request OpenMW/openmw!3639
 2023-12-08 14:41:12 +00: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
Devin Alexander Torres
8161771969 Add sol::lib::jit to actually enable JIT 2023-12-07 04:57:52 -06: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
jvoisin
1073bd9753 Merge branch 'actors-still-cant-read' into 'master' 
More cleanup of scripted animations

Closes #4743, #5066, and #7641

See merge request OpenMW/openmw!3583
 2023-12-05 14:13:35 +00:00
Mads Buvik Sandvei
f6a6c278dd More cleanup of scripted animations 2023-12-05 14:13:35 +00:00