Seth Alves 17b83dd64c Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1		2017-04-21 17:19:47 -07:00
..
animation
audio	fix bitrot from AudioRingBuffer API change	2016-12-28 18:12:22 -08:00
controllers
entities
gpu-test	simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'	2017-04-18 17:05:40 -07:00
jitter
ktx	Revert "Revert "Don't hold KTX files open for longer than transfers require""	2017-03-28 14:45:04 -07:00
mocha
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval	2016-12-29 16:42:52 -08:00
octree
physics
recording
render-perf	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
render-texture-load	Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture	2017-03-23 18:10:09 -07:00
render-utils	Still trying to fix build error	2017-03-23 14:09:34 -07:00
shaders
shared	Merge branch 'master' into smarter_textures	2017-03-06 15:29:41 -08:00
ui
CMakeLists.txt
GLMTestUtils.h
QTestExtensions.h