Seth Alves df07b66872 Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes		2017-11-20 07:47:19 -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	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -08:00
avatars-renderer	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -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 pull request #11841 from ZappoMan/makeAddEntityAtomic	2017-11-18 14:27:12 -08: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	Merge pull request #11841 from ZappoMan/makeAddEntityAtomic	2017-11-18 14:27:12 -08: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
shared	Merge pull request #11770 from AndrewMeadows/sort-and-throttle	2017-11-19 11:09:08 -08:00
trackers
ui	minimize diff	2017-11-17 16:06:34 -08:00
ui-plugins