Commit graph

58 commits

Author SHA1 Message Date
ZappoMan
29e02f2681 more hacking on virtualizing entities 2014-07-07 09:36:31 -07:00
ZappoMan
c449ba27a9 more virtual entity work 2014-07-03 15:18:17 -07:00
ZappoMan
5e5af9ceea hacking on more support for virtual entities 2014-07-03 10:44:34 -07:00
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -07:00
ZappoMan
fe30d3807c more renaming to entity from model where we're really talking about an entity 2014-07-01 17:07:16 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
ZappoMan
ad7a768fff more renaming work 2014-06-27 09:14:17 -07:00
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
Renamed from libraries/models/src/EntityTreeElement.cpp (Browse further)