David Rowe a34e1f69e0 Merge branch 'master' into M19345 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabOverlay.js		2018-11-09 14:26:29 +13:00
..
+android
assets	tooltip CR changes	2018-10-31 18:26:23 +01:00
commerce	activity notifications also change ASSETS to INVENTORY	2018-11-05 16:43:06 -08:00
controllers	Merge branch 'master' into M19345	2018-11-09 14:26:29 +13:00
html	Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles	2018-11-08 12:42:48 -08:00
libraries	Make Create not grab tablet if editing an entity with hand	2018-10-25 15:03:47 +13:00
marketplaces	3D Keyboard	2018-11-08 09:58:53 -08:00
modules
tablet-ui
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarapp.js	Use useragent instead of queryparam to determine limitedCommerce	2018-11-02 16:07:29 -07:00
avatarFinderBeacon.js
away.js
bubble.js
chat.js
dialTone.js
directory.js
edit.js	Merge pull request #14325 from huffman/fix/new-model-dynamic	2018-11-08 10:22:12 -08:00
emote.js
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
inspect.js
interstitialPage.js	fixing Image3DOverlay scaling	2018-11-02 14:24:14 -07:00
makeUserConnection.js
menu.js
miniTablet.js
mod.js
nameTag.js
notifications.js	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
pal.js	Notifications are working!	2018-10-31 13:23:58 -07:00
progress.js
redirectOverlays.js
request-service.js
run.js
snapshot.js
tablet-goto.js	Notifications are working!	2018-10-31 13:23:58 -07:00
tablet-users.js
voxels.js