Dante Ruiz 3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates		2018-05-18 16:42:31 -07:00
..
animation
audio
audio-client
auto-updater
avatars
avatars-renderer
baking
controllers
display-plugins	fix resolution option	2018-05-17 16:58:35 -07:00
embedded-webserver
entities
entities-renderer
fbx
gl
gpu	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
gpu-gl	Fix populated texture size tracking	2018-05-18 09:23:54 -07:00
gpu-gl-common	Fix flicker while transferring texture data	2018-05-18 09:23:54 -07:00
gpu-gles	Fix populated texture size tracking	2018-05-18 09:23:54 -07:00
graphics	Merge branch 'master' into 21872-b	2018-05-17 20:11:14 +12:00
graphics-scripting
image
input-plugins	Merge pull request #12935 from gcalero/android_new_login	2018-05-17 15:53:25 -07:00
ktx
midi
model-networking
networking	Deprecate Agent API items that shouldn't be exposed in the API	2018-05-18 07:32:25 +12:00
octree
physics	Merge pull request #13162 from AndrewMeadows/avatar-collisions	2018-05-16 09:25:05 -07:00
plugins	Merge pull request #13194 from SamGondelman/resolution	2018-05-18 15:23:01 -07:00
pointers
procedural	Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned	2018-05-18 13:25:08 -07:00
qml
recording
render	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -07:00
render-utils	Check isHazeEnabled() vs 0.0 to compile on GLES	2018-05-18 15:59:24 -03:00
script-engine
shared	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
task
test-utils
trackers
ui	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
ui-plugins
workload