20483 commits

Author	SHA1	Message	Date
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
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
Seth Alves	27669d44a7	in deriveBodyFromHMDSensor, avoid using invalid head pose	2017-06-05 08:58: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
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
Seth Alves	3359a0a794	work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation	2017-06-02 15:29:20 -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
Chris Collins	34201ea1da	Merge pull request #10599 from jherico/ktx_cache_wipe ... Add versioning support to the KTX cache	2017-06-02 13:02:18 -07:00
David Rowe	58c4a2f12a	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12:00
Brad Davis	1f95daf5c1	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
Ryan Huffman	0d96f82888	Merge pull request #10592 from birarda/close-report ... Send a close event to API on shutdown	2017-06-02 10:57:41 -07:00
Patrick Manalich	1f478bdf13	Repair Application.cpp	2017-06-02 10:44:58 -07:00
Patrick Manalich	a705e722f1	Ctrl-S sound feature added	2017-06-02 10:35:57 -07:00
Patrick Manalich	0c71cf4bda	Edit: Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Patrick Manalich	4e61db8263	Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Seth Alves	d91b3700a7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 10:07:50 -07:00
Ryan Huffman	0fdbf4a342	Add startup_sent_to user activity event	2017-06-02 09:59:29 -07:00
Seth Alves	bc2311cb35	Merge pull request #10561 from AndrewMeadows/sanity-check-physics ... fix crash in EntityMotionState::handleDeactivation()	2017-06-02 09:55:20 -07:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
Ryan Huffman	86da91ac8d	Remove the runningMarker timer	2017-06-01 18:19:13 -07:00
Stephen Birarda	6a89726a6a	Merge pull request #10593 from birarda/log-api-session-id ... print the metaverse session ID to the debug log	2017-06-01 18:02:17 -07:00
Stephen Birarda	6d1bbc389d	use a sleep instead of a yield waiting for close event	2017-06-01 17:57:23 -07:00
Stephen Birarda	9fad8d1821	rename ClosureEventSender to CloseEventSender	2017-06-01 17:52:01 -07:00
Seth Alves	48ee546545	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 16:15:03 -07:00
Seth Alves	7d21ab88b0	add some saftey checks. cleanups	2017-06-01 16:14:59 -07:00
Stephen Birarda	0f22b07026	move session ID logging later in app startup	2017-06-01 16:07:36 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
Seth Alves	552b69bb1c	cleanups	2017-06-01 13:47:19 -07:00
Stephen Birarda	c513d04b52	remove crash event definition for now	2017-06-01 13:40:50 -07:00
Seth Alves	10ddbecdb9	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 13:37:22 -07:00
Seth Alves	ac6135387c	display plugins are never head controllers	2017-06-01 13:37:16 -07:00
Stephen Birarda	792d938262	send quit event during shutdown on thread, with timeout	2017-06-01 13:01:24 -07:00
Ryan Huffman	aaf9b9ac7f	Update server-console to watch interface via pid rather than marker	2017-06-01 11:20:36 -07:00
Seth Alves	b83620f7c5	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-01 10:58:33 -07:00
Seth Alves	eca05d9c42	more use of head input	2017-06-01 10:57:53 -07:00
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
David Kelly	b6b2f92af2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028	2017-06-01 09:58:07 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Seth Alves	0b2eb43ee2	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 07:02:31 -07:00
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00