Zach Fox be737af79d Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies		2017-12-08 14:08:35 -08:00
..
assets
commerce	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
controllers	Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling	2017-12-08 07:17:59 -08:00
html	Merge pull request #11936 from ElderOrb/FB10108	2017-12-08 07:02:15 -08:00
libraries	Merge pull request #11897 from Delanir/Gizmos	2017-12-08 07:09:09 -08:00
marketplaces	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies	2017-12-08 14:08:35 -08:00
particle_explorer	Display "no preview available" for ATP images in particles UI	2017-11-10 10:23:35 +13:00
tablet-ui	home button is circle instead of sphere, fixed positioning, fix lasers on tablet	2017-11-17 15:24:21 -08:00
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js
chat.js	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
dialTone.js
directory.js	Fix diectory.js script's icon URL	2017-12-07 12:26:29 +13:00
edit.js	7991 Change Instances of Edit Mode to Create Mode	2017-11-27 22:47:42 +03:00
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
makeUserConnection.js
menu.js
mod.js
nameTag.js
notifications.js	no double scaling and comments	2017-11-17 13:40:22 -07:00
pal.js	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
progress.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js