Seth Alves 419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3		2016-05-19 09:49:18 -07:00
..
assets	make lock/unlock button easier to see	2016-05-13 10:57:41 -07:00
controllers	Turn off hand-controller pointer when Interface doesn't have focus.	2016-05-18 11:49:12 -07:00
html	re add locking/visibility tools to edit.js	2016-04-28 13:29:54 -07:00
libraries	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
particle_explorer	move default to system	2016-04-26 14:47:02 -07:00
attachedEntitiesManager.js	update attachedEntitiesManager to work better with avatarEntities	2016-05-16 09:52:48 -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 #7906 from howard-stearns/improve-hand-controller-edit	2016-05-18 11:35:00 -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	Change default position to be bottom left of HMD recommended rectangle	2016-05-14 12:08:19 +12:00
voxels.js	users and voxel fixes	2016-04-26 15:34:24 -07:00