History

enable avatar collisions by default

also remove old gravity features

Andrew Meadows committed 11 years ago

Commit be5fdbf1 parent b9b2c309 files · +27 −99Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 9 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−4
@@ -360,10 +360,6 @@ void ScriptEngine::init() { · 359 unmodified lines
360 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));360 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));
361 globalObject().setProperty("COLLISION_GROUP_ENVIRONMENT", newVariant(QVariant(COLLISION_GROUP_ENVIRONMENT)));361 globalObject().setProperty("COLLISION_GROUP_ENVIRONMENT", newVariant(QVariant(COLLISION_GROUP_ENVIRONMENT)));
362 globalObject().setProperty("COLLISION_GROUP_AVATARS", newVariant(QVariant(COLLISION_GROUP_AVATARS)));362 globalObject().setProperty("COLLISION_GROUP_AVATARS", newVariant(QVariant(COLLISION_GROUP_AVATARS)));
363
364 globalObject().setProperty("AVATAR_MOTION_OBEY_LOCAL_GRAVITY", newVariant(QVariant(AVATAR_MOTION_OBEY_LOCAL_GRAVITY)));
365 globalObject().setProperty("AVATAR_MOTION_OBEY_ENVIRONMENTAL_GRAVITY", newVariant(QVariant(AVATAR_MOTION_OBEY_ENVIRONMENTAL_GRAVITY)));
366
367}363}
368 364
369QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {365QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {