53604 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	e13000410e	Whoops	2017-04-17 11:02:27 -07:00
David Kelly	af08df85c8	Merge pull request #10229 from davidkelly/dk/shareableURLForUserStories ... put shareable_url in UserStory details when creating	2017-04-17 10:55:47 -07:00
Zach Fox	7a7cfb84e5	Remove HMD keyboard focus toggle on AddressBar input	2017-04-17 10:08:40 -07:00
Dante Ruiz	3eb9b37c29	Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign	2017-04-17 16:41:15 +01:00
David Kelly	3e268fbf68	put shareable_url in UserStory details when creating	2017-04-17 07:38:24 -07:00
Sam Cake	2d35f95930	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-16 23:31:06 -07:00
Zach Fox	e65079f826	Merge pull request #10224 from zfox23/fixGifSharing ... Fix GIFs not sharing	2017-04-14 18:44:41 -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
Seth Alves	66137e78a2	grab script checks for touch devices continually, rather than just when the script starts	2017-04-14 15:28:56 -07:00
Andrew Meadows	6a8ddee878	send keep-alive packets but don't resend identity	2017-04-14 15:16:14 -07:00
Andrew Meadows	06b9fd6a7e	don't keep stale avatars alive	2017-04-14 15:16:02 -07:00
Andrew Meadows	d72f6cf45e	avatar-mixer to send identity packets as 'reliable'	2017-04-14 15:15:54 -07:00
Andrew Meadows	eaefa3d3f2	avatar-mixer resends to avoid stale avatar	2017-04-14 15:15:45 -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
Zach Fox	a4587e33f3	Tiny forward/backward icon updates	2017-04-14 13:19:33 -07:00
Zach Fox	a623ced64e	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -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
Dante Ruiz	863d64b2fd	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
Chris Collins	e789492b34	Merge pull request #10212 from AndrewMeadows/avoid-invisible-avatars-003 ... avoid invisible avatars when source interface stops sending updates to avatar-mixer	2017-04-14 09:25:20 -07:00
Chris Collins	1eb3c5273f	Merge pull request #10217 from sethalves/enable-grab-debug-prints ... turn on handControllerGrab debug prints	2017-04-14 09:15:28 -07:00
Dante Ruiz	7189d4d7fa	daving web work	2017-04-14 17:01:23 +01:00
Seth Alves	af5a352f02	turn on handControllerGrab debug prints	2017-04-14 08:10:31 -07:00
Zach Fox	0543709081	Focus fix	2017-04-13 16:10:36 -07:00
Andrew Meadows	5bdecfbfa0	send keep-alive packets but don't resend identity	2017-04-13 16:00:11 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Andrew Meadows	14b60165ef	don't keep stale avatars alive	2017-04-13 14:55:08 -07:00
Andrew Meadows	63ea16f24b	avatar-mixer to send identity packets as 'reliable'	2017-04-13 13:37:18 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -07:00
Zach Fox	f23f9ec698	Merge pull request #10207 from zfox23/gifShareImprovements ... Snapshot sharing improvements	2017-04-12 16:33:44 -07:00
Zach Fox	631033dcb5	Merge pull request #10209 from zfox23/fixUserInfoViewerButton ... Make userInfoViewer button always clickable for myCard	2017-04-12 16:33:05 -07:00
Brad Davis	b2aa3271f7	Adding support for variable allocated textures to the GL 4.1 backend	2017-04-12 15:09:20 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -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
Andrew Meadows	e64e2614e3	Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter ... Kinect hand filter	2017-04-12 14:27:05 -07:00
volansystech	7bc3435cfa	Initial Commit.. ... If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x. This will help user to grab the entity in lesser time.	2017-04-13 02:51:30 +05:30