Seth Alves 897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3		2017-12-22 07:36:26 -08:00
..
assets
commerce	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel	2017-12-20 09:18:10 -08:00
controllers	Make lasers scale with avatar	2017-12-15 13:46:15 -07:00
html	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
libraries	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
marketplaces	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
particle_explorer
tablet-ui
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js
chat.js
dialTone.js
directory.js	Fix diectory.js script's icon URL	2017-12-07 12:26:29 +13:00
edit.js	Fixing edit state detection	2017-12-18 14:03:13 -08:00
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
makeUserConnection.js	Fix handshake satyhing on when release "x" if Ctrl or similar pressed	2017-12-17 15:23:40 +13:00
menu.js
mod.js
nameTag.js
notifications.js
pal.js
progress.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js