Dante Ruiz 3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates		2018-05-18 16:42:31 -07:00
..
+android	Add missing js to haptic feedback change	2018-05-17 11:49:44 -03:00
assets	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
commerce	Finalize work on MS14295 and MS14559	2018-04-27 12:03:54 -07:00
controllers	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
html	Remove calls to function that's been removed	2018-05-05 12:14:40 +12:00
libraries	don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds	2018-05-11 17:07:51 -07:00
marketplaces	MS15090: Fix gifting when running marketplaces.js separately	2018-05-14 13:12:58 -07:00
particle_explorer	fix alpha sliders for particles	2018-04-26 12:54:37 -07:00
tablet-ui
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js	Prevent the Bubble icon from ever blinking as per 14026	2018-04-10 16:00:35 -07:00
chat.js
dialTone.js
directory.js
edit.js	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
emote.js
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js	adding windows	2018-05-08 15:10:57 -07:00
makeUserConnection.js
menu.js	making requested changes	2018-05-18 16:41:39 -07:00
mod.js
nameTag.js
notifications.js	Add cubemap output format	2018-05-03 12:57:00 -07:00
pal.js	untabify	2018-05-10 16:39:56 -07:00
progress.js
run.js
snapshot.js	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
tablet-goto.js
tablet-users.js
voxels.js