mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 08:15:37 +00:00
Code Issues Releases Wiki Activity
30201 commits 108 branches 66 tags 134 MiB
Commit graph

6610 commits

Author SHA1 Message Date
psi29a
02651cd96c Merge branch 'texturefx' into 'master' 
Propagate dynamic effects to node's immediate children (bug #6550)

Closes #6550

See merge request OpenMW/openmw!2721
 2023-02-11 21:42:30 +00:00
elsid
2e64155c0f
Use signed type for left record and files size in ESM3 reader context 
Otherwise reading some of the records like ESM::CellRef without a subrecord
after could lead to underflow of ESM_Context::leftRec which makes
ESM::ESMReader::hasMoreSubs to return true and load hangs for a while trying to
read the same subrecord many times.

Fix ESM::Variant tests since it's now required to have a record for any ESM
data. Add 16 (size of record header) to all expected data sizes.
 2023-02-11 16:09:14 +01:00
Alexei Kotov
9deed5c03e Propagate dynamic effects to node's immediate children (bug #6550) 2023-02-11 17:37:25 +03:00
elsid
a5ec108cfb
Add missing space 2023-02-11 15:14:02 +01:00
elsid
4f683d1ee9
Throw exception on failed write 2023-02-11 15:14:02 +01:00
psi29a
5f1da29881 Merge branch 'bsapriority' into 'master' 
Files::Collections: prefer files from highest priority folders (bug #7092)

Closes #7092

See merge request OpenMW/openmw!2716
 2023-02-11 10:50:55 +00:00
psi29a
83894bae8a Merge branch 'nif' into 'master' 
Add NiTriBasedGeomData abstraction, bring NiVertexColorProperty to modern standards

See merge request OpenMW/openmw!2714
 2023-02-11 10:33:08 +00:00
Alexei Kotov
536370c76d Files::Collections: prefer files from highest priority folders 2023-02-11 01:25:00 +03:00
Alexei Kotov
99aa90f90c Rewrite NiVertexColorProperty 2023-02-11 00:58:13 +03:00
Alexei Kotov
d39127cc3d Add NiTriBasedGeomData abstraction 2023-02-10 23:06:56 +03:00
elsid
080700f8fe
Name all custom ESM format versions and add tests 2023-02-10 19:54:15 +01:00
psi29a
de2bd6d802 Merge branch 'nistringpalette' into 'master' 
Fix NiStringPalette loading again

See merge request OpenMW/openmw!2703
 2023-02-10 07:46:39 +00:00
Alexei Kotov
a4ddf443ed Fix NiStringPalette loading 2023-02-09 21:10:25 +03:00
Alexei Kotov
c8430ee6c8 Clean up fillTriangleMesh for NiTriStrips 2023-02-09 20:24:05 +03:00
psi29a
a41cbfb349 Merge branch 'candles' into 'master' 
Read NiBlendInterpolator records, fill in NiControllerManager fields

See merge request OpenMW/openmw!2700
 2023-02-08 22:24:37 +00:00
elsid
2c43a8558a
Add option to disable debug log for unsupported nif files 
It becomes quite extensive and not very useful when loading oblivion content
files.
 2023-02-08 22:59:29 +01:00
Alexei Kotov
d7834c43e5 Fill in NiControllerManager fields 2023-02-09 00:06:08 +03:00
Alexei Kotov
091fcd837e Read all the NiBlendInterpolator record types 2023-02-09 00:06:08 +03:00
Alexei Kotov
7ecf018743 Add NiBlendInterpolator 2023-02-08 22:58:47 +03:00
elsid
02ada74fa1
Do not try to dereference nullptr in object cache 2023-02-08 20:19:59 +01:00
Alexei Kotov
41d6ccd3f6 Read NiDefaultAVObjectPalette 2023-02-08 15:08:52 +03:00
psi29a
5f9332751c Merge branch 'roottrafo' into 'master' 
Don't discard root node transformations for Gamebryo meshes

See merge request OpenMW/openmw!2697
 2023-02-08 11:32:16 +00:00
Alexei Kotov
b14d1f0c6b Don't discard root node transformations for Gamebryo meshes 2023-02-08 14:20:42 +03:00
Alexei Kotov
8ebdd1e4a5 Fix material data loading for 10.0.1.0 2023-02-08 13:46:54 +03:00
Alexei Kotov
115c30a573 Read bhkConvexTransformShape 2023-02-08 13:26:26 +03:00
Alexei Kotov
9f28a26b25 Read NiSequence/NiControllerSequence 2023-02-08 01:03:11 +03:00
psi29a
944931c9bf Merge branch 'load_esm4_lights' into 'master' 
Adds ESM4 light into ESM4 Cells

See merge request OpenMW/openmw!2692
 2023-02-07 16:50:10 +00:00
florent.teppe
486d15b19e moved light common to its own file 
moved esm4light to it's own file
 2023-02-07 16:29:17 +01:00
florent.teppe
dc961e3189 Adds the light into the scene. 
Common struct for ESM3 and ESM4 light
 2023-02-07 10:07:59 +01:00
elsid
627bed09ee
Remove redundant operator<< overloads from Log 2023-02-06 21:18:35 +01:00
psi29a
a0795ba7ae Merge branch 'launch_fix' into 'master' 
Fix some non-ASCII path issues

Closes #6817

See merge request OpenMW/openmw!2686
 2023-02-06 19:50:30 +00:00
florent.teppe
a71a86e64a Load light models in the engine. Doesn't emit light 2023-02-06 20:22:17 +01:00
psi29a
15b3af92df Merge branch 'macos_lua_fix' into 'master' 
make sure lua works with macos packages

See merge request OpenMW/openmw!2687
 2023-02-06 18:53:19 +00:00
psi29a
4f001d8736 Merge branch 'qt6' into 'master' 
Add an initial Qt6 support

See merge request OpenMW/openmw!2684
 2023-02-06 16:55:20 +00:00
Andrei Kortunov
7e2aedf637 Add an initial Qt6 support 2023-02-06 18:38:59 +04:00
Bret Curtis
a708fb4a5c make sure lua works with macos packages 2023-02-06 14:35:22 +01:00
Andrei Kortunov
8925f854e7 Fix non-ASCII path logging 2023-02-06 15:12:24 +04:00
Andrei Kortunov
5836d27928 Fix ContentSelector usage with non-ASCII paths 2023-02-06 13:36:02 +04:00
psi29a
4032c447e9 Merge branch 'load-ESM4-Cell' into 'master' 
Can load and coc into an interrior oblivion cell

See merge request OpenMW/openmw!2647
 2023-02-06 08:56:23 +00:00
glassmancody.info
e778ffee9b po2 scaling for average luminance 2023-02-05 12:30:38 -08:00
elsid
e92ada09af
Replace QRegExp by QRegularExpression 2023-02-05 13:30:26 +01:00
psi29a
aee7716c3a Merge branch 'launcher_typed_settings' into 'master' 
Typed launcher settings

See merge request OpenMW/openmw!2650
 2023-02-04 23:41:59 +00:00
florent.teppe
084207af64 Avoids a lot a special cases for ESM3 vs ESM4 cells. 2023-02-04 23:25:06 +01:00
florent.teppe
1caed2de2a Applies some review comments. 
Proper visit for ESM::CellVariant

Fixed MWWorldCell constructor
 2023-02-04 17:09:54 +01:00
elsid
f1dbd9b959
Fix -Wduplicated-branches warnings 2023-02-04 00:10:30 +01:00
elsid
c79c14da91
Fix -Wnon-virtual-dtor warnings 2023-02-03 23:00:09 +01:00
psi29a
00978ed7a4 Merge branch 'wherefore_art_thou_horatius' into 'master' 
Fix global variable replacement in dialogue

Closes #7197

See merge request OpenMW/openmw!2675
 2023-02-01 23:38:32 +00:00
psi29a
68b3b90255 Merge branch 'ui_content_leak' into 'master' 
Move implementation of UI Content to Lua (#7155)

See merge request OpenMW/openmw!2661
 2023-02-01 22:51:47 +00:00
Evil Eye
8d2b5ed8ee Combine initializer_lists 2023-02-01 22:27:22 +01:00
Evil Eye
d3bc79e9b2 Reduce code duplication 2023-02-01 21:57:50 +01:00