Brad Davis ef2d71e576 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: libraries/input-plugins/src/input-plugins/SixenseManager.cpp		2015-10-27 09:41:58 -07:00
..
animation	Better head IK when in an HMD.	2015-09-22 19:58:21 -07:00
audio
controllers	Working on JSON parsing and cleanup	2015-10-20 10:20:28 -07:00
entities	CR	2015-10-09 13:18:05 -07:00
gpu-test	Cleanup CMake files	2015-10-11 00:01:03 -07:00
jitter
networking
octree	first cut at adding surface normals to ray intersection	2015-09-27 21:57:50 -07:00
physics	Cleanup CMake files	2015-10-11 00:01:03 -07:00
render-utils	Remove cmake debug code	2015-10-26 12:07:12 -07:00
shaders	Remove cmake debug code	2015-10-26 12:07:12 -07:00
shared
ui	add override to supress warnings in ui-test	2015-10-05 15:53:52 -07:00
CMakeLists.txt
GLMTestUtils.h
QTestExtensions.h