SamGondelman bd942ec406 merge from master		2017-08-04 12:17:54 -07:00
..
assets
controllers	merge from master	2017-08-04 12:17:54 -07:00
html	Merge pull request #11061 from TurnMeUp-OG/21470	2017-08-01 15:10:26 -07:00
libraries	readded line that caused colflict.	2017-07-24 16:51:23 -07:00
marketplaces	Bugfixes	2017-07-26 13:17:51 -07:00
particle_explorer
tablet-ui	Hack to mod tablet orientation when clicking context overlay	2017-07-24 14:29:06 -07:00
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js
chat.js	remove semi-colon	2017-07-31 08:02:18 -07:00
dialTone.js
directory.js
edit.js	Merge pull request #11016 from highfidelity/context-overlays	2017-08-03 16:28:14 -07:00
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"	2017-08-01 13:41:28 -04:00
makeUserConnection.js
menu.js
mod.js
nameTag.js
notifications.js
pal.js	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
progress.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js