Thijs Wenker c1eeab6542 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate		2019-01-28 14:32:27 +01:00
..
+android
assets	Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate	2019-01-28 14:32:27 +01:00
commerce	fix	2018-12-19 12:46:41 -08:00
controllers	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats	2019-01-22 12:58:56 -08:00
html	Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch	2019-01-25 10:38:14 -08:00
libraries	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats	2019-01-22 12:58:56 -08:00
marketplaces	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
modules	grid pattern	2019-01-23 19:28:34 +01:00
tablet-ui	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
attachedEntitiesManager.js	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
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
bubble.js
chat.js
dialTone.js
directory.js
edit.js	zone visualizer prototype	2019-01-21 17:25:06 +01:00
emote.js
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
inspect.js
interstitialPage.js	adding sound to login screen	2018-11-21 13:36:36 -08:00
makeUserConnection.js	Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-10 14:08:38 -08:00
menu.js
miniTablet.js	Fix mini tablet visibility angle calculations	2018-12-06 15:24:03 +13:00
mod.js
nameTag.js	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
notifications.js	Merge pull request #14143 from ElderOrb/FB18673	2018-11-13 14:05:21 -08:00
pal.js
progress.js
redirectOverlays.js
request-service.js
run.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js