1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
Commit graph

2677 commits

Author SHA1 Message Date
cfcohen
67c4b17581 Commit files that I thought wre in the previous commit. :-[ I'm
accustomed to the hg behavior of commiting all modified files by
default.
2015-11-25 13:17:03 -05:00
cfcohen
6882e6451a Remove tabs. :-[ 2015-11-23 20:18:39 -05:00
cfcohen
9a975a2e68 Substantial rewrite of code to save settings.cfg file, allowing
comments to persist, ordering of settings to be retained, additional
reporting of changed settings, preservation of the settings.cfg
timestamp when no changes are made, and foundational changes for
possible future features.  Due to poor interaction with the
openmw-launcher settings code, the launcher will still discard all of
these benefits.
2015-11-23 20:17:26 -05:00
scrawl
38510a56c2 GeomMorpherController: do not dirty the MorphGeometry unless necessary 2015-11-22 21:24:00 +01:00
scrawl
0d49c7fa51 GeomMorpherController: fix double update of MorphGeometry 2015-11-22 21:23:46 +01:00
scrawl
28b20428b9 Remove dynamic_cast in GeomMorpherController 2015-11-22 20:33:22 +01:00
scrawl
94e8560bf8 RigGeometry: do not allocate new NodePath every frame 2015-11-22 20:01:09 +01:00
scrawl
6d5aa272fc RigGeometry: do not update the geomToSkelMatrix more than once per frame 2015-11-22 19:54:27 +01:00
scrawl
75a464f7ec Fix a typo 2015-11-22 19:54:27 +01:00
scrawl
fc7456e0a1 Explicitely opt for float matrices in performance critical places 2015-11-22 19:54:27 +01:00
scrawl
ffea9ec2c4 Remove comment
SharedStateManager::prune is run automatically during the update traversal.
2015-11-22 19:54:26 +01:00
scrawl
62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 2015-11-22 19:54:26 +01:00
scrawl
36e91617c9 Revert "NifOsg::Emitter: ignore psToWorld scale"
This reverts commit 7c16630874.

Fixes #3022
2015-11-19 22:09:32 +01:00
scrawl
9b96fcc224 Set the particle scaleReferenceFrame to local space 2015-11-19 15:49:42 +01:00
scrawl
3bd2aaddea Adjust PulseSlow light controller (Fixes #1963) 2015-11-18 23:14:01 +01:00
scrawl
0bdfd1b0d7 Ignore Creature INDX subrecords
Found in some .ess files, not sure what they mean.
2015-11-18 16:47:03 +01:00
scrawl
d68ea994d5 Deal with empty meshes 2015-11-17 01:51:21 +01:00
scrawl
83e9a649e5 Cleanup 2015-11-17 01:45:38 +01:00
scrawl
e62470d674 Auto-generate the collision shape for native mesh formats 2015-11-17 00:20:15 +01:00
scrawl
8cf57ef6ac Move BulletShapeManager and BulletShape to resource/ 2015-11-17 00:20:15 +01:00
scrawl
eb2f16d682 Support for loading .osg mesh format 2015-11-16 23:26:43 +01:00
scrawl
21e25f4756 Use the traversalNumber as frame number 2015-11-16 20:03:45 +01:00
scrawl
52901ec10c Do not create terrain geodes when built with OSG 3.4 2015-11-16 15:11:20 +01:00
Marc Zinnschlag
de98ee0062 Merge remote-tracking branch 'scrawl/esm_rewrite' 2015-11-14 14:25:08 +01:00
scrawl
38c155c579 Tests: add dialogue_merging_test (requires some data files) 2015-11-14 00:27:59 +01:00
scrawl
054c3eb24e Do not deep copy PrimitiveSets when build with OSG 3.5 2015-11-13 20:39:44 +01:00
scrawl
fc8e40889d Move common subrecord definitions (NAME, DELE) to defs.hpp 2015-11-13 18:07:18 +01:00
scrawl
b8e11cf197 Merge commit 'pull/upstream/678' into HEAD
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
2015-11-13 01:34:36 +01:00
scrawl
7c16630874 NifOsg::Emitter: ignore psToWorld scale
Seems wrong to me, but MW appears to do it that way. Without this fix, the light_de_candle_08_64 from http://www.nexusmods.com/morrowind/mods/41654/ has flame particles in the wrong spot.
2015-11-13 00:23:00 +01:00
scrawl
a29d1ace2b Read NiSpotLight 2015-11-12 23:45:12 +01:00
scrawl
ba211ad9ad Read NiPointLight (Fixes #3011) 2015-11-12 23:42:17 +01:00
scrawl
0965a9059d Handle NiLODNode using osg::LOD (Fixes #3008) 2015-11-12 19:52:36 +01:00
scrawl
626281977e Read NiLODNode (Bug #3008) 2015-11-12 19:52:32 +01:00
scrawl
b4ce73f179 Rotations: remove LocalRotation
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
2015-11-12 01:16:37 +01:00
Marc Zinnschlag
b04a23bf43 Merge remote-tracking branch 'origin/openmw-37' into openmw-37 2015-11-11 19:55:42 +01:00
scrawl
1edcb219a7 Leak fix 2015-11-11 16:27:17 +01:00
scrawl
fc93dc6195 Remove a stray method declaration 2015-11-11 01:32:31 +01:00
scrawl
7776c49fc1 GraphicsWindowSDL2: adjust the log levels 2015-11-10 18:42:59 +01:00
scrawl
0409e5a043 Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change) 2015-11-10 18:28:58 +01:00
scrawl
f1ac408f35 Place Drawables directly in the scene graph when built with OSG 3.4
OSG 3.4 adds the ability to place Drawables directly in the scene graph, without a Geode decorating them. Leveraging this should give a small performance boost, because the redundant Geodes increase culling overhead.

There is still an oustanding issue with the RemoveDrawableVisitor no longer working correctly, because Drawables can have multiple parents.
2015-11-10 18:23:42 +01:00
scrawl
35459f20d5 Refactor lighting mask 2015-11-10 17:23:12 +01:00
scrawl
91583fc027 Fix MWRender::Mask_ParticleSystem 2015-11-10 17:00:33 +01:00
Alexander "Ace" Olofsson
37158df339 Update scalinglayer.cpp
MSVC Explicitly requires <algorithm> for std::min and/or max
2015-11-10 14:59:26 +01:00
scrawl
bd8332d2b0 Remove default copyop argument for nodecallback copy constructors
Works around a compiler warning with OSG 3.4:

warning: base class 'class osg::Callback' should be explicitly initialized in the copy constructor [-Wextra]

With no default argument for osg::CopyOp&, the compiler no longer sees the function as a real copy constructor and stops warning about the missing virtual initializations.

We don't care about this warning because there is nothing interesting to initialize in the osg::NodeCallback base anyway.

A proper fix for the warning would require to inserting OSG_VERSION conditional compiling all over the place, that is as long as we are still supporting OSG 3.2.
2015-11-09 18:57:17 +01:00
scrawl
1200ff9186 RigGeometry: fix incorrect bounding box in the first frame
The default computeBound() was overriding the manually set bounding box.
2015-11-09 18:31:41 +01:00
scrawl
64abdbabe3 Small refactor of controllers handling, print warning messages for unhandled controllers 2015-11-09 17:42:35 +01:00
scrawl
35f5be680b Support for NiVisController on trishape nodes 2015-11-09 17:42:35 +01:00
Marc Zinnschlag
af5a1bc16b Merge remote-tracking branch 'origin/master' 2015-11-09 09:07:37 +01:00
Marc Zinnschlag
b61b732207 fixed an interference with script warning mode and error downgrading (Fixes #2990) 2015-11-09 09:07:18 +01:00
scrawl
79b3f1e6a8 Small cleanup 2015-11-08 18:30:22 +01:00