Nissim Hadar a33f3446f6 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance		2018-01-08 11:51:13 -08:00
..
animation
audio
audio-client
auto-updater
avatars
avatars-renderer	Merge pull request #11945 from jherico/android_nov	2018-01-05 13:34:03 -08:00
baking
controllers	Code review feedback	2018-01-04 14:21:53 -08:00
display-plugins	Merge pull request #11945 from jherico/android_nov	2018-01-05 13:34:03 -08:00
embedded-webserver
entities	Set skybox mode as per legacy background mode if needed.	2018-01-08 11:50:28 -08:00
entities-renderer	Removed BackgroundMode packet type.	2018-01-07 13:50:42 -08:00
fbx	better fix for model scale floor, remove abs	2018-01-04 17:49:39 -08:00
gl
gpu
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model
model-networking
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-08 11:51:13 -08:00
octree	Removed BackgroundMode packet type.	2018-01-07 13:50:42 -08:00
physics	Merge pull request #12002 from howard-stearns/consistent-goToUser	2018-01-07 11:07:39 -08:00
plugins	Merge pull request #11945 from jherico/android_nov	2018-01-05 13:34:03 -08:00
pointers
procedural
recording
render	always push default haze to current frame	2018-01-04 17:54:23 -08:00
render-utils	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2018-01-05 23:11:40 -08:00
script-engine	Removed background mode from code (still in the protocol).	2018-01-04 18:23:25 -08:00
shared	Deleted unused include file.	2018-01-07 14:11:26 -08:00
trackers
ui	Merge pull request #11945 from jherico/android_nov	2018-01-05 13:34:03 -08:00
ui-plugins