Brad Hefta-Gaub b8b39b962d Merge pull request #7868 from jherico/entity_shape ... Add a generic shape primitive		2016-05-24 08:40:58 -07:00
..
assets	make lock/unlock button easier to see	2016-05-13 10:57:41 -07:00
controllers	Merge pull request #7952 from sethalves/fix-walking-far-grab	2016-05-20 16:54:52 -07:00
html	Merge pull request #7868 from jherico/entity_shape	2016-05-24 08:40:58 -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	fix 588, 558	2016-05-20 12:15:30 -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	Fix not being able to teleport to user when users window moved right	2016-05-21 15:50:06 +12:00
voxels.js	users and voxel fixes	2016-04-26 15:34:24 -07:00