Brad Davis 070fb25b80 Cleaning up differnces from master		2019-02-07 13:33:28 -08:00
..
+android_interface	update urls	2019-02-06 14:25:25 -08:00
assets	Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips	2019-01-28 14:18:46 -08:00
commerce	QmlMarketplace Bugfixes	2019-01-29 16:07:27 -08:00
controllers	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats	2019-01-22 12:58:56 -08:00
html	Cleaning up differnces from master	2019-02-07 13:33:28 -08:00
libraries	skip child entities of mismatching entityHostType when copy/delete/duplication of entities	2019-01-30 03:15:32 +01:00
marketplaces	QmlMarketplace - fix issue with footer not appearing in marketplaces list	2019-02-04 15:04:18 -08:00
modules	- EntityShapeVisualizer.updateSelection -> EntityShapeVisualizer.setEntities (for a more generic use)	2019-01-28 16:10:29 +01:00
tablet-ui
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarapp.js	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
avatarFinderBeacon.js
away.js
bubble.js
chat.js
dialTone.js
directory.js
edit.js	skip child entities of mismatching entityHostType when copy/delete/duplication of entities	2019-01-30 03:15:32 +01:00
emote.js
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js	Cleaning up differnces from master	2019-02-07 13:33:28 -08:00
help.js
hmd.js
inspect.js
interstitialPage.js	adding sound to login screen	2018-11-21 13:36:36 -08:00
makeUserConnection.js	Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-10 14:08:38 -08:00
menu.js
miniTablet.js	Cleaning up differnces from master	2019-02-07 13:33:28 -08:00
mod.js
nameTag.js
notifications.js
pal.js
progress.js
quickGoto.js	+android -> +android_interface	2019-02-06 11:37:52 -08:00
redirectOverlays.js
request-service.js
run.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js