ZappoMan
|
3c4f5f88d0
|
checkpoint on virtual entities
|
2014-07-09 18:24:31 -07:00 |
|
ZappoMan
|
a4b7673a2c
|
some more virtual entity work
|
2014-07-07 14:29:03 -07:00 |
|
ZappoMan
|
3145d150f3
|
more work on virtual entities, unit tests passing woot
|
2014-07-07 12:56:32 -07:00 |
|
ZappoMan
|
2c5209d1e7
|
virtual entities checkpoint
|
2014-07-03 09:07:11 -07:00 |
|
ZappoMan
|
84101fce2c
|
naming cleanup and organizational tweaks
|
2014-07-02 11:22:56 -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
|
c4fe36b13d
|
more Models->Entities renaming
|
2014-06-26 17:01:07 -07:00 |
|