David Rowe cddb054066 Merge branch 'master' into vr-edit-h ... # Conflicts: # libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp # scripts/system/controllers/handControllerGrab.js		2017-08-20 18:41:29 +12:00
..
assets	Add beeps	2017-06-24 14:26:01 +12:00
controllers	Merge branch 'master' into vr-edit-h	2017-08-20 18:41:29 +12:00
html	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2	2017-08-18 15:40:24 -07:00
libraries	Merge branch 'master' into vr-edit-h	2017-08-20 18:41:29 +12:00
marketplaces	moved blocksApp.js to unpublished scripts, added icon	2017-08-17 10:18:29 -07:00
particle_explorer	Removed unneccessary print	2017-06-13 20:43:14 +03:00
tablet-ui	Hack to mod tablet orientation when clicking context overlay	2017-07-24 14:29:06 -07:00
attachedEntitiesManager.js
audio.js	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
audioMuteOverlay.js	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
audioScope.js
avatarFinderBeacon.js
away.js	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
bubble.js	added comment	2017-06-02 09:47:03 -07:00
chat.js	remove semi-colon	2017-07-31 08:02:18 -07:00
dialTone.js	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
directory.js
edit.js	Merge branch 'master' into vr-edit-h	2017-08-20 18:41:29 +12:00
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js	a couple logging fixes	2017-08-14 17:34:32 -07:00
hmd.js	Capitalize "ENTER VR"	2017-08-04 17:19:26 -07:00
makeUserConnection.js	remove extra activity logger call	2017-05-31 13:28:57 -07:00
menu.js	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
mod.js
nameTag.js
notifications.js	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
pal.js	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
progress.js	fix reference to pending transfer count for progress/stats	2017-05-26 14:37:24 -07:00
snapshot.js	a couple logging fixes	2017-08-14 17:34:32 -07:00
tablet-goto.js
tablet-users.js
voxels.js