21167 commits

Author	SHA1	Message	Date
Seth Alves	422b0bb952	don't set _dirtyFlags if polyvox is collisionless	2017-02-25 21:14:13 -08:00
Seth Alves	7a31a99e3c	back out previous experiment	2017-02-25 21:13:20 -08:00
Seth Alves	1e81edbaea	make a copy of volData before computing the visual mesh	2017-02-25 15:32:08 -08:00
Seth Alves	0e4b0332dd	avoid a rare crash	2017-02-25 11:35:27 -08:00
Seth Alves	76c873ce81	don't compute polyvox shapes if they are collisionless	2017-02-25 11:34:48 -08:00
Seth Alves	0c84ddc503	fix indentation	2017-02-25 11:33:10 -08:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
Brad Hefta-Gaub	1b7ec7d61e	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: libraries/avatars/src/AvatarData.cpp	2017-02-23 13:50:16 -08:00
kunalgosar	3af05ece7d	Made QScript Object more JS friendly	2017-02-23 10:57:06 -08:00
kunalgosar	99e51e88ae	Add QMetaObject for AvatarEntityMap	2017-02-23 10:57:06 -08:00
Brad Hefta-Gaub	dde9640c66	remove old full rate distance code	2017-02-23 10:29:17 -08:00
Chris Collins	de84e07281	Merge pull request #9714 from thoys/fix-recorder-js-playback ... Fix recorder.js playback in interface	2017-02-23 09:59:37 -08:00
Thijs Wenker	5033e7be11	CR fixes	2017-02-23 18:22:36 +01:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Brad Hefta-Gaub	4f17498daf	fix warning	2017-02-23 00:19:06 -08:00
Brad Hefta-Gaub	06f0087459	wire up radius properly	2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub	edf7c016a1	more cleanup	2017-02-22 22:06:28 -08:00
Chris Collins	b295a146e0	Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight ... More consistent highlights/toggle for toolbar buttons	2017-02-22 18:07:38 -08:00
Chris Collins	c967f9383a	Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements ... Multi-core Avatar Mixer	2017-02-22 11:20:28 -08:00
Brad Hefta-Gaub	618f37eb06	fix crash in recording playback when clip loader fails	2017-02-22 11:14:22 -08:00
Anthony J. Thibault	71b569a697	Bug-fix for crash on tablet when going from web -> home.	2017-02-22 10:22:12 -08:00
Brad Hefta-Gaub	05995163cf	add support for tuning sorting	2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub	01fd0860bf	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: interface/src/avatar/AvatarManager.cpp	2017-02-22 08:47:03 -08:00
Brad Hefta-Gaub	4c42e95607	add some debugging	2017-02-22 08:13:37 -08:00
Chris Collins	04d8c78089	Merge pull request #9707 from hyperlogic/bug-fix/mac-os-deadlock ... MacOS: Fix for audio, toolbar and tablet.	2017-02-21 17:39:07 -08:00
Brad Hefta-Gaub	8cc0b383c4	wire up bandwidth buget to sorting	2017-02-21 16:22:22 -08:00
howard-stearns	2b9c69926b	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 15:42:00 -08:00
Brad Hefta-Gaub	a58ddad3aa	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub	a526db1779	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-21 14:18:36 -08:00
Brad Hefta-Gaub	2017ea4491	hacking on using sorted avatars for bandwidth budget	2017-02-21 14:18:00 -08:00
Seth Alves	8cf71ebc65	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-21 13:54:21 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
Stephen Birarda	10828d7534	Merge pull request #9692 from birarda/feat/es-get-children-parents ... Give implicit access to family tree of server scripted entities in ESS	2017-02-21 13:17:46 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Thijs Wenker	72eb797910	remove unused encoder (was for testing)	2017-02-21 20:22:29 +01:00
Thijs Wenker	13b2b6086f	Fix recorder.js playback in interface	2017-02-21 19:47:26 +01:00
Stephen Birarda	3b996f2b7f	bump packet version for new JSON query options	2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub	ec8a95037d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-20 17:01:29 -08:00
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub	598e79f697	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-19 13:29:37 -08:00
Brad Hefta-Gaub	66a6666b52	more cleanup, improved stats, port throttling	2017-02-18 12:29:01 -08:00
Brad Hefta-Gaub	42d916a719	fix warnings	2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub	291b823cfa	const cleanup and fix crash	2017-02-17 18:28:07 -08:00
Anthony J. Thibault	856a38af0c	Fix for audio, toolbar and tablet on macos.	2017-02-17 17:08:23 -08:00
Brad Hefta-Gaub	92ca7de0bf	some tweaks to support too large avatar data	2017-02-17 10:12:35 -08:00
Anthony J. Thibault	e4076e6244	warning fixes	2017-02-17 09:45:13 -08:00
Stephen Birarda	78301fd947	call getParentPointer when parent ID changes to update children	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	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