1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 23:54:01 +00:00
Commit graph

31656 commits

Author SHA1 Message Date
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
psi29a
fbe6a398f8 Merge branch 'unstack-refnum' into 'master'
Generate new refnum for the new stack created when unstacking.

See merge request OpenMW/openmw!3206
2023-07-08 14:58:28 +00:00
psi29a
ca8cf002de Merge branch 'macos_target_non_eol_version' into 'master'
macOS target 11

See merge request OpenMW/openmw!3205
2023-07-08 13:16:28 +00:00
Mads Buvik Sandvei
0f608f388e Generate new refnum for the new stack created when unstacking. 2023-07-08 14:51:49 +02:00
psi29a
96356a3815 Update file before_script.osx.sh 2023-07-08 12:42:06 +00:00
psi29a
b49dc0ee4c Merge branch 'translations_july_23' into 'master'
Last Swedish translations as of now (#7417)

See merge request OpenMW/openmw!3192
2023-07-08 12:39:00 +00:00
Joakim Berg
c612c2a218 Last Swedish translations as of now (#7417) 2023-07-08 12:39:00 +00:00
psi29a
f9d99cf5ce Merge branch 'disable_mac_os_ci' into 'master'
Enable macos job only for upstream project

See merge request OpenMW/openmw!3201
2023-07-08 12:38:07 +00:00
psi29a
29ffc2840e Merge branch 'fix_7448' into 'master'
Fix #7448 (onConsume don't work after loading a save if inventory wasn't accessed from Lua)

Closes #7448

See merge request OpenMW/openmw!3194
2023-07-08 12:36:52 +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
Petr Mikheev
a09fb8d8f8 Rework Lua bindings for journal 2023-07-08 14:32:58 +02:00
Tobias Tribble
c792582376 Add Lua bindings for journal 2023-07-08 13:37:39 +02:00
elsid
0851f0705d
Use settings values for Groundcover settings 2023-07-08 12:08:27 +02:00
elsid
f6fce5ee15
Cleanup includes 2023-07-08 11:28:56 +02:00
psi29a
63e9a63c67 Merge branch 'i-can-see-nearly-now-the-grass-is-gone' into 'master'
Maybe compute an accurate near and far plane using primitives for groundcover

See merge request OpenMW/openmw!2960
2023-07-08 08:58:13 +00:00
Alexei Kotov
9df5323890 Merge branch 'dragdrop-doc-formatting' into 'master'
Documentation: Fix Header Formatting of Drag&Drop Article

See merge request OpenMW/openmw!3197
2023-07-07 21:29:29 +00:00
psi29a
3d0621bdd2 Merge branch 'save-artefacts' into 'master'
Upload CI artifacts

See merge request OpenMW/openmw!3130
2023-07-07 15:47:07 +00:00
AnyOldName3
3e8253010a Upload CI artifacts 2023-07-07 15:47:06 +00: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
aa820be986 Merge branch 'cell_for_drafts' into 'master'
Add special cell for objects created via Lua scripts and not yet added into the world

Closes #7383

See merge request OpenMW/openmw!3193
2023-07-07 13:06:54 +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
elsid
8eb059de53
Enable macos job only for upstream project 2023-07-07 12:35:07 +02: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