51528 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	9d336a84ab	force a full scene send for new ancestors/descendants	2017-02-16 16:46:09 -08:00
Stephen Birarda	a3883a746c	add the basic structure for inclusion of ancestors/descendants in ESS queries	2017-02-16 16:46:09 -08:00
Ryan Huffman	0da81efd93	Add includeDescendants and includeParents to ESS entity query	2017-02-16 16:46:09 -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
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Brad Hefta-Gaub	ece32a3c68	cleanup	2017-02-16 16:19:40 -08:00
Anthony J. Thibault	7f95753a1e	Prevent tablet from being open while in toolbarMode	2017-02-16 16:18:51 -08:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Brad Hefta-Gaub	df54762da9	add some more stats	2017-02-16 15:56:02 -08:00
Brad Hefta-Gaub	d49c83cac3	fix build buster, some tweaks	2017-02-16 14:19:14 -08:00
Zach Pomerantz	07e97a0cab	unqueue from front for audio packets	2017-02-16 21:40:53 +00:00
Brad Hefta-Gaub	d532b3a4b8	more work on multi-core	2017-02-16 13:25:51 -08:00
Anthony J. Thibault	5b1f150171	Fix for race condition when switching between Main Menu and Audio Menu	2017-02-16 12:52:46 -08: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
Brad Hefta-Gaub	0a48ea75a7	fix unix build error	2017-02-16 10:45:58 -08:00
Brad Hefta-Gaub	755c690030	some cleanup, better sleep management	2017-02-16 10:07:49 -08:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
Seth Alves	1412fd6dab	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-16 09:24:37 -08:00
David Kelly	a8831e89ff	Ban only by machine fingerprint, when possible	2017-02-16 09:50:56 -07:00
Brad Hefta-Gaub	23790b93e3	first cut at slaves doing broadcast	2017-02-16 01:07:21 -08:00
Brad Hefta-Gaub	2d300a6643	checkpoint with eachNode() changed to nestedEach()	2017-02-15 22:14:26 -08:00
Brad Hefta-Gaub	d22f4c1dd7	partial const migration work so mixer will not side-effect AvatarData	2017-02-15 21:29:03 -08:00
Brad Hefta-Gaub	bd72216574	add support for multiple jobs types on the slave pool	2017-02-15 20:49:45 -08:00
Brad Hefta-Gaub	65dbc6365d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-15 20:28:49 -08:00
Brad Hefta-Gaub	faa8e629a0	checkpoint	2017-02-15 20:28:32 -08: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
Anthony J. Thibault	03b6280ed0	Fix for empty toolbar issue	2017-02-15 16:50:08 -08:00
Seth Alves	12b8a77488	in edit.js, convert entity property ID to be a text-field so the data can be copied	2017-02-15 16:29:50 -08:00
Brad Hefta-Gaub	5d90b7b1b7	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-15 16:15:57 -08:00
Seth Alves	3d7733219c	edit's open-asset-browser button works, again	2017-02-15 16:15:18 -08:00
Anthony J. Thibault	67302cbd2b	toolbar work to better support tablet buttons	2017-02-15 15:53:08 -08:00
Seth Alves	e030a4a518	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 15:20:14 -08:00
Seth Alves	33c1c3ac11	when a new particle-entity is created, hook the particle explorer to it	2017-02-15 15:19:49 -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
Seth Alves	bfa5f6a425	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-15 15:00:36 -08:00
Seth Alves	076b0ed3ab	get particle explorer working, again	2017-02-15 15:00:25 -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
Anthony J. Thibault	ed11edad56	EventBridge support	2017-02-15 13:59:04 -08:00
Brad Hefta-Gaub	babeabede5	more cleanup and stats rework	2017-02-15 13:49:16 -08:00
Brad Hefta-Gaub	00086fcc06	wire up thread count to settings, tweak stats	2017-02-15 13:00:30 -08:00
David Kelly	5ec3bbde52	Merge pull request #9648 from davidkelly/dk/zoneFilters2 ... Zone Filters	2017-02-15 13:36:11 -07:00
Brad Hefta-Gaub	cddb72bbd7	clean up stats, add slave stats	2017-02-15 12:11:17 -08:00
David Kelly	f0e87360c1	don't capture a temporary by reference. Ugh	2017-02-15 12:37:00 -07:00
Seth Alves	c0b5f7b005	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 11:36:50 -08:00
Seth Alves	3ea0f6d2d2	allow lasers to scroll tablet while in edit-mode	2017-02-15 11:34:48 -08: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
Seth Alves	1038e97c7f	fix windows build	2017-02-15 11:14:23 -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