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
9 years ago
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.
9 years ago
scrawl
a29d1ace2b
Read NiSpotLight
9 years ago
scrawl
ba211ad9ad
Read NiPointLight ( Fixes #3011 )
9 years ago
scrawl
0965a9059d
Handle NiLODNode using osg::LOD ( Fixes #3008 )
9 years ago
scrawl
626281977e
Read NiLODNode (Bug #3008 )
9 years ago
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.
9 years ago
Marc Zinnschlag
b04a23bf43
Merge remote-tracking branch 'origin/openmw-37' into openmw-37
9 years ago
scrawl
1edcb219a7
Leak fix
9 years ago
scrawl
fc93dc6195
Remove a stray method declaration
9 years ago
scrawl
7776c49fc1
GraphicsWindowSDL2: adjust the log levels
9 years ago
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
9 years ago
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.
9 years ago
scrawl
35459f20d5
Refactor lighting mask
9 years ago
scrawl
91583fc027
Fix MWRender::Mask_ParticleSystem
9 years ago
Alexander "Ace" Olofsson
37158df339
Update scalinglayer.cpp
...
MSVC Explicitly requires <algorithm> for std::min and/or max
9 years ago
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.
9 years ago
scrawl
1200ff9186
RigGeometry: fix incorrect bounding box in the first frame
...
The default computeBound() was overriding the manually set bounding box.
9 years ago
scrawl
64abdbabe3
Small refactor of controllers handling, print warning messages for unhandled controllers
9 years ago
scrawl
35f5be680b
Support for NiVisController on trishape nodes
9 years ago
Marc Zinnschlag
af5a1bc16b
Merge remote-tracking branch 'origin/master'
9 years ago
Marc Zinnschlag
b61b732207
fixed an interference with script warning mode and error downgrading ( Fixes #2990 )
9 years ago
scrawl
79b3f1e6a8
Small cleanup
9 years ago
scrawl
59aee04ddb
Implement ScalingLayer, for layouting of widgets in screen-relative coordinates
9 years ago
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
9 years ago
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
9 years ago
scrawl
7ff168b787
osgMyGUI: add support for layers to insert custom rendering state
9 years ago
scrawl
0210b87ffc
Revert "Fix LightSource crash"
...
This reverts commit f336c6db87
.
Root cause should be fixed in next commit.
9 years ago
scrawl
72252d4f32
Terrain: restore IncrementalCompileOperation
9 years ago
scrawl
7ca8e45d5d
Terrain: remove debug code
9 years ago
scrawl
ef18f4217f
Terrain: create 4x4 terrain chunks per ESM::Cell to improve performance
...
Improves performance because the number of splatting layers per chunk is reduced, and finer grained frustum culling can be done.
9 years ago
scrawl
95cf13e3f2
Terrain: make the blendmapSize and layerTileSize in FixedFunctionTechnique configurable
9 years ago
Marc Zinnschlag
e081eb2c34
Merge remote-tracking branch 'origin/master'
9 years ago
Marc Zinnschlag
7239481672
Merge remote-tracking branch 'scrawl/scrawl-patch-2'
9 years ago
scrawl
c996702b56
Fix some uninitialised variables found by static analysis
9 years ago
scrawl
f7d0d06134
Compiler: remove unused mNameStartingWithDigit
9 years ago
scrawl
c23609e22b
Cache the light list in LightListCallback
...
When multiple cameras are rendering, the later cameras can reuse the light lists from the first camera.
9 years ago
scrawl
fd1ccd21ff
Disable freezeOnCull for weather particles
9 years ago
scrawl
5ca0ae5232
Don't add the same AlphaFader to multiple nodes
9 years ago
scrawl
f336c6db87
Fix LightSource crash
9 years ago
scrawl
49df6b7450
LightManager: fix incorrect view matrix for RELATIVE_RF cameras
9 years ago
scrawl
6dff11f847
Duplicate code fix
9 years ago
scrawl
8552a9d82c
Add multiple camera support to LightManager
9 years ago
scrawl
2ee6b41887
Handle NiAlphaProperty on a drawable basis
...
Removes the RenderBin nesting complication. Also results in leaner StateSets, so the cull phase should be a bit faster.
9 years ago
Marc Zinnschlag
8eb6d337d5
deal with script execution from within a script ( Fixes #2964 )
9 years ago
Emmanuel Anne
b911abd7d8
add a few more possible arguments to choice
...
this fixes some travel dialogs for "Antares Big Mod"
9 years ago
Marc Zinnschlag
435e52306a
adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces
9 years ago
Marc Zinnschlag
ae54f34f25
removed a redundant else and made unary + work also in the console
9 years ago
Marc Zinnschlag
2158bfe285
Merge remote-tracking branch 'zelurker/scripts_unary_plus'
9 years ago
scrawl
8e69c80bf6
Add framenumber checks in various cull callbacks, so we don't update more than once per frame when multiple cameras are used
9 years ago