51421 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	92ca7de0bf	some tweaks to support too large avatar data	2017-02-17 10:12:35 -08:00
Seth Alves	2b02998fae	hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection	2017-02-17 09:47:40 -08:00
Anthony J. Thibault	e4076e6244	warning fixes	2017-02-17 09:45:13 -08:00
Seth Alves	81f6344023	allow overlays to be parents	2017-02-17 09:36:00 -08:00
Brad Hefta-Gaub	78147c27ad	log too large byteArray instead of crashing	2017-02-17 08:33:27 -08:00
Seth Alves	9db817b415	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 07:04:45 -08:00
David Rowe	3712aea861	Handle trigger values of 1.0 not repeating	2017-02-17 19:31:53 +13:00
David Rowe	bdfc9fd418	Tidying	2017-02-17 19:31:40 +13:00
David Rowe	25761adf6c	Erase closest line	2017-02-17 19:31:25 +13:00
David Rowe	9c1bb37a34	Paint lines	2017-02-17 19:31:11 +13:00
David Rowe	5236f123c1	Interpret trigger and grip values	2017-02-17 19:30:57 +13:00
David Rowe	7b36669d80	Point index finger while painting if tablet not displayed	2017-02-17 19:30:40 +13:00
David Rowe	867e24762b	Disable lasers and grabbing while painting if tablet not displayed	2017-02-17 19:30:23 +13:00
David Rowe	bad57fa03f	Controller and painting code framework	2017-02-17 19:30:04 +13:00
David Rowe	585691f71c	Add finger painting button to tablet	2017-02-17 19:29:11 +13: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
Brad Hefta-Gaub	3a0c63cbc7	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements ... Conflicts: assignment-client/src/avatars/AvatarMixer.cpp	2017-02-16 18:14:52 -08:00
Anthony J. Thibault	47e87e1ad4	Bug fix for clara.io marketplace	2017-02-16 17:41:36 -08:00
Anthony J. Thibault	2ea88012f9	Remove toolbar from tablet-goto.js	2017-02-16 17:36:16 -08:00
Anthony J. Thibault	345f0519ef	Removed use of Toolbar API for most default scripts.	2017-02-16 17:29:35 -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
Brad Hefta-Gaub	be12a8ffa4	stats cleanup	2017-02-16 16:58:06 -08:00
Anthony J. Thibault	0b9f4d4f11	updated eslint to include Tablet global	2017-02-16 16:53:51 -08:00
Stephen Birarda	78301fd947	call getParentPointer when parent ID changes to update children	2017-02-16 16:46:09 -08:00
Stephen Birarda	9f9fc03751	call EntityTree update when ScriptEngine update occurs	2017-02-16 16:46:09 -08:00
Stephen Birarda	d4119d5676	fix for non-void set of should force scene	2017-02-16 16:46:09 -08:00
Stephen Birarda	4ece56b673	spacing cleanup in EntityTreeSendThread	2017-02-16 16:46:09 -08:00
Stephen Birarda	fe11a945ef	remove debug from EntityTreeSendThread	2017-02-16 16:46:09 -08:00
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
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