r3tk0n d79681470e Saving changes before merging master...		2019-02-25 13:10:25 -08:00
..
+android_interface	update urls	2019-02-06 14:25:25 -08:00
assets	Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips	2019-01-28 14:18:46 -08:00
commerce	QmlMarketplace Bugfixes	2019-01-29 16:07:27 -08:00
controllers	Saving changes before merging master...	2019-02-25 13:10:25 -08:00
html	remove unneeded marketplaceInject.js	2019-02-15 12:36:35 -08:00
libraries	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
marketplaces	QmlMarketplace - fix issue with footer not appearing in marketplaces list	2019-02-04 15:04:18 -08:00
modules	also ignore picking on the material entity	2019-01-31 22:14:15 +01:00
tablet-ui	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarapp.js	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
avatarFinderBeacon.js
away.js	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00
bubble.js
chat.js
dialTone.js
directory.js
edit.js	skip child entities of mismatching entityHostType when copy/delete/duplication of entities	2019-01-30 03:15:32 +01:00
emote.js
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
inspect.js
interstitialPage.js
makeUserConnection.js
menu.js
miniTablet.js	ctrlaltdavid's minitablet fix	2019-02-12 13:15:58 -08:00
mod.js
nameTag.js
notifications.js
pal.js	working on overlay bugs	2019-02-16 20:08:36 -08:00
progress.js
quickGoto.js	+android -> +android_interface	2019-02-06 11:37:52 -08:00
redirectOverlays.js
request-service.js
run.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js