1229 commits

Author	SHA1	Message	Date
Dante Ruiz	6a8465a6ca	removed more whitespace	2016-12-12 23:26:06 +00:00
Dante Ruiz	92993202a4	removed double variable definition	2016-12-12 23:24:56 +00:00
Dante Ruiz	ccecce77de	removed unneeded whitespace	2016-12-12 23:21:14 +00:00
Dante Ruiz	737f11fb7a	merge fix	2016-12-12 23:03:38 +00:00
Dante Ruiz	1b7c89c41d	home button working	2016-12-12 14:34:42 -08:00
Seth Alves	37b179b00b	remove commented-out code	2016-12-09 09:55:02 -08:00
Seth Alves	6c99b5e9ca	code review	2016-12-09 06:50:10 -08:00
Seth Alves	e06a445959	remove some cruft	2016-12-08 17:00:50 -08:00
Seth Alves	369f61e172	bring over some previous tablet-ui work	2016-12-08 16:54:39 -08:00
howard-stearns	3ba5e1ed4a	new mic toolbar button art	2016-12-06 10:52:40 -08:00
Andrew Meadows	7db8e8f31b	Merge pull request #9156 from hyperlogic/out-of-body-revert ... Revert Out of Body experience	2016-12-06 08:37:20 -08:00
Ryan Downe Karpf	fa50e8eddd	Merge pull request #9157 from howard-stearns/mic-icon-swap ... new mic unumute art	2016-12-05 17:01:59 -08:00
Ryan Huffman	a81e7c2d2c	Merge pull request #9148 from Polyrhythm/ryan/client-side-tests ... Client script test runner	2016-12-05 16:23:17 -08:00
howard-stearns	7621672964	new mic unumute art	2016-12-05 16:00:03 -08:00
Anthony J. Thibault	89ae3b3d6e	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" ... This reverts commit efe9571ab8, reversing changes made to 333e9ec7f4.	2016-12-05 15:18:03 -08:00
Ryan Jones	094857949d	tabs -> spaces, remove raw ptr, remove unnecessary spec diff	2016-12-05 12:57:21 -08:00
Ryan Huffman	996d3f5875	Merge pull request #9135 from druiz17/nearGrab ... Fixed pressing the grip button causes a near grabbed object to drop	2016-12-05 11:07:15 -08:00
Dante Ruiz	08301d488d	clean up	2016-12-05 18:10:54 +00:00
Dante Ruiz	09d5dc382f	better solution	2016-12-05 18:08:36 +00:00
Ryan Jones	39e1a3fb44	add client-side test runner	2016-12-04 20:53:06 -08:00
Seth Alves	d2b32c3084	Merge pull request #9057 from druiz17/childParent ... fixed children of parent object not being added back when performing an undo	2016-12-01 16:59:06 -08:00
Zach Fox	30dade242c	GIFs: Quality improvements; duration tweaks; processing notif (#9139)	2016-12-01 14:53:18 -08:00
Dante Ruiz	348c0c95e5	conforming to coding standard and better variable naming	2016-12-01 22:22:17 +00:00
Seth Alves	24e54f25bf	Merge pull request #9108 from PhilipRosedale/drifting ... Grab.js weaker at a distance	2016-12-01 12:59:28 -08:00
Philip Rosedale	c60b0c7ef5	Fix indents	2016-12-01 12:54:38 -08:00
Seth Alves	efe9571ab8	Merge pull request #8691 from highfidelity/out-of-body-experience ... Room Scale HMD comfort features.	2016-12-01 11:09:39 -08:00
Dante Ruiz	a35f28725b	fixed child not commit back when performing undo	2016-12-01 10:54:26 -08:00
Dante Ruiz	3c1d434449	fixed typo	2016-12-01 10:54:26 -08:00
Dante Ruiz	0c9cd5803a	added descendant checking	2016-12-01 10:54:26 -08:00
Dante Ruiz	cb0e01bfa4	fixed child of parent not being added when performing an undo	2016-12-01 10:54:26 -08:00
Dante Ruiz	1b24d373d2	fixed near grab issue	2016-12-01 10:18:34 -08:00
Dante Ruiz	dc7bb5b083	grip button fix	2016-12-01 10:17:54 -08:00
Chris Collins	19b5e7cd86	Merge pull request #9054 from howard-stearns/third-person-lasers ... make hand-controller ui work in third person	2016-12-01 10:11:12 -08:00
Chris Collins	c0a0a16ff8	Merge pull request #9127 from huffman/fix/hand-controller-grab-release ... Fix 'releaseGrab' not being called when using grip buttons	2016-12-01 09:58:36 -08:00
Anthony J. Thibault	7f840d3a08	Can use 'xboxLaser' in third person camera	2016-11-30 10:01:11 -08:00
Anthony J. Thibault	78559934a1	Merge branch 'master' into third-person-lasers	2016-11-29 16:38:34 -08:00
Ryan Huffman	aa1e813d72	Fix 'releaseGrab' not being called when using grip buttons	2016-11-29 15:04:14 -08:00
Ryan Jones	01ae2b9452	add errant semicolon	2016-11-29 11:56:11 -08:00
Ryan Jones	251b070db3	add unit test	2016-11-29 11:50:11 -08:00
Ryan Jones	a59df5b04d	one last indentation fix	2016-11-28 17:19:43 -08:00
Ryan Jones	3961dbcf55	revert changes to dev utils, apply changes to system utils	2016-11-28 17:18:31 -08:00
Ryan Jones	68e86da023	adjust indentation and implement editorconfig at root of repo	2016-11-28 17:10:59 -08:00
Ryan Jones	4be1922df5	add bind polyfill	2016-11-28 14:47:15 -08:00
Howard Stearns	030f0d7103	Merge pull request #9114 from howard-stearns/bubble-state ... bubble state	2016-11-28 12:16:39 -08:00
David Kelly	1b26d51292	Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots ... Capture original location in snapshots	2016-11-28 08:55:47 -08:00
howard-stearns	8b9efb461e	bubble state	2016-11-23 10:22:24 -08:00
howard-stearns	414371d1fc	record starting href/domainId, not ending	2016-11-22 16:13:08 -08:00
howard-stearns	2c9046742e	allow movement during .gif recording	2016-11-22 16:02:01 -08:00
howard-stearns	5188de924f	allow for SnapshotReview dialog to be up during a change of href for all ... media capture	2016-11-22 11:09:43 -08:00
Philip Rosedale	664b54c004	remove whitespace	2016-11-22 10:27:27 -08:00