1204 commits

Author	SHA1	Message	Date
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Andrew Meadows	7100f44927	refresh AvatarData when receiving identity data	2017-03-28 21:03:01 -07:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Seth Alves	66f8e4063d	Merge pull request #9984 from Atlante45/fix/warnings ... Fix warnings	2017-03-26 07:03:33 -08:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Atlante45	d4353e1d19	Fix warnings	2017-03-23 11:39:42 -07:00
Triplelexx	31ec9b832f	rename fronts to forwards	2017-03-22 18:43:30 +00:00
Triplelexx	b7980569cc	change all references of IDENTITY_FRONT to IDENTITY_FORWARD	2017-03-21 22:13:33 +00:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
kunalgosar	d2a2ba1846	Fixed recording bug	2017-03-07 17:19:21 -08:00
Zach Fox	718ecea404	Potential non-spammy solution using pseudo-state	2017-03-06 10:03:41 -08:00
Zach Fox	cfb8534d71	Comment	2017-03-06 10:03:41 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
Andrew Meadows	c6730f7c58	Merge pull request #9745 from AndrewMeadows/faster-avatar-updates ... Faster avatar updates	2017-02-28 10:55:21 -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
Andrew Meadows	0657ca1e5e	remove unnecessary context brackets	2017-02-23 17:36:45 -08:00
Andrew Meadows	e54812430e	avoid unnecessary copy of priority_queue	2017-02-23 17:36:45 -08:00
Andrew Meadows	ee5971c39e	no need to calc length of normalized vector	2017-02-23 17:36:45 -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