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
cc9cii
a38881e4cf
Further clean up of moving out NpcAutoCalc from Data.
2015-11-08 09:45:12 +11:00
cc9cii
04c5c0d82a
Move NPC autocal code out to a separate class.
2015-11-08 06:02:53 +11: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
scrawl
a90ef8afd0
layer renaming
2015-11-07 17:49:11 +01:00
scrawl
57b9eafa0f
osgMyGUI: implement AdditiveLayer
2015-11-07 17:45:22 +01:00
scrawl
51f3a8fec6
osgMyGUI: move Platform methods to the .cpp file
2015-11-07 17:39:31 +01:00
scrawl
7ff168b787
osgMyGUI: add support for layers to insert custom rendering state
2015-11-07 17:33:32 +01:00
cc9cii
c7c0023ed2
Merge pull request #12 from cc9cii/Feature-1278
...
Feature #1278 - part 1
2015-11-07 15:20:13 +11:00
cc9cii
9716b671f1
Merge branch 'cc9cii' into Feature-1278
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/nestedcoladapterimp.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/worldspacewidget.cpp
2015-11-07 12:04:09 +11:00
cc9cii
f7598a67f4
Merge branch 'pathgrid-edit' into Feature-1278
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-11-07 11:56:34 +11:00
scrawl
13c7235b6b
Remove old FPS setting code
2015-11-07 00:13:13 +01:00
scrawl
47664e1370
Hide the defunct FPS checkbox in settings menu, added hint text for f3 binding
2015-11-07 00:10:49 +01:00
scrawl
a41ebd6695
Comment out object shaders in the settings menu
2015-11-07 00:04:34 +01:00
scrawl
4cc200680c
Comment out shadows tab in settings menu
2015-11-06 23:59:06 +01:00
scrawl
2407f393ce
Fix double update traversal in screenshot function
2015-11-06 23:14:27 +01:00
scrawl
6e69808129
Fix the frameNumber not being incremented in certain frames
2015-11-06 23:14:27 +01:00
scrawl
0210b87ffc
Revert "Fix LightSource crash"
...
This reverts commit f336c6db87
2015-11-06 23:14:27 +01:00
cc9cii
5b1373f3fd
Merge pull request #11 from cc9cii/jump-to-modified
...
Feature #2554
2015-11-07 07:46:07 +11:00
cc9cii
007c733578
Resolve merge issues and add back user preference setting for auto selecting a modified record.
...
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)
Conflicts:
apps/opencs/model/settings/usersettings.cpp
2015-11-07 07:17:46 +11:00
cc9cii
fb3015c9b8
Merge branch 'cc9cii' into jump-to-modified
...
Conflicts:
apps/opencs/view/world/table.cpp
apps/opencs/view/world/table.hpp
apps/opencs/view/world/tablesubview.cpp
2015-11-07 06:30:46 +11:00
scrawl
72252d4f32
Terrain: restore IncrementalCompileOperation
2015-11-06 20:22:07 +01:00
scrawl
7ca8e45d5d
Terrain: remove debug code
2015-11-06 20:21:39 +01:00
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.
2015-11-06 20:14:57 +01:00
scrawl
95cf13e3f2
Terrain: make the blendmapSize and layerTileSize in FixedFunctionTechnique configurable
2015-11-06 15:23:37 +01:00
cc9cii
9f4ecc2f8e
Merge pull request #10 from cc9cii/master-cherry-pick-3
...
Merge master (cherry pick 3)
2015-11-05 20:35:10 +11:00
Marc Zinnschlag
e081eb2c34
Merge remote-tracking branch 'origin/master'
2015-11-05 07:56:57 +01:00
