overte/tests
ZappoMan 027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
..
audio library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
jitter tweak format of report 2014-08-01 15:25:03 -07:00
metavoxels library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
networking improved re-sync handling of SequenceNumberStats 2014-08-04 11:09:20 -07:00
octree started support for new entity base class properties like velocity, gravity, damping, and lifetime 2014-08-08 11:38:03 -07:00
physics library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
shared library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
CMakeLists.txt library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00