Brad Davis 3dba928b72 Merge remote-tracking branch 'upstream/android' into android_new		2018-01-19 10:36:46 -08:00
..
assets	add scripted/qml debug UI for render LOD	2018-01-18 08:53:45 -08:00
commerce	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
controllers	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -08:00
html	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 15:51:46 -08:00
libraries	add new tablet model and adjust screen offset	2018-01-09 14:31:57 -08:00
marketplaces	More progress	2018-01-10 12:21:12 -08:00
particle_explorer	Merge Case 10632 and 10633.	2017-12-18 21:12:18 +00: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	Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval	2018-01-09 13:44:13 -08:00
emote.js	fix CR comments	2018-01-09 13:42:51 -08:00
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
makeUserConnection.js
menu.js
mod.js
nameTag.js
notifications.js
pal.js	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
progress.js
run.js	fix icon. button lights up when run in enabled	2018-01-12 15:28:42 -08:00
snapshot.js	Fix for black screen when clicking Settings from Snap app	2018-01-10 16:31:51 -08:00
tablet-goto.js	Rename Window.protocolVersion() to Window.protocolSignature()	2018-01-19 09:06:16 +13:00
tablet-users.js
touchscreenvirtualpad.js	Add virtual pad for android	2018-01-17 15:00:43 -03:00
voxels.js