Olivier Prat cdb94d0832 Merge branch 'master' of git://github.com/highfidelity/hifi into scribe		2018-01-16 16:43:50 +01: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
baking	changed pointer args to references in JSBaker:bakeJS()	2017-10-12 12:08:44 -07:00
controllers	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
entities	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
gpu-test	Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends	2017-12-19 14:17:17 +01:00
jitter	checkpoint	2015-11-20 15:19:45 -06:00
ktx	Improving test code for KTX library	2017-05-30 10:47:49 -07:00
mocha	Convert all simple one-liners containing ') { ' to instead take up three lines.	2016-02-10 12:03:07 -08:00
networking	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
octree	allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU	2017-11-04 13:40:41 -07:00
physics	cleanup ShapeInfo::getHash()	2017-10-27 07:52:51 -07:00
qt59	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
recording	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
render-perf	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
render-texture-load	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
render-utils	Updating all wasapi dependencies	2017-10-27 13:38:13 -07:00
shaders	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
shared	Renamed imag component to dual, using the correct nomenclature	2018-01-08 18:21:23 -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
QTestExtensions.h	Changed grammar to support boolean and and or.	2015-12-15 10:35:35 -08:00