Brad Hefta-Gaub 817afcd083 Merge pull request #11741 from ZappoMan/entityItemCleanup ... Entity item cleanup		2017-11-21 12:24:46 -08:00
..
animation	9267 Fix not restoring animations after changing view modes	2017-11-15 15:04:24 -07:00
audio
audio-client
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
avatars-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
baking
controllers
display-plugins
embedded-webserver
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
entities-renderer	fix build error	2017-11-19 15:12:23 -08:00
fbx	Merge pull request #11308 from luiscuenca/patch-1	2017-11-17 14:52:51 -08:00
gl
gpu
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model
model-networking	Merge pull request #11308 from luiscuenca/patch-1	2017-11-17 14:52:51 -08:00
networking	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
octree	Merge pull request #11841 from ZappoMan/makeAddEntityAtomic	2017-11-18 14:27:12 -08:00
physics	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
plugins
pointers
procedural
recording
render	Merge pull request #11770 from AndrewMeadows/sort-and-throttle	2017-11-19 11:09:08 -08:00
render-utils	Merge pull request #11559 from Zvork/bloom	2017-11-15 15:11:31 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-11-20 10:07:11 -08:00
shared	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
trackers
ui	Merge pull request #11706 from luiscuenca/webAudioDev_fresh	2017-11-21 11:29:48 -08:00
ui-plugins