1186 commits

Author	SHA1	Message	Date
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
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
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
Brad Hefta-Gaub	8cc0b383c4	wire up bandwidth buget to sorting	2017-02-21 16:22:22 -08:00
Brad Hefta-Gaub	2017ea4491	hacking on using sorted avatars for bandwidth budget	2017-02-21 14:18:00 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -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
Brad Hefta-Gaub	92ca7de0bf	some tweaks to support too large avatar data	2017-02-17 10:12:35 -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	faa8e629a0	checkpoint	2017-02-15 20:28:32 -08:00
Brad Hefta-Gaub	f433347362	Merge pull request #9652 from sethalves/avatar-as-child-fixes ... some fixes for when an avatar is a child of something else	2017-02-14 09:07:47 -08:00
Seth Alves	5ee484a592	don't send avatar localPosition unless the avatar has a parent, even if sendAll is true	2017-02-13 13:36:07 -08:00
Seth Alves	b333126cbe	avoid sending localPosition for avatars with no parent	2017-02-13 12:20:07 -08:00
Seth Alves	107442eea0	avoid extra sends to localPosition	2017-02-12 11:56:38 -08:00
Seth Alves	bc5f563f57	make _parentID and _parentJointIndex private to avoid accidental direct access	2017-02-12 11:37:29 -08:00
Seth Alves	0c2abc9883	fix handling of an avatar's parent changing	2017-02-12 10:01:30 -08:00
Seth Alves	1164a1b3bf	some fixes for when an avatar is a child of something else	2017-02-12 08:27:39 -08:00
Andrew Meadows	66a315cb9c	cap number of avatar entities	2017-02-10 13:14:20 -08:00
Andrew Meadows	c551a41e0a	restore exposure of setAvatarEntityData() to JS	2017-02-10 13:14:20 -08:00
Andrew Meadows	0e504e9ec6	make methods private: avoid sanity check logic	2017-02-10 13:14:20 -08:00
Brad Hefta-Gaub	57e0dadd65	CR	2017-02-09 11:35:00 -08:00
Brad Hefta-Gaub	c2171ca08f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats ... Conflicts: libraries/avatars/src/AvatarData.h	2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub	6c41a25032	more stats	2017-02-08 16:51:00 -08:00
Brad Hefta-Gaub	b399420190	CR	2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub	eedfc4fd38	fix various bot related bugs	2017-02-08 12:35:00 -08:00
Zach Fox	5ea3c5dffd	Skipped this line	2017-02-01 18:13:24 -08:00
Zach Fox	4af5118654	First pass	2017-02-01 17:04:21 -08:00
Seth Alves	ac475300f6	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-30 08:15:29 -08:00
Thijs Wenker	a2da1e3dc1	Merge branch 'master' into fix-ac-playback-audio	2017-01-27 21:00:57 +01:00
Seth Alves	fa61bbe2a6	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 18:21:39 -08:00
Thijs Wenker	cdc0f3ddd2	- make AC recording audio play with right encoding ... - spelling fix	2017-01-27 01:19:11 +01:00
ZappoMan	af426063ac	fix bad merge	2017-01-26 15:19:25 -08:00
ZappoMan	4c80422a73	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-26 14:34:58 -08:00
Seth Alves	db38503d57	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
Andrew Meadows	b8afc87ad9	remove cruft	2017-01-26 08:35:26 -08:00
Andrew Meadows	e65d9309b3	remove cruft: Avatar::setShouldDie()	2017-01-26 08:35:26 -08:00
Andrew Meadows	88bf126168	remove old avatar culling and LOD logic	2017-01-26 08:35:25 -08:00
ZappoMan	1309af6d7a	CR feedback	2017-01-24 12:47:47 -08:00
ZappoMan	44b8a57ed3	more CR feedback	2017-01-24 12:18:33 -08:00