1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Commit graph

31634 commits

Author SHA1 Message Date
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
f7be94aa21 Address feedback 2023-07-13 18:55:23 +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
Petr Mikheev
95bce836ee Add non-carriable lights to nearby.items 2023-07-12 22:26:06 +02:00
Petr Mikheev
e96864a79c Fix argument validation in Lua command cell:getAll 2023-07-12 22:23:42 +02:00
Evil Eye
974b4739fa Add a test for three way merges 2023-07-12 21:38:20 +02: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
Alexei Kotov
89c18d85de Merge branch 'settings_values_groundcover' into 'master'
Use settings values for Groundcover settings (#6876)

See merge request OpenMW/openmw!3204
2023-07-11 13:58:03 +00:00
Alexei Kotov
4bbbfe74b3 Merge branch 'finishdrag' into 'master'
Finish draganddrop before startdrag

See merge request OpenMW/openmw!3186
2023-07-11 12:29:35 +00:00
Kindi
00e5f31242 Finish draganddrop before startdrag 2023-07-11 12:29:35 +00:00
psi29a
429e911da1 Merge branch 'lua_journal' into 'master'
Add Lua bindings for journal (second iteration of !3133)

See merge request OpenMW/openmw!3189
2023-07-11 07:37:13 +00: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
psi29a
3961403b79 Merge branch 'newNifNodeReads' into 'master'
Read a couple more Nif Nodes

See merge request OpenMW/openmw!3218
2023-07-11 07:35:30 +00:00
Alexei Dobrohotov
411c71062c Resist failed normal weapon hits (bug #7284) 2023-07-11 09:53:56 +03: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
unknown
09147934fb Adjust unit tests 2023-07-09 18:48:14 +02:00
Alexei Kotov
5b9a195e3d Merge branch '7322-changelog' into 'master'
Add #7322 to changelog

Closes #7322

See merge request OpenMW/openmw!3214
2023-07-09 14:57:03 +00:00
AnyOldName3
f4403be128 Add #7322 to changelog 2023-07-09 14:27:04 +00:00
psi29a
657f55612e Merge branch 'madsbuvi-master-patch-92066' into 'master'
Remove resolved TODO

See merge request OpenMW/openmw!3213
2023-07-09 14:09:26 +00:00
Mads Buvik Sandvei
0c37a64a84 Remove resolved TODO 2023-07-09 13:43:00 +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
3833f2e92e Merge branch 'esm4console' into 'master'
Autocomplete ESM4::Cell editor IDs

See merge request OpenMW/openmw!3209
2023-07-09 10:14:06 +00:00
Alexei Dobrohotov
3b85f9f8cf Autocomplete ESM4::Cell editor IDs 2023-07-09 01:34:18 +03:00
psi29a
5c9dbdaceb Merge branch 'fix_teal_bindings' into 'master'
Fix Teal bindings and documentation typos

See merge request OpenMW/openmw!3208
2023-07-08 19:11:55 +00:00
uramer
d4d2112b06 Fail Teal generation on any error 2023-07-08 18:44:22 +02:00
uramer
bf7b39f214 Fix typos in Lua documentation 2023-07-08 18:40:33 +02:00
Mads Buvik Sandvei
8c3c5238d7 Preserve refnum when dropping items from inventory to ground. 2023-07-08 17:24:13 +02:00