Ryan Huffman 70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions		2016-06-21 16:39:25 -07:00
..
assets	make lock/unlock button easier to see	2016-05-13 10:57:41 -07:00
controllers	Merge pull request #7997 from SamGondelman/touchFixes	2016-06-08 15:39:17 -07:00
html	Merge pull request #8066 from imgntn/faceCameraText	2016-06-17 14:14:06 -07:00
libraries	Save toolbar position when moving it only when stopped moving it	2016-06-05 08:55:27 +12:00
particle_explorer	move default to system	2016-04-26 14:47:02 -07:00
attachedEntitiesManager.js	clear dead code	2016-06-08 13:44:53 -07:00
away.js	grip buttons on vive and touch will make you active in away.js	2016-06-06 16:22:02 -07:00
dialTone.js	move default to system	2016-04-26 14:47:02 -07:00
directory.js	Merge pull request #7775 from ctrlaltdavid/20896	2016-05-02 10:11:29 -07:00
edit.js	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
examples.js	Make activity logging from scripts only available for certain events	2016-06-16 13:49:25 -07:00
notifications.js	move default to system	2016-04-26 14:47:02 -07:00
progress.js	move default to system	2016-04-26 14:47:02 -07:00
selectAudioDevice.js	Make audio device selection available without advanced menus enabled	2016-06-17 09:58:44 +12:00
users.js	fix bug where buttons would show when minimized	2016-06-14 14:14:31 -07:00
voxels.js	users and voxel fixes	2016-04-26 15:34:24 -07:00