Brad Hefta-Gaub 44f45a3f29 Merge branch 'master' of https://github.com/highfidelity/hifi into showOverlayOnMenuPopup		2016-02-26 10:27:37 -08:00
..
animation
audio
audio-client
auto-updater
avatars
controllers
display-plugins
embedded-webserver
entities	fix logic typo	2016-02-25 18:09:35 -08:00
entities-renderer	Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix	2016-02-26 10:25:50 -08:00
fbx
gl
gpu
input-plugins
model	Merge pull request #7078 from zzmp/fix/light-intensity	2016-02-25 16:08:28 -08:00
model-networking
networking	Revert "verified domain ownership for full automatic networking"	2016-02-25 17:02:08 -08:00
octree	legacy support for EntityViewer.setKeyholeRadius()	2016-02-25 22:24:37 -08:00
physics
plugins
procedural
recording
render	final names for ViewFrustum intersection tests	2016-02-25 18:09:35 -08:00
render-utils	final names for ViewFrustum intersection tests	2016-02-25 18:09:35 -08:00
script-engine
shared	use shapeInFrustum() names again	2016-02-25 18:09:35 -08:00
ui	show the overlays when the context menu is shown	2016-02-26 10:12:23 -08:00