Thijs Wenker e94199acad Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName		2017-11-20 18:29:54 +01:00
..
animation	9267 Fix not restoring animations after changing view modes	2017-11-15 15:04:24 -07:00
audio	HRTF cleanup	2017-10-29 18:01:43 -07:00
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	Bug fix for MyAvatar.getEyeHeight()	2017-11-15 11:27:42 -08:00
baking
controllers
display-plugins
embedded-webserver	Fix domain server label not handling spaces correctly	2017-11-08 13:09:42 -08:00
entities	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +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	Merged with master	2017-11-13 14:33:59 +01:00
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
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	Merge pull request #11559 from Zvork/bloom	2017-11-15 15:11:31 -08:00
script-engine	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07: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	minimize diff	2017-11-17 16:06:34 -08:00
ui-plugins