Marc Zinnschlag
fef0a40bee
updated changelog
2015-11-11 19:55:14 +01:00
Marc Zinnschlag
77b325a1db
Merge remote-tracking branch 'scrawl/master' into openmw-37
2015-11-11 19:49:42 +01:00
scrawl
a68fd791c8
Remove a stray method declaration
2015-11-11 17:24:27 +01:00
scrawl
79c44d0bfe
Style fix
2015-11-11 17:23:47 +01:00
scrawl
02148a43f5
Node mask fix
2015-11-11 17:22:31 +01:00
scrawl
9c503cbd8c
Add build* to the gitignore
...
Allows one to have multiple build folders, e.g. a separate build for a different OSG versions, or for different OpenMW versions, or when you often switch between branches.
2015-11-11 17:08:14 +01:00
scrawl
0a52ee17c3
Fix Drawable removal issues
2015-11-11 17:04:06 +01:00
scrawl
1edcb219a7
Leak fix
2015-11-11 16:27:17 +01:00
scrawl
afa590bddb
Leak fix
2015-11-11 16:04:17 +01:00
scrawl
c62c1693e9
Disable copy constructor and operator= in PartHolder
2015-11-11 01:47:26 +01:00
scrawl
fc93dc6195
Remove a stray method declaration
2015-11-11 01:32:31 +01:00
scrawl
2e9805fa0e
Leak fix
2015-11-11 00:50:57 +01:00
scrawl
b840c68f0c
Do not create a depth buffer for the global map 2d rendering
2015-11-10 21:55:21 +01:00
scrawl
8e3bc981a2
Fix self-referencing camera
2015-11-10 21:45:53 +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
scrawl
03bd3d7470
Merge pull request #799 from ace13/patch-3
...
Fix Windows builds
2015-11-10 15:01:45 +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
637cd3a628
Adjust the FirstPersonNeckController to follow the camera with a reduced factor ( Fixes #1784 )
2015-11-10 01:01:41 +01:00
scrawl
3c338b9da9
ObstacleCheck: tweak the stuck detection parameters
...
The netch_betty wander animation starts up so slowly that the creature thought it was stuck, even though it's not.
2015-11-09 20:35:31 +01:00
scrawl
d233bc483d
ObstacleCheck: fix evasion issue
...
The check if (samePosition... would not work as intended because actors do not move in every frame when the framerate is higher than the physics framerate. In that case the actor would change its evasion direction almost every frame.
2015-11-09 20:35:31 +01:00
scrawl
caa523a959
ObstacleCheck: fix the framerate not being taken into account
2015-11-09 20:35:31 +01:00
scrawl
801dc8eee3
ObstacleCheck: fix weird distance calculation
2015-11-09 20:17:21 +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
1b52749ae1
Adjust third person camera height based on character height
2015-11-09 17:42:35 +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
scrawl
2fb4a9df6d
Update CHANGELOG.md (features that should be bugs instead)
2015-11-09 15:32:16 +01:00
Marc Zinnschlag
93b0008a18
updated changelog
2015-11-09 12:14:36 +01:00
Marc Zinnschlag
cdf17f415e
updated version number
2015-11-09 12:03:27 +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
b89945804c
BookPage: implement hit test with margin for error
2015-11-09 02:57:49 +01:00
scrawl
055841e721
Improve cloud lighting
2015-11-09 02:22:40 +01:00
scrawl
f0a1434578
Dead actors underwater will float to the surface
2015-11-08 20:58:00 +01:00
scrawl
66925be440
Partially revert 682f30ef9c
...
This change made dead netch fall through the floor, because the animation moves the creature *below* its external collision box.
2015-11-08 19:59:33 +01:00
scrawl
75f11f781c
Use the ScalingLayer for Scroll window
2015-11-08 18:32:41 +01:00
scrawl
79b3f1e6a8
Small cleanup
2015-11-08 18:30:22 +01:00
scrawl
516f2765a1
Use the ScalingLayer for journal, books and scrolls
2015-11-08 18:30:22 +01:00
scrawl
a7ad45e73e
WindowBase::center use the layer size instead of render window size
2015-11-08 18:30:21 +01:00
scrawl
f9932130da
Work around MyGUI bug with mouse event coordinates (fixed in git)
2015-11-08 18:30:21 +01:00
scrawl
59aee04ddb
Implement ScalingLayer, for layouting of widgets in screen-relative coordinates
2015-11-08 18:30:21 +01:00
scrawl
08a55febc8
Adjust Scroll window layout to better match MW
2015-11-08 17:52:39 +01:00
scrawl
231570f091
travis.yml fix
2015-11-08 01:21:59 +01:00
scrawl
6c12c9a467
Layer renaming fix
2015-11-07 19:45:30 +01:00
scrawl
d85d74e615
Use AdditiveLayer for the hit fader
2015-11-07 18:05:16 +01:00
