589fb1031b
Merge remote-tracking branch 'pi03k/bug_3248'
9 years ago
a6e23d03d3
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
9 years ago
102f9719f7
Remove some garbage
9 years ago
79eb2d20e0
Cleanup
9 years ago
12ec90f9e7
Change default argument, fix GetDisposition
9 years ago
bc5adfa4fe
Merge pull request #913
9 years ago
30402f75e3
Use xbase_anim_female as the base skeleton for female NPCs ( Fixes #3258 )
9 years ago
2b38d10449
Always add xbase_anim
9 years ago
629a558e7b
Fix for bug 3248
9 years ago
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.
9 years ago
e8caafa190
Remove no longer needed applyEffect(osgFX::Effect&) in SetFilterSettingsVisitor
...
No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.
9 years ago
50acdf3e47
Move createCharacter inside the try block
9 years ago
a0cc9de088
Make the creation of save file directories even more explicit
9 years ago
b7b7c0612d
Make getCurrentCharacter create argument explicit
9 years ago
7463c0c353
Addition to last commit, don't create a save directory on death
9 years ago
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.
9 years ago
d7c7bb850b
ToggleAI cleanup
9 years ago
d5067201d0
Merge branch 'move'
9 years ago
900378a31e
changed 'not implemented' warning message for object movement
9 years ago
d6b8033b46
handle cell transitions when moving objects
9 years ago
5c587fe93e
Merge remote-tracking branch 'scrawl/cs_waterlevel'
9 years ago
d840c7d5eb
Slightly tweak the spawn point heuristics
...
Fixes an issue with hlaalu building exits
9 years ago
97526284f5
Allow setting the water level of an interior cell with sky ( Fixes #3244 )
9 years ago
d986b1a48b
Add comment
9 years ago
1abb77f8a1
Cleanup
9 years ago
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.
9 years ago
50b8260a39
Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d
9 years ago
aae43dbff5
Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
9 years ago
4eb090a8d0
Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW
9 years ago
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).
9 years ago
fa9689c5e7
delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)
9 years ago
6a2fe564ef
Merge branch 'master' into move
9 years ago
58e0e8bd4e
Enable vertex buffer objects in RigGeometry
9 years ago
0dbf44b414
Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency
9 years ago
3f08cbff71
Share the state attributes for terrain techniques
...
Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.
9 years ago
84b8da7a09
Share the osg::Material on drawables
...
Reduces the number of GL calls / frame by ~4%.
9 years ago
85bd4f52f0
Improve occlusion query geometry rendering
9 years ago
93ec289b1d
Improve setting of occlusion query state
9 years ago
14e1911820
Fix memory leaks
9 years ago
abcfe9bcee
Don't add empty text key objects
9 years ago
02d23564dc
Include cleanup
9 years ago
f898bf493f
Don't use Geodes
9 years ago
137dde7cf8
Include cleanup
9 years ago
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
9 years ago
2f1c6c740c
Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )"
...
This reverts commit 000597236e
9 years ago
9585a12fb1
Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check
9 years ago
b2181fae20
safer handling of command macros
9 years ago
121bdd3e39
Update comment
9 years ago
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
9 years ago
d0aba0d9ee
Catch exceptions thrown during reference loading (Bug #3238 )
9 years ago
Marc Zinnschlag
scrawl
pi03k
ae-g-i-s