54103 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	2731c13a5c	Merge remote-tracking branch 'upstream/master' into 21249	2017-04-15 09:51:16 +12: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
Seth Alves	708008d8a5	cleanups	2017-04-14 13:43:48 -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
Seth Alves	07b23b8235	expose other hinge-constraint parameters to javascript	2017-04-14 13:28:25 -07:00
Zach Fox	a4587e33f3	Tiny forward/backward icon updates	2017-04-14 13:19:33 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Seth Alves	d0144f4110	avatar-action-far-grab works now	2017-04-14 12:44:54 -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
Seth Alves	1009182c06	grab and handControllerGrab use new far-grab action	2017-04-14 11:52:07 -07:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Sam Cake	f991475004	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-14 11:33:21 -07:00
Seth Alves	2dab3069da	fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.	2017-04-14 11:06:40 -07:00
Dante Ruiz	863d64b2fd	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
samcake	17de3d1e28	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-14 10:03:03 -07: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
Seth Alves	f5a5369055	attempt to remove dynamics associated with a rigid-body before removing the rigid-body	2017-04-14 07:06:53 -07:00
Seth Alves	52aee63e05	keep track of objectDynamics per rigidBody	2017-04-14 06:08:58 -07:00
Sam Cake	bb15b8c701	ANd fixing the gl41 rendering	2017-04-14 00:46:41 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
David Rowe	f715850766	Display animated GIF while recording	2017-04-14 16:13:45 +12:00
David Rowe	08f4fc2cf9	Remove hover highlight from "x"s	2017-04-14 15:51:59 +12:00
David Rowe	c2d8755b15	Merge branch 'master' into 21249	2017-04-14 15:32:45 +12:00
David Rowe	11a2559df9	Use HiFi glyph for delete "x"s	2017-04-14 15:30:28 +12:00
David Rowe	5f333ee02c	Style "i" button and info text	2017-04-14 15:14:39 +12:00
David Rowe	1d43e5a992	Style overall dialog layout	2017-04-14 15:12:36 +12: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
Seth Alves	afa8fc161b	allow hinge constraint between two entities	2017-04-13 15:37:28 -07:00
David Rowe	fd919f0db7	Play sounds during countdown and beep when recording starts and finishes	2017-04-14 10:34:15 +12:00
David Rowe	072e06123f	Fix recording just made not being played	2017-04-14 10:02:15 +12: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
Seth Alves	7695d2ac05	put the protocol version back to what's in master, for now	2017-04-13 11:29:40 -07:00
Sam Cake	3b385772c3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-13 09:51:27 -07:00
volansystech	70855b1c53	Improve the accuracy of Far to near Equip State.	2017-04-13 19:24:47 +05:30
Sam Cake	78bfc006f1	Prototyping the ResourceBuffer with the DrawBounds Job, yeah	2017-04-13 00:51:02 -07:00
David Rowe	75e4fb3820	On tablet with option enabled recording ends when open tablet or dialog	2017-04-13 19:28:40 +12:00
David Rowe	8f3789421f	Show "busy" spinner when counting down or recording	2017-04-13 19:23:22 +12:00