2635 commits

Author	SHA1	Message	Date
howard-stearns	3113dced7b	Be sure to callback even on profile failure.	2017-04-18 12:06:44 -07:00
Zach Fox	b410399a16	Resolve your paths, silly!	2017-04-14 16:26:29 -07:00
Zach Fox	85e5173abe	Fix embedded location	2017-04-14 16:11:37 -07:00
Zach Fox	f81dce5e70	Fix the bug	2017-04-14 15:42:19 -07:00
Chris Collins	6a6800b8c3	Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet ... fix can't grab tablet	2017-04-14 14:57:06 -07:00
Andrew Meadows	45bb639ef5	Merge pull request #10128 from kunalgosar/fingerpainting ... Make it easier to exit FingerPaint	2017-04-14 14:34:57 -07:00
Seth Alves	110cfb47d1	turn off handControllerGrab debug prints	2017-04-14 14:23:27 -07:00
Seth Alves	6420ddd038	grab script checks for touch devices continually, rather than just when the script starts	2017-04-14 14:20:04 -07:00
kunalgosar	891d52909e	fixed typo in comments	2017-04-14 14:10:19 -07:00
Sam Gateau	3519a72f8a	Merge pull request #10190 from samcake/ambient-bis ... Introducing a tool to debug the current Zone Stack	2017-04-14 13:28:59 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
Seth Alves	af5a352f02	turn on handControllerGrab debug prints	2017-04-14 08:10:31 -07:00
Zach Fox	3f91fb8e55	Remove unnecessary comment	2017-04-12 14:45:57 -07:00
Zach Fox	c724c2e50b	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	87b2d5bf8a	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	7b92989b1d	Fix it	2017-04-12 14:45:57 -07:00
Zach Fox	2579ac1baa	It's working!	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
Thijs Wenker	695c55bc3d	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 03:44:24 +02:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
samcake	79bcf95792	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
samcake	4a47737d0b	REfining the Config behavior, trying to pr next	2017-04-10 19:01:49 -07:00
Dante Ruiz	daf25c1fe8	fix crashes when clicking in the homebutton	2017-04-11 00:25:08 +01:00
Dante Ruiz	382204a9a9	open feed after logging in	2017-04-10 22:33:07 +01:00
Dante Ruiz	df6498c67c	fix snapshot login for toolbar-mode	2017-04-10 21:59:37 +01:00
Dante Ruiz	6922ba5c77	removed unnessary prints	2017-04-10 21:08:40 +01:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Anthony Thibault	746b7aadbd	Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped ... Fix teleport when something equipped	2017-04-09 19:00:21 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Brad Davis	91f8bf45b8	Merge pull request #10159 from highfidelity/revert-10158-revert-10157-brown ... Fixing the rendering bug triggered with Nvidia driver 381.65	2017-04-07 09:53:41 -07:00
Howard Stearns	5d341778c5	fix notification word wrapping	2017-04-07 07:08:19 -07:00
samcake	f82310545c	Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65""	2017-04-07 02:03:58 -07:00
samcake	ab3d39951e	Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"	2017-04-07 02:03:31 -07:00
Sam Cake	b1a4bc329b	Introducing a fix to the graphics bug	2017-04-07 01:10:18 -07:00
Sam Cake	da1355dc32	Introducing a fix to the graphics bug	2017-04-07 01:03:07 -07:00
howard-stearns	b089fd03b8	make connection messaging when not logged in	2017-04-06 16:48:11 -07:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	34a2cefb98	Merge pull request #10132 from davidkelly/dk/analyticsForConnections ... initial analytics for connections	2017-04-06 10:45:39 -07:00
David Kelly	a92162dea9	no mo useless debug statements	2017-04-06 08:50:22 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
Anthony Thibault	be2fdd9388	Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects ... Vive: Expose all 16 tracked poses to the controller system	2017-04-05 16:53:47 -07:00