Merge pull request #14524 from SamGondelman/NOverlays3

Case 20132, Case 16928: First class Image Entities

Shannon Romano committed 7 years ago

Commit 21ec4e02 parents b6d1607 e890fc637 files · +1152 −231Browse files

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

Unified · Split

@@ -698,6 +698,10 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 697 unmodified lines
698	698	psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AvatarEntity);
699	699	} else if (extendedPropertyString == "localEntity") {
700	700	psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::LocalEntity);
	701	+ } else if (extendedPropertyString == "faceCamera") {
	702	+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FaceCamera);
	703	+ } else if (extendedPropertyString == "isFacingAvatar") {
	704	+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::IsFacingAvatar);
701	705	}
702	706	};
703	707