Brad Hefta-Gaub 5dadec0b93 Merge pull request #11845 from thoys/feat/parentJointName ... Import JSON parentJointName value		2017-11-21 07:58:13 -08:00
..
animation
audio
audio-client
auto-updater
avatars	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
avatars-renderer
baking
controllers
display-plugins
embedded-webserver
entities	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
entities-renderer	Merge pull request #11770 from AndrewMeadows/sort-and-throttle	2017-11-19 11:09:08 -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
plugins
pointers
procedural
recording
render	Merge pull request #11770 from AndrewMeadows/sort-and-throttle	2017-11-19 11:09:08 -08:00
render-utils
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 #11848 from zfox23/commerce_flipTheSwitch	2017-11-20 16:18:53 -08:00
ui-plugins