History

Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic

Seth Alves committed 11 years ago

Commit bc656162 parents 2ca592d ad7293d91 files · +3861 −880Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 91 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+9−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
15#include "EntityTree.h"15#include "EntityTree.h"
16#include "LightEntityItem.h"16#include "LightEntityItem.h"
17#include "ModelEntityItem.h"17#include "ModelEntityItem.h"
18#include "ZoneEntityItem.h"
18 19
19 20
20EntityScriptingInterface::EntityScriptingInterface() :21EntityScriptingInterface::EntityScriptingInterface() :
@@ -306,6 +307,14 @@ bool EntityScriptingInterface::getLightsArePickable() const { · 285 unmodified lines
306 return LightEntityItem::getLightsArePickable();307 return LightEntityItem::getLightsArePickable();
307}308}
308 309
310void EntityScriptingInterface::setZonesArePickable(bool value) {
311 ZoneEntityItem::setZonesArePickable(value);
312}
313
314bool EntityScriptingInterface::getZonesArePickable() const {
315 return ZoneEntityItem::getZonesArePickable();
316}
317
309void EntityScriptingInterface::setSendPhysicsUpdates(bool value) {318void EntityScriptingInterface::setSendPhysicsUpdates(bool value) {
310 EntityItem::setSendPhysicsUpdates(value);319 EntityItem::setSendPhysicsUpdates(value);
311}320}