Dante Ruiz 9bd368c0a9 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1		2017-09-01 08:27:09 -07:00
..
assets
commerce	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
controllers	code cleanup	2017-08-31 22:30:30 -07:00
html	Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:41:44 -07:00
libraries	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-30 08:25:53 -07:00
marketplaces	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
particle_explorer	Change emitShouldTrail to emitterShouldTrail.	2017-08-18 15:10:58 -07:00
tablet-ui
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js
chat.js
dialTone.js
directory.js
edit.js	6819 - Create button not disabled	2017-08-29 23:49:44 +03: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
menu.js
mod.js
nameTag.js
notifications.js
pal.js
progress.js
snapshot.js	fix wallet login (and share code with snapshot login)	2017-08-29 16:05:01 -07:00
tablet-goto.js	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03:00
tablet-users.js
voxels.js