History

Merge branch 'master' of https://github.com/worklist/hifi into 20638

Thijs Wenker committed 11 years ago

Commit d10ae4a2 parents 25266b9 e9f2cad218 files · +3015 −4726Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−3
@@ -20,7 +20,6 @@ · 19 unmodified lines
20#include <AudioConstants.h>20#include <AudioConstants.h>
21#include <AudioEffectOptions.h>21#include <AudioEffectOptions.h>
22#include <AvatarData.h>22#include <AvatarData.h>
23#include <CollisionInfo.h>
24#include <EntityScriptingInterface.h>23#include <EntityScriptingInterface.h>
25#include <NetworkAccessManager.h>24#include <NetworkAccessManager.h>
26#include <NodeList.h>25#include <NodeList.h>
@@ -370,8 +369,6 @@ void ScriptEngine::init() { · 343 unmodified lines
370 369
371 // constants370 // constants
372 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));371 globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE)));
373 globalObject().setProperty("COLLISION_GROUP_ENVIRONMENT", newVariant(QVariant(COLLISION_GROUP_ENVIRONMENT)));
374 globalObject().setProperty("COLLISION_GROUP_AVATARS", newVariant(QVariant(COLLISION_GROUP_AVATARS)));
375}372}
376 373
377QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {374QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {