overte/tests
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
..
audio replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
metavoxels Include an additional bit with the objects that says whether what follows is 2014-06-30 12:35:34 -07:00
networking fixed warnings 2014-06-30 16:10:58 -07:00
octree Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 2014-07-01 16:32:47 -07:00
physics fixed some windows warnings 2014-06-24 20:07:47 -07:00
shared added tests for MovingPercentile 2014-06-04 17:23:44 -07:00
CMakeLists.txt complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00