Liv Erickson de05388ebf Merge branch 'master' of github.com:highfidelity/hifi into clone-server		2018-05-18 10:42:26 -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	add comment	2018-05-16 11:39:53 -07:00
html	tweaks	2018-05-15 17:36:39 -07:00
libraries	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 17:31:43 -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
chat.js
dialTone.js
directory.js
edit.js	MS3128: Remove vestigal Edit menu item	2018-05-07 14:39:31 -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
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