mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:53:52 +00:00
Code Issues Releases Wiki Activity
31598 commits 108 branches 66 tags 133 MiB
Commit graph

7094 commits

Author SHA1 Message Date
Alexei Kotov
d8f50553af Move Skyrim shader property controllers to controllers 2023-07-15 03:57:29 +03:00
Evil Eye
cd8f2355c0 Only allow StringRefId for Skill ids 2023-07-14 17:33:32 +02:00
psi29a
ce84fdf5f5 Merge branch 'limitedpower' into 'master' 
Cap global map cell size (bug #6222)

Closes #6222

See merge request OpenMW/openmw!3225
 2023-07-14 08:20:51 +00:00
Evil Eye
7b909c8d24 Create getRefIds 2023-07-13 20:30:16 +02:00
Evil Eye
967b5d205b Use StringRefId for skills 2023-07-13 18:55:22 +02:00
Evil Eye
ac9378fa08 Replace Skill::mIndex with Skill::refIdToIndex 2023-07-13 18:55:21 +02:00
Evil Eye
c59032fd66 Make RefId::deserializeText return an empty RefId if no pre-existing StringRefId can be found 2023-07-13 16:49:23 +02:00
psi29a
7952b27c26 Merge branch 'xptl' into 'master' 
Skip REFR::XPTL

See merge request OpenMW/openmw!3224
 2023-07-13 12:08:59 +00:00
Alexei Dobrohotov
39c84c84da Cap global map cell size (bug #6222) 2023-07-13 14:53:08 +03:00
psi29a
3a1ae9df58 Merge branch 'nsaids-for-shared-memory-structs' into 'master' 
Share the dump directory for crash and freeze dumps

See merge request OpenMW/openmw!3221
 2023-07-13 08:01:25 +00:00
psi29a
41abbae3e7 Merge branch 'sittingontheoverlap' into 'master' 
Allow subrecords to overlap the following record (bug #6025)

Closes #6025

See merge request OpenMW/openmw!3215
 2023-07-13 08:00:01 +00:00
Alexei Dobrohotov
c6882dbc6b Skip REFR::XPTL 
Needed by Yukichigai Unofficial Patch
 2023-07-13 10:22:25 +03:00
AnyOldName3
f239988c06 Remove unused function 2023-07-12 14:48:09 +01:00
AnyOldName3
899f0a4633 Remove redundant explicit null terminator 2023-07-12 14:46:32 +01:00
AnyOldName3
677c17530e I don't like reformatting things over and over. 2023-07-11 22:58:44 +01:00
AnyOldName3
1bdcb5d6d9 Share the dump directory for crash and freeze dumps 
This means the shared memory struct is just 255 bytes longer than a few
commits ago instead of 32K.

Also introduce a function for putting path strings in the shared memory
as there was too much copied and pasted code and it was error-prone.

Also free some handles once we're done with them so they don't leak.
 2023-07-11 22:22:26 +01:00
Evil Eye
4eac137109 Change control flow to be easier to understand 2023-07-11 22:10:39 +02:00
psi29a
1268dde8fe Merge branch 'metermarker' into 'master' 
Don't discard collision for the entire tree if BSXFlags marker flag is set

See merge request OpenMW/openmw!3216
 2023-07-11 07:35:51 +00:00
alekulyn
b085a52681 Add template Nif record 2023-07-10 19:25:52 -05:00
alekulyn
4b90352c2f Add RC value to BSLightingShaderPropertyFloatController and change the revelant RC value in niffile 2023-07-10 19:11:28 -05:00
alekulyn
589726d4f8 Enchanting table fully ready 2023-07-10 18:12:00 -05:00
alekulyn
ed532b5aca Add BSEffectShaderPropertyFloatController record reading 2023-07-10 17:58:32 -05:00
alekulyn
7ea2ea96b6 Read new nodes pt1 2023-07-10 17:27:05 -05:00
Alexei Dobrohotov
2de8c6b3c0 Don't discard collision for the entire tree if BSXFlags marker flag is set 2023-07-10 23:37:37 +03:00
Alexei Dobrohotov
66fd1f8862 Allow subrecords to overlap the following record (bug #6025) 2023-07-10 21:09:22 +03:00
psi29a
d9027f7eef Merge branch 'falloutfalloffnthtimesthecharm' into 'master' 
BSEffectShader/NoLighting fixes

See merge request OpenMW/openmw!3211
 2023-07-10 07:51:53 +00:00
Evil Eye
d3c1928f01 Fix dialogue insertion again 2023-07-09 15:24:52 +02:00
Alexei Dobrohotov
52a16e0e93 BSEffectShader/NoLighting fixes 
Don't hijack BSShader::NoLighting for BSEffectShader functionality
(Fallout meshes break if you use the actual emissive color as a base color)
Don't use falloff for textureless NoLighting objects
Use falloff flag for BSEffectShader
 2023-07-09 14:44:09 +03:00
psi29a
a755fa0f34 Merge branch 'cleanup_includes' into 'master' 
Cleanup includes

See merge request OpenMW/openmw!3203
 2023-07-09 10:15:09 +00:00
psi29a
81f8d16982 Merge branch 'loadBsTriShape' into 'master' 
Load BSTriShape NIF nodes

See merge request OpenMW/openmw!3099
 2023-07-09 10:14:27 +00:00
alekulyn
74aa7b947a Load BSTriShape NIF nodes 2023-07-09 10:14:27 +00:00
psi29a
da592356f1 Merge branch 'no-crash-dump-in-temp' into 'master' 
Don't put crash dumps in Temp on Windows

Closes #7455

See merge request OpenMW/openmw!3200
 2023-07-08 12:36:44 +00:00
elsid
f6fce5ee15
Cleanup includes 2023-07-08 11:28:56 +02:00
psi29a
cab47d0a2a Merge branch 'settings_values_general' into 'master' 
Use settings values for General settings (#6876)

See merge request OpenMW/openmw!3198
 2023-07-07 13:07:13 +00:00
psi29a
2a534576de Merge branch 'fix-the-comments-again' into 'master' 
Restore and clarify comments damaged by !2971

Closes #7350 and #7349

See merge request OpenMW/openmw!2979
 2023-07-07 13:05:48 +00:00
AnyOldName3
106dbba086 Restore and clarify comments damaged by !2971 2023-07-07 13:05:48 +00:00
Petr Mikheev
fb7ba40385 Merge branch 'lua-bb-once-and-for-all' into 'master' 
Lua - Fix BB once and for all

See merge request OpenMW/openmw!3143
 2023-07-05 20:21:38 +00:00
AnyOldName3
48368f79b6 Update Windows crash dump path once we know where we're logging 
Manual rewrite of 5102f4b11d
 2023-07-05 20:38:46 +01:00
AnyOldName3
72d99237e3 This would never have happened had clang format not tried making this function wrogn in the first place 2023-07-05 20:34:34 +01:00
AnyOldName3
1bcbc4f53f Undo clang format change because clang format in CI disagrees with clang format on my computer 2023-07-05 20:29:18 +01:00
AnyOldName3
3bb3f58c73 Don't put crash dumps in Temp on Windows 
Well... unless we fail to get the user profile directory.

Also put freeze dumps in a more appropriately-named file.

Discussed in https://gitlab.com/OpenMW/openmw/-/issues/7455

Manual rewrite of c21695c951

As well as that, I found a bug where the crash dump path was being converted from a std::filesystem::path to a utf8-encoded std::string, then passed to the crash catcher, which converted it to a std::filesystem::path implicitly, but using the system eight-bit code page, which wouldn't usually be UTF-8. That's now fixed by passing the function that expects a path a path instead of a string.
 2023-07-05 20:25:22 +01:00
elsid
ebb8fdc698
Use settings values for General settings 2023-07-04 21:40:04 +02:00
glassmancody.info
a659d2eaeb lua - fix bounding box once and for all 2023-07-04 09:55:11 -07:00
elsid
a6dbd819a1
Fix writing IndexRefId to ESM3 
Use correct enum value.
 2023-07-04 11:34:52 +02:00
psi29a
050fc20379 Merge branch 'settings_values_game' into 'master' 
Use settings values for Game settings (#6876)

See merge request OpenMW/openmw!3188
 2023-07-03 07:20:36 +00:00
psi29a
6601b0cb15 Merge branch 'fastandloose' into 'master' 
Drop support for --fs-strict

Closes #7394

See merge request OpenMW/openmw!3093
 2023-07-02 19:24:14 +00:00
elsid
6e8dcc16c6
Use settings values for Game settings 2023-07-01 00:59:35 +02:00
elsid
86e5b94ef6
Convert setting value int to CollisionShapeType on initialization 2023-07-01 00:59:35 +02:00
psi29a
fc5d73648a Merge branch 'schooled' into 'master' 
Merge magic schools into skills

See merge request OpenMW/openmw!3148
 2023-06-28 09:32:48 +00:00
alekulyn
683fb0a342 Templated nif reader function modelled after cc9cii's reader 2023-06-28 09:27:22 +00:00
Evil Eye
73c2387708 Merge schools into skills 2023-06-26 20:42:52 +02:00
psi29a
31efad1dd0 Merge branch 'fix_model_path' into 'master' 
Fix #7403: incorrect model path for records created by Lua scripts

Closes #7403

See merge request OpenMW/openmw!3151
 2023-06-25 20:11:43 +00:00
psi29a
dd0d66513d Merge branch 'clickbait' into 'master' 
Mostly dehardcode attributes

See merge request OpenMW/openmw!3164
 2023-06-25 20:11:19 +00:00
psi29a
558b3cbf60 Merge branch 'particles_fix' into 'master' 
Create a stateset for every particle system to create its own defineMap

Closes #7304

See merge request OpenMW/openmw!3162
 2023-06-21 14:35:13 +00:00
Andrei Kortunov
a08d921c4c Create a stateset for every particle system to create its own defineMap 2023-06-21 16:13:58 +04:00
psi29a
47b1247fa2 Merge branch 'l10n' into 'master' 
Make configurable whether GMST strings have priority over built-in interface messages

See merge request OpenMW/openmw!3134
 2023-06-21 06:52:30 +00:00
psi29a
abdd4f5207 Merge branch 'lua_potion_magic' into 'master' 
Lua: Add effects to potionRecord, ingredientRecord

See merge request OpenMW/openmw!3160
 2023-06-20 10:00:06 +00:00
Zackhasacat
611a6429a9 Lua: Add effects to potionRecord, ingredientRecord 2023-06-20 10:00:05 +00:00
psi29a
68415a952e Merge branch 'lua_quat' into 'master' 
Breaking change in Lua API: change obj.rotation from Euler angles to Quaternion

See merge request OpenMW/openmw!3123
 2023-06-20 09:59:06 +00:00
Evil Eye
bac6777fae Reduce the number of magic numbers 2023-06-18 16:21:06 +02:00
Petr Mikheev
2f16a8d27c Fix incorrect model part for records created by Lua scripts 2023-06-18 00:19:50 +02:00
Bret Curtis
d582a26e4c Set the default to CLAMP_TO_EDGE in case it was not explicity called for 2023-06-16 09:16:07 +02:00
Bret Curtis
30da8a27ba small revert, "It is copying a texture, it is not a default initialized one. The source texture may or may not want GL_CLAMP_TO_EDGE." 2023-06-16 09:16:07 +02:00
Bret Curtis
0b1a0ad1a8 only 4 deep 2023-06-16 09:16:07 +02:00
Bret Curtis
ff6944701f Be more explicit about use of CLAMP_TO_EDGE instead of defaulting to GL CLAMP 2023-06-16 09:16:07 +02:00
elsid
04215ca9ec
Use settings values for Fog settings 2023-06-15 22:01:14 +02:00
psi29a
1630e04d1b Merge branch 'fix_7423' into 'master' 
Fix #7422, #7423, #7424

Closes #7424, #7423, and #7422

See merge request OpenMW/openmw!3136
 2023-06-15 11:02:21 +00:00
psi29a
807893eb45 Merge branch 'clickbait' into 'master' 
Mostly dehardcode skills

See merge request OpenMW/openmw!3112
 2023-06-15 07:03:13 +00:00
Petr Mikheev
ab7eebb356 Fix #7423 (too strict fallback validation) 2023-06-14 20:04:16 +02:00
Petr Mikheev
718d5e4a71 Add setting "gmst overrides l10n" 2023-06-13 10:06:59 +02:00
Petr Mikheev
96399b3d23 Add fallbacks to Store<ESM::GameSetting> 2023-06-12 17:59:40 +02:00
Petr Mikheev
be45b8199e Whitelist and type validation for fallbacks 2023-06-12 17:59:40 +02:00
Petr Mikheev
3b43cc2aea Lua: change obj.rotation from Euler angles to Quaternion 2023-06-12 00:16:42 +02:00
Evil Eye
3c588900dd Apply elsid's suggestion and revert 3a888ef543 2023-06-10 22:04:14 +02:00
elsid
180dd7dc64
Log worldspace in RecastContext 2023-06-10 13:23:47 +02:00
elsid
f9e9368fda
Add operator<< for DetourSettings 2023-06-10 13:14:52 +02:00
elsid
dd08154b23
Add operator<< for DetourNavigator::AreaCosts 2023-06-10 13:14:52 +02:00
elsid
ce5fbd6b68
Write separator between Detour status flags 2023-06-10 13:14:52 +02:00
psi29a
25a719700b Merge branch 'esmtool_fallout_nv' into 'master' 
Support FalloutNV.esm

See merge request OpenMW/openmw!3065
 2023-06-10 08:48:54 +00:00
psi29a
ec2f0e4645 Merge branch 'fragile' into 'master' 
More closely replicate Morrowind.exe's locks

Closes #7415

See merge request OpenMW/openmw!3116
 2023-06-10 08:47:27 +00:00
elsid
11204d35d6
Use zlib directly for ESM4 
Fallback to decompression by block of fixed size when decompressing the
whole archive fails.
 2023-06-10 00:12:57 +02:00
elsid
f841a1377f
Skip ATTR subrecord in CLAS record 
Present in FalloutNV.esm.
 2023-06-09 23:44:39 +02:00
psi29a
2686e586e5 Merge branch 'dev-7019' into 'master' 
Fix improper access of stereo manager by other shared components

See merge request OpenMW/openmw!2437
 2023-06-09 21:25:21 +00:00
Evil Eye
f5a20d1e9c Change include guard name 2023-06-08 21:10:12 +02:00
Evil Eye
e8ddccaefe Use std::transform 2023-06-08 21:10:12 +02:00
Evil Eye
e791d2b498 Fix unit tests 2023-06-08 21:10:11 +02:00
Evil Eye
eeda48ec50 Drop support for --fs-strict 2023-06-08 21:10:09 +02:00
Evil Eye
da4e04522b More closely replicate Morrowind.exe's locks 2023-06-08 20:10:32 +02:00
Evil Eye
65b22975c9 Remove SkillEnum 2023-06-08 18:35:50 +02:00
Evil Eye
16c0f0d5cc Use a regular TypedDynamicStore for ESM:Skill 2023-06-08 18:35:47 +02:00
elsid
7d11a18907
Allow any integer number >= 0 for antialiasing level 
There is wider support than just specific powers of two. The supported level
will be detected anyway.
 2023-06-06 00:05:11 +02:00
psi29a
25c1e6abee Merge branch 'clickbait' into 'master' 
Use std::array in various ESM structs

See merge request OpenMW/openmw!3103
 2023-06-05 07:19:38 +00:00
psi29a
2f5bfb4df2 Merge branch 'fix-#7410' into 'master' 
fix #7410

Closes #7410

See merge request OpenMW/openmw!3104
 2023-06-04 11:28:26 +00:00
elsid
e8ef1a2a0c
Add default initialization for ESM4::TeleportDest::flags 2023-06-04 01:50:08 +02:00
elsid
67e32abd4f
Add default initialization to ESM::Position members 2023-06-04 01:50:04 +02:00
florent.teppe
04e026c53f getRecNameString now constexpr 
getTypeDescription uses a static constexpr variable so we don't return ref to temp memory.
 2023-06-03 20:28:25 +02:00
Evil Eye
e01a3076dd Use std::array in NpcStats 2023-06-03 14:26:37 +02:00
Evil Eye
a5bb6c7d8d Use std::array in NPDTstruct52 2023-06-03 13:27:45 +02:00
Evil Eye
dd83da5eba Use std::array in FADTstruct 2023-06-03 13:11:49 +02:00
Evil Eye
7be005c9a5 Use std::array in CLDTstruct 2023-06-03 11:58:09 +02:00