Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-21 16:28:29 +01:00
21 changed files with 609 additions and 414 deletions

View File

@@ -155,10 +155,6 @@
; it may cause unexpected physics problems.
;UseMeshiesPhysicsMesh = false
; enable / disable Collada mesh support
; default is true
; ColladaMesh = true
; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom
@@ -460,6 +456,12 @@
CoalesceMultipleObjectsToInventory = true
[Mesh]
; enable / disable Collada mesh support
; default is true
ColladaMesh = true
[ODEPhysicsSettings]
;##
;## World Settings