Aesylwinn
59f59a3385
Fix indentation
2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1
Preliminary editor camera
2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643
Remove unnecessary override.
2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581
Fix callback being skipped
2016-03-14 00:44:56 -04:00
Aesylwinn
ebdc212886
Moved selectNavigationMode to SceneWidget class, centralized camera selection.
2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90
Input restructuring.
2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b
Removed now unnecessary installation of event filter.
2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7
Removed workaround for OSG input handling in RenderWidget.
2016-03-14 00:41:04 -04:00
Aesylwinn
48047beb9a
Stripped OSG mouse and keyboard handling.
2016-03-14 00:40:40 -04:00
scrawl
24ae9f4ac1
Remove no longer needed apply(Geode&) in SetFilterSettingsVisitor and NodeToShapeVisitor
...
In OSG 3.4 (which is now a requirement), Drawables are normal Nodes attached in the scene graph. Geode is still provided for backwards compatibility, but does not need to be specially handled here because it now functions just like a normal Group node.
2016-03-14 00:38:22 +01:00
scrawl
e8caafa190
Remove no longer needed applyEffect(osgFX::Effect&) in SetFilterSettingsVisitor
...
No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.
2016-03-14 00:31:43 +01:00
scrawl
50acdf3e47
Move createCharacter inside the try block
2016-03-14 00:03:02 +01:00
scrawl
a0cc9de088
Make the creation of save file directories even more explicit
2016-03-14 00:00:11 +01:00
scrawl
b7b7c0612d
Make getCurrentCharacter create argument explicit
2016-03-13 23:48:44 +01:00
scrawl
7463c0c353
Addition to last commit, don't create a save directory on death
2016-03-13 23:48:22 +01:00
scrawl
426a6fdcc2
Don't create the save directory on loading a game
...
This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.
2016-03-13 23:42:08 +01:00
scrawl
d7c7bb850b
ToggleAI cleanup
2016-03-12 20:32:42 +01:00
Marc Zinnschlag
d5067201d0
Merge branch 'move'
2016-03-12 13:27:00 +01:00
Marc Zinnschlag
900378a31e
changed 'not implemented' warning message for object movement
2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46
handle cell transitions when moving objects
2016-03-12 13:19:51 +01:00
Marc Zinnschlag
5c587fe93e
Merge remote-tracking branch 'scrawl/cs_waterlevel'
2016-03-12 08:07:38 +01:00
scrawl
d840c7d5eb
Slightly tweak the spawn point heuristics
...
Fixes an issue with hlaalu building exits
2016-03-11 22:48:28 +01:00
scrawl
97526284f5
Allow setting the water level of an interior cell with sky ( Fixes #3244 )
2016-03-11 22:10:59 +01:00
scrawl
d986b1a48b
Add comment
2016-03-11 19:28:53 +01:00
scrawl
1abb77f8a1
Cleanup
2016-03-11 19:18:51 +01:00
scrawl
9f03982e0b
Use a dedicated VBO for RigGeometry's vertices and normals
...
The VBO used by the source geometry's arrays may be unintentionally shared with other RigGeometries.
The vertices and normals are the only attributes that are modified at all, so using a dedicated VBO for these should improve performance further.
2016-03-11 19:08:48 +01:00
scrawl
50b8260a39
Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d
2016-03-11 18:21:55 +01:00
scrawl
aae43dbff5
Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
2016-03-11 16:10:39 +01:00
scrawl
4eb090a8d0
Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
2016-03-11 16:09:48 +01:00
scrawl
174dd82894
Manually apply the osg::Light state
...
Reduce the amount of virtual function calls. Don't use the osg::Light's lightNum. Don't set spotlight state that we're not using (yet).
2016-03-11 15:43:20 +01:00
Marc Zinnschlag
fa9689c5e7
delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)
2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef
Merge branch 'master' into move
2016-03-11 12:47:33 +01:00
scrawl
58e0e8bd4e
Enable vertex buffer objects in RigGeometry
2016-03-11 01:39:09 +01:00
scrawl
0dbf44b414
Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency
2016-03-11 01:35:57 +01:00
scrawl
3f08cbff71
Share the state attributes for terrain techniques
...
Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.
2016-03-11 01:08:53 +01:00
scrawl
84b8da7a09
Share the osg::Material on drawables
...
Reduces the number of GL calls / frame by ~4%.
2016-03-11 01:06:54 +01:00
scrawl
85bd4f52f0
Improve occlusion query geometry rendering
2016-03-11 00:09:46 +01:00
scrawl
93ec289b1d
Improve setting of occlusion query state
2016-03-10 23:18:20 +01:00
scrawl
14e1911820
Fix memory leaks
2016-03-10 20:38:14 +01:00
scrawl
abcfe9bcee
Don't add empty text key objects
2016-03-10 17:01:14 +01:00
scrawl
02d23564dc
Include cleanup
2016-03-10 14:29:45 +01:00
scrawl
f898bf493f
Don't use Geodes
2016-03-10 13:17:01 +01:00
scrawl
137dde7cf8
Include cleanup
2016-03-10 12:59:17 +01:00
ae-g-i-s
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
2016-03-08 21:30:28 +01:00
ae-g-i-s
2f1c6c740c
Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )"
...
This reverts commit 000597236e
2016-03-08 20:41:39 +01:00
ae-g-i-s
9585a12fb1
Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check
2016-03-08 20:40:47 +01:00
Marc Zinnschlag
b2181fae20
safer handling of command macros
2016-03-08 10:48:44 +01:00
scrawl
121bdd3e39
Update comment
2016-03-07 22:46:15 +01:00
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
2016-03-07 22:44:03 +01:00
scrawl
d0aba0d9ee
Catch exceptions thrown during reference loading (Bug #3238 )
2016-03-07 21:28:50 +01:00
