Brad Davis 472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui ... Conflicts: scripts/system/controllers/handControllerGrab.js		2016-06-10 10:43:09 -07:00
..
assets	New button content and initial positions.	2016-06-08 11:11:18 -07:00
controllers	Merge remote-tracking branch 'upstream/master' into vive-ui	2016-06-10 10:43:09 -07:00
html	fix shapes to property polymorph and persist	2016-05-27 16:59:42 -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	New button content and initial positions.	2016-06-08 11:11:18 -07:00
examples.js	New button content and initial positions.	2016-06-08 11:11:18 -07:00
goto.js	New button content and initial positions.	2016-06-08 11:11:18 -07:00
hmd.js	New button content and initial positions.	2016-06-08 11:11:18 -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