51233 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	d7bb6f105b	make tablet part IDs available through qApp	2017-02-17 15:43:20 -08:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
Seth Alves	2b02998fae	hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection	2017-02-17 09:47:40 -08:00
Seth Alves	81f6344023	allow overlays to be parents	2017-02-17 09:36:00 -08:00
Seth Alves	9db817b415	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 07:04:45 -08:00
Seth Alves	05c135b9d8	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
Howard Stearns	5bef6ea029	Merge pull request #9687 from davidkelly/dk/3177 ... Ban only by machine fingerprint, when possible	2017-02-16 18:50:38 -08:00
Seth Alves	c1e41311fc	working toward using uuids for overlay IDs	2017-02-16 17:18:09 -08:00
Howard Stearns	7afd13d2cb	Merge pull request #9693 from howard-stearns/fix-requestsDomainListData ... fix rquestsDomainListData	2017-02-16 17:06:29 -08:00
Stephen Birarda	24591ee82b	Merge pull request #9691 from zzmp/fix/audio-packet-queue ... Fix audio packet queue behavior	2017-02-16 16:45:51 -08:00
howard-stearns	04712e3744	fix rquestsDomainListData	2017-02-16 16:43:16 -08:00
Zach Pomerantz	07e97a0cab	unqueue from front for audio packets	2017-02-16 21:40:53 +00:00
David Kelly	821c01eeca	Merge pull request #9689 from howard-stearns/pal-mini-code-cleanup ... cleaner living for pal	2017-02-16 13:51:26 -07:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00
David Kelly	a8831e89ff	Ban only by machine fingerprint, when possible	2017-02-16 09:50:56 -07:00
Stephen Birarda	a3c123818d	Merge pull request #9661 from Atlante45/fix/possible-race ... Fix possible race condition	2017-02-15 18:38:01 -08:00
Howard Stearns	34a4770ffa	Merge pull request #9669 from davidkelly/dk/2656 ... inform gatekeeper immediately when kicking someone	2017-02-15 15:13:10 -08:00
Zach Pomerantz	a976d191ad	Merge pull request #9679 from zzmp/fix/audio-assert-ignore-memoization ... Loosen audio memoization precondition	2017-02-15 17:50:33 -05:00
David Kelly	5ec3bbde52	Merge pull request #9648 from davidkelly/dk/zoneFilters2 ... Zone Filters	2017-02-15 13:36:11 -07:00
David Kelly	f0e87360c1	don't capture a temporary by reference. Ugh	2017-02-15 12:37:00 -07:00
Clément Brisset	eba6a8f028	Merge pull request #9674 from Atlante45/fix/mac-macro ... Fix SSE2 macros for Macs	2017-02-15 11:29:55 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Zach Pomerantz	2e9217fb47	loosen audio memoization precondition	2017-02-15 13:36:03 -05:00
Zach Pomerantz	ed4f96eadd	Merge pull request #9646 from zzmp/load/audio/packets-in ... log full i/o stats	2017-02-15 13:32:48 -05:00
Faye Li	2388ec65fe	Merge pull request #9659 from fayeli/users-fix ... Tablet Users Fixes	2017-02-15 10:25:06 -08:00
Faye Li	8aae2aa5f0	simpler filter code	2017-02-15 10:23:36 -08:00
Faye Li	5ece3f1e1a	use new users icon	2017-02-15 10:16:20 -08:00
Chris Collins	d1a236954b	Merge pull request #9673 from zzmp/audio/threaded-decode ... Parallelize audio packet decoding in mixer	2017-02-15 09:44:42 -08:00
Brad Hefta-Gaub	0cdcee33d8	Merge pull request #9677 from kunalgosar/logFilter ... Revamped Search Feature on Log Window	2017-02-15 08:56:16 -08:00
David Kelly	e6969321ca	fix for not properly filtering entity adds	2017-02-15 09:15:35 -07:00
Philip Rosedale	01bdac49d0	Merge pull request #9672 from ctrlaltdavid/21121 ... Fix far grabbing making entity jump upon grab	2017-02-14 17:02:42 -08:00
kunalgosar	4579ac4998	Changed button margin	2017-02-14 16:43:55 -08:00
kunalgosar	91a73b2689	Button styling	2017-02-14 16:13:40 -08:00
kunalgosar	5e5d76ead7	Implemented toggle prev search button	2017-02-14 16:13:40 -08:00
kunalgosar	2dd2018d7d	change next button style properties	2017-02-14 16:13:40 -08:00
kunalgosar	c01d0b309e	Toggle next for search on Log	2017-02-14 16:13:40 -08:00
Howard Stearns	3e52091dee	Merge pull request #9676 from birarda/bug/remove-domain-open-hours ... fix empty descriptors map bug in DS	2017-02-14 16:02:54 -08:00
Stephen Birarda	27412080dd	return an empty descriptors map when empty	2017-02-14 15:39:59 -08:00
Zach Pomerantz	2f52c09320	alphabetize io_stats	2017-02-14 23:17:11 +00:00
Zach Pomerantz	276c1abd0a	Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in	2017-02-14 23:06:36 +00:00
Atlante45	1201932ee9	Fix SSE2 macros for Macos	2017-02-14 14:10:53 -08:00
Zach Pomerantz	09cc4bf48d	time events with packets	2017-02-14 21:48:36 +00:00
Seth Alves	d0dc642cd8	Merge pull request #9651 from ctrlaltdavid/21164 ... Make it Easier to Change Audio Settings in the Tablet UI	2017-02-14 13:45:59 -08:00
David Kelly	08d30608c7	remove debug logging	2017-02-14 14:28:20 -07:00
Zach Pomerantz	41a4ec4200	mv codec init to ctor from negotiateCodecs	2017-02-14 21:26:35 +00:00
Zach Pomerantz	06c8fba35d	mv Node out of packet queue	2017-02-14 21:10:30 +00:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Zach Pomerantz	a7386392a1	fix codec parsing	2017-02-14 20:46:27 +00:00
Zach Pomerantz	6f2eb27572	rm debug in Deck.cpp	2017-02-14 20:46:27 +00:00
Zach Pomerantz	b102c2d1d0	generalize audio thread pool to processPackets	2017-02-14 20:46:27 +00:00