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
|
b113c2d55c
|
fix readEntityIDFromBuffer
|
2014-06-27 11:56:59 -07:00 |
|
ZappoMan
|
d618b4226b
|
entity type work, and byte coding for id and type
|
2014-06-27 10:53:55 -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 |
|