samcake 882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown		2017-05-26 16:47:49 -07:00
..
animation	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
audio	fix bitrot from AudioRingBuffer API change	2016-12-28 18:12:22 -08:00
controllers	Fix tests/controllers/src/main.cpp clang/gcc warnings	2017-04-28 14:12:00 -07:00
entities	Enabling OSX Oculus plugin	2016-08-12 22:28:43 -07:00
gpu-test	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
jitter	checkpoint	2015-11-20 15:19:45 -06:00
ktx	PR feedback	2017-05-25 15:03:39 -07:00
mocha	Convert all simple one-liners containing ') { ' to instead take up three lines.	2016-02-10 12:03:07 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval	2016-12-29 16:42:52 -08:00
octree	OctreeTests: added unit tests for EntityTreeElement child accessors	2016-03-30 16:15:29 -07:00
physics	remove cmake warning about untestable CPP file	2016-10-05 13:06:36 -07:00
recording	checkpoint	2015-11-20 15:19:45 -06:00
render-perf	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
render-texture-load	Fix atp-get compile error	2017-04-26 10:49:23 -07:00
render-utils	Still trying to fix build error	2017-03-23 14:09:34 -07:00
shaders	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-06 09:35:48 -07:00
shared	Merge branch 'master' into smarter_textures	2017-03-06 15:29:41 -08:00
ui	Remove all oglplus usage and references	2016-10-02 11:44:34 -07:00
CMakeLists.txt	Fix build (and remove unneeded test file).	2016-02-08 09:33:32 -08:00
GLMTestUtils.h	add QCOMPARE_QUATS macro for easier tests	2015-08-12 17:52:54 -07:00
QTestExtensions.h	Changed grammar to support boolean and and or.	2015-12-15 10:35:35 -08:00