Seth Alves 3876a8037c Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3		2016-05-16 09:51:20 -07:00
..
assets	make lock/unlock button easier to see	2016-05-13 10:57:41 -07:00
controllers	revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out	2016-05-12 13:29:40 -07:00
html	re add locking/visibility tools to edit.js	2016-04-28 13:29:54 -07:00
libraries	updating attachedEntitiesManager to work with new system	2016-05-11 14:13:08 -07:00
particle_explorer	move default to system	2016-04-26 14:47:02 -07:00
attachedEntitiesManager.js	make lock/unlock button easier to see	2016-05-13 10:57:41 -07:00
away.js	More buttons to get out of away/pause.	2016-05-12 15:41:15 -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 pull request #7777 from ctrlaltdavid/20897	2016-04-28 17:00:49 -07:00
examples.js	fix horizontal typo in examples	2016-04-28 13:42:10 -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	move default to system	2016-04-26 14:47:02 -07:00
users.js	increase width	2016-05-05 15:02:16 -07:00
voxels.js	users and voxel fixes	2016-04-26 15:34:24 -07:00