20558 commits

Author	SHA1	Message	Date
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline ... Spline IK target support	2017-06-08 18:09:55 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00
Anthony J. Thibault	8334dff610	compute rotation from derivative of spline ... This should fix bad rotation values for the spine during bowing/touching toes.	2017-06-08 15:00:12 -07:00
howard-stearns	9cf027a68c	pr feedback	2017-06-07 16:44:13 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
howard-stearns	9b5b352bc7	Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor	2017-06-07 16:21:08 -07:00
Seth Alves	69520ff3db	pull from upstream, code review	2017-06-07 10:28:02 -07:00
Seth Alves	b1c7c251ac	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-07 10:09:46 -07:00
Brad Hefta-Gaub	e5ac3eeea7	Merge pull request #10548 from NeetBhagat/21255 ... On Oculus Rift on/off, switch automatically to/from desktop mode	2017-06-06 18:05:56 -07:00
David Kelly	06527ac0a2	Merge pull request #10611 from davidkelly/dk/4873 ... protect _text member of Text3DOverlay with mutex	2017-06-06 16:50:57 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Stephen Birarda	0ccd0d3fd6	Merge pull request #10621 from highfidelity/stable ... Merge Stable back into Master	2017-06-06 10:39:03 -07:00
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
NeetBhagat	ae9a928740	Merge branch 'master' into 21255 ... # Conflicts: # interface/src/Application.cpp	2017-06-06 19:06:50 +05:30
Howard Stearns	3de243b093	Include the radius of the sphere at the avatar's feet.	2017-06-05 18:48:11 -07:00
Seth Alves	20c9228050	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-05 15:53:23 -07:00
Seth Alves	7a276f027f	fix orientation used for 3d audio	2017-06-05 15:53:01 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Brad Hefta-Gaub	51e00b9de9	Merge pull request #10614 from samcake/brown ... Introduce a stencil mask pass in the rendering to optimize HMD	2017-06-05 14:14:11 -07:00
howard-stearns	91fff7d54d	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-05 13:44:56 -07:00
Seth Alves	3ab67cf27e	fix forward gaze in HMD while not looking at anyone	2017-06-05 11:44:27 -07:00
Seth Alves	c83549a679	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-05 11:36:28 -07:00
Seth Alves	5eb902179f	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-05 11:36:16 -07:00
Andrew Meadows	85a1e1d691	Merge pull request #10608 from ctrlaltdavid/21379 ... Fix icon for polylines in entities editor properties page	2017-06-05 11:06:23 -07:00
Chris Collins	6cc6cd3bf6	Merge pull request #10604 from highfidelity/RC-42 ... Beta Release 42 - Includes up to Developer Release 6626	2017-06-05 09:13:19 -07:00
Seth Alves	27669d44a7	in deriveBodyFromHMDSensor, avoid using invalid head pose	2017-06-05 08:58:40 -07:00
Howard Stearns	ca526e0776	git rid of a lambda	2017-06-05 07:11:25 -07:00
Howard Stearns	05f41fb4f8	cleanup	2017-06-04 08:13:12 -07:00
Howard Stearns	a0ea306aed	cleanup, and include missing allowBackface parameter	2017-06-04 07:55:23 -07:00
Howard Stearns	fd01258c76	cleanup	2017-06-03 16:02:58 -07:00
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
Howard Stearns	02c46080f7	we don't need to force, but we do need some extra room for confined spaces	2017-06-03 15:43:14 -07:00
Howard Stearns	c48b729527	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-02 18:05:20 -07:00
Ryan Huffman	52c60b35df	Add startup_sent_to user activity event	2017-06-02 17:57:40 -07:00
Seth Alves	1b719ee654	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 16:31:23 -07:00
manapa01	8e1577d3d3	Merge pull request #10596 from manapa01/Snapshot-Sound ... Snapshot sound	2017-06-02 16:07:05 -07:00
David Kelly	12cbc206d2	cr feedback	2017-06-02 15:59:15 -07:00
Clément Brisset	c636922a5d	Merge pull request #10590 from huffman/fix/running-marker ... Update server-console to watch interface via pid rather than marker	2017-06-02 15:57:44 -07:00
David Kelly	9b34abeb40	oops initializer order...	2017-06-02 15:43:29 -07:00
Seth Alves	3359a0a794	work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation	2017-06-02 15:29:20 -07:00
David Kelly	f9e1f02888	protect _text member of Text3DOverlay with mutex	2017-06-02 14:59:27 -07:00
samcake	0a3c1712eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-02 14:35:05 -07:00
Patrick Manalich	76901f5bf9	Final Application.cpp change	2017-06-02 14:08:56 -07:00
Seth Alves	c40a76f320	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 13:58:00 -07:00
Seth Alves	9088e288e0	don't worry about head controller being enabled, just check to see if head pose is valid	2017-06-02 13:57:53 -07:00
Ryan Huffman	c0bca73ec7	Merge pull request #10606 from huffman/feat/startup-went-to-event ... Add startup_sent_to user activity event	2017-06-02 13:49:41 -07:00
Stephen Birarda	d89febac71	use a sleep instead of a yield waiting for close event	2017-06-02 13:22:02 -07:00
Stephen Birarda	e3d8229abe	rename ClosureEventSender to CloseEventSender	2017-06-02 13:21:55 -07:00
Stephen Birarda	ecc697dbe1	remove crash event definition for now	2017-06-02 13:21:45 -07:00