Stephen Birarda da3502eb6c resolve conflicts on merge with upstream/master		2015-07-08 18:41:48 -07:00
..
AddEntityOperator.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
AddEntityOperator.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
AtmospherePropertyGroup.cpp	standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color	2015-05-13 13:12:47 -07:00
AtmospherePropertyGroup.h
BoxEntityItem.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
BoxEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
DeleteEntityOperator.cpp	fix some warnings	2015-06-17 14:08:02 -07:00
DeleteEntityOperator.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
EntitiesLogging.cpp
EntitiesLogging.h
EntityActionFactoryInterface.h	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
EntityActionInterface.cpp	coding-standard / code-review	2015-06-30 19:28:22 -07:00
EntityActionInterface.h	coalesce dupe action data members: _id and _type	2015-07-07 17:50:08 -07:00
EntityEditPacketSender.cpp	cleanup edit message memory management in octree packet sending	2015-07-08 14:12:04 -07:00
EntityEditPacketSender.h	cleanup edit message memory management in octree packet sending	2015-07-08 14:12:04 -07:00
EntityItem.cpp	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
EntityItem.h	cleanup edit message memory management in octree packet sending	2015-07-08 14:12:04 -07:00
EntityItemID.cpp	make EntityItemID a subclass of QUuid	2015-05-20 14:22:08 -07:00
EntityItemID.h	Working on overlay refactor	2015-06-16 09:58:03 -07:00
EntityItemProperties.cpp	more packet creation fixes for entitites	2015-07-08 18:13:06 -07:00
EntityItemProperties.h	cleanup edit message memory management in octree packet sending	2015-07-08 14:12:04 -07:00
EntityItemPropertiesDefaults.h	Merge branch 'master' into 20547	2015-06-26 13:05:51 -07:00
EntityItemPropertiesMacros.h	Add "Reload" button associated with entity editor's script URL field	2015-06-17 16:11:32 -07:00
EntityPropertyFlags.h	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
EntityScriptingInterface.cpp	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
EntityScriptingInterface.h	fix spaces created by xcode find/replace	2015-07-07 15:01:19 -07:00
EntitySimulation.cpp	allow for removal and readdition of an action in one time-slice without asserting	2015-06-29 12:22:06 -07:00
EntitySimulation.h	move functions our of header to cpp file	2015-06-26 16:54:01 -07:00
EntityTree.cpp	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
EntityTree.h	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
EntityTreeElement.cpp	add stats for elements and entities per incoming packet	2015-07-02 16:19:13 -07:00
EntityTreeElement.h	update grab.js to use pull-to-point action, various other fixes	2015-06-05 07:10:44 -07:00
EntityTreeHeadlessViewer.cpp
EntityTreeHeadlessViewer.h	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
EntityTypes.cpp	Removed classes and the "hyperlink entity"	2015-06-09 11:27:57 -07:00
EntityTypes.h	remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity	2015-06-27 08:53:27 -07:00
LightEntityItem.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
LightEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
LineEntityItem.cpp	quiet compiler	2015-06-23 15:27:35 -07:00
LineEntityItem.h	line entity points are now local to entity position. Changed paint script to reflect this	2015-06-19 18:54:28 -07:00
ModelEntityItem.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
ModelEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
MovingEntitiesOperator.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
MovingEntitiesOperator.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
ParticleEffectEntityItem.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-27 19:58:11 -07:00
ParticleEffectEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
PolyVoxEntityItem.cpp	move multi-line function out of header	2015-06-18 11:07:50 -07:00
PolyVoxEntityItem.h	move multi-line function out of header	2015-06-18 11:07:50 -07:00
PropertyGroup.h
RecurseOctreeToMapOperator.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
RecurseOctreeToMapOperator.h
SimpleEntitySimulation.cpp	unbungle merge	2015-06-29 10:04:27 -07:00
SimpleEntitySimulation.h	more work on simulator priority	2015-06-26 21:57:04 -07:00
SimulationOwner.cpp	add priority promotion to reduce volunteer races	2015-06-26 22:30:06 -07:00
SimulationOwner.h	responses to code review	2015-07-01 10:29:42 -07:00
SkyboxPropertyGroup.cpp	standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color	2015-05-13 13:12:47 -07:00
SkyboxPropertyGroup.h	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
SphereEntityItem.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
SphereEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
StagePropertyGroup.cpp	clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe	2015-05-13 09:38:49 -07:00
StagePropertyGroup.h	add support for automatic hour/day calculations and backward compatibility on stage properties	2015-05-10 15:22:02 -07:00
TextEntityItem.cpp	Added faceCamera property to Text Entities	2015-06-25 15:38:38 -07:00
TextEntityItem.h	Added faceCamera property to Text Entities	2015-06-25 15:38:38 -07:00
UpdateEntityOperator.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
UpdateEntityOperator.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
WebEntityItem.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
WebEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
ZoneEntityItem.cpp	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
ZoneEntityItem.h	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00