Nissim Hadar 7f5897e90b Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance		2017-12-26 11:35:59 -08:00
..
animation	Fix for crash in AnimSkeleton::getNumJoints()	2017-12-15 16:46:27 -08:00
audio	Invalid WAV files should always be logged and not played	2017-12-14 10:20:46 -08:00
audio-client
auto-updater
avatars
avatars-renderer	cleaning up modelmeshpartpayload	2017-12-20 11:00:14 -08:00
baking
controllers
display-plugins	measure average time of 'present'	2017-12-20 17:41:08 -08:00
embedded-webserver
entities	WIP - adding AmbientLightPropertyGroup	2017-12-26 11:15:33 -08:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-26 11:35:59 -08:00
fbx
gl
gpu	weak_ptr _cacheFile	2017-12-17 22:31:09 -08:00
gpu-gl	Merge pull request #12017 from Zvork/glcolor	2017-12-22 14:25:51 -08:00
gpu-gles
image	fix equirectangular skybox loading	2017-12-18 13:21:12 -08:00
input-plugins
ktx
midi
model	Added missing space before {	2017-12-14 15:38:07 -08:00
model-networking
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-24 15:27:32 -08:00
octree	Merge pull request #12024 from birarda/bug/entity-sequence-skip	2017-12-22 12:30:27 -08:00
physics
plugins	measure average time of 'present'	2017-12-20 17:41:08 -08:00
pointers
procedural
recording
render	Merge branch 'master' into hazeOnTransparent	2017-12-14 11:41:53 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-22 15:41:59 -08:00
script-engine
shared	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
trackers
ui	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
ui-plugins