1441 commits

Author	SHA1	Message	Date
humbletim	7cab0363a9	standalone 21180 branch with just the C++ changes	2017-06-05 15:57:54 -04:00
samcake	257813ec38	comment the code	2017-06-01 09:19:02 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
David Rowe	3aebe96afe	Merge branch 'master' into 21359	2017-05-19 09:03:11 +12:00
David Rowe	f6c1fa4213	Merge branch 'master' into 21359	2017-05-18 16:40:20 +12:00
David Rowe	26e390fa89	Tidy code setting head orientation	2017-05-18 13:55:06 +12:00
David Rowe	223b1a858b	Fix avatar eye look-at in recording playback	2017-05-18 12:27:31 +12:00
Howard Stearns	95111d24b2	Merge branch 'master' into dk/sequenceNumberForAvatarIdentity	2017-05-17 17:09:47 -07:00
Andrew Meadows	09433a93ba	Merge pull request #10477 from AndrewMeadows/correct-avatar-mass ... More correct avatar mass	2017-05-17 16:22:06 -07:00
David Kelly	057718bde3	remove clockSkew, reference new version for Avatar packets	2017-05-17 15:14:56 -07:00
David Kelly	689a0b5bad	Switch from timestamp to sequence id for avatar identity	2017-05-17 14:22:36 -07:00
Zach Fox	d4752926b8	First pass - checking performance	2017-05-17 13:51:27 -07:00
Brad Hefta-Gaub	764bfe94f5	Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 ... Feature/snap turn smoothing 21270	2017-05-16 21:05:38 -07:00
Andrew Meadows	d065b569d3	support for variable avatar mass by size	2017-05-16 16:03:51 -07:00
David Rowe	7897bf8aa8	Fix display name not getting cleared	2017-05-17 08:17:55 +12:00
David Rowe	733b0feabd	Fix attachment data not getting cleared	2017-05-17 08:17:33 +12:00
Zach Fox	bc1e97032a	Thanks to Andrew!	2017-05-15 17:39:19 -07:00
Zach Fox	64ae5119ae	Merge pull request #10462 from zfox23/fixIdentityUpdatedAt ... Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs	2017-05-15 15:44:26 -07:00
Zach Fox	e492ca9364	Improve the test - thanks Dave!	2017-05-15 14:55:05 -07:00
Zach Fox	a2a24b22a8	Force _identityUpdatedAt to stay above 0	2017-05-15 14:25:47 -07:00
Seth Alves	66a1dbfcfe	Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation ... cleanup Head::simulate() code	2017-05-15 11:21:43 -07:00
Zach Fox	9289cd2022	Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder ... Fix the PAL not showing user info for user who opened PAL	2017-05-11 15:16:05 -07:00
Andrew Meadows	04827c3a2a	use const auto& where appropritate	2017-05-11 14:51:52 -07:00
Andrew Meadows	f4df223d23	cleanup Head::simulation() code	2017-05-11 14:46:00 -07:00
Zach Fox	15574f509e	Clarifying comments	2017-05-11 11:45:07 -07:00
David Rowe	e426d70437	Improve variable name	2017-05-11 18:37:23 +12:00
David Rowe	98b943269b	Sum of blendshapes is used sent through avatar mixer	2017-05-11 18:17:35 +12:00
David Rowe	21f9594f81	Sum of blendshapes is used for recording	2017-05-11 18:17:12 +12:00
David Rowe	3b06b03e01	Rename blendshapes variables in preparation for repurposing	2017-05-11 16:46:36 +12:00
Zach Fox	ae983658be	Finally, the actual fix?	2017-05-10 15:59:19 -07:00
Zach Fox	d7e4f02291	This is a better method.	2017-05-09 15:33:33 -07:00
Zach Fox	9ab643c416	I think this is all that must be done.	2017-05-09 15:33:33 -07:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
Andrew Meadows	13186dcb78	replace tab characer r with spaces	2017-05-08 14:28:08 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
trent	6d1fb8a6f8	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-02 13:55:39 -04:00
trent	49881b5ea2	Actually the full set of changes. Kids: don't forget to pop your stash.	2017-05-02 13:55:32 -04:00
Trent Polack	8f93a9a074	Merge branch 'master' into feature/snap-turn-smoothing-21270	2017-05-02 13:43:32 -04:00
trent	8f34ec4c7f	Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.	2017-05-02 13:41:34 -04:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
trent	6317857e3d	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 12:11:39 -04:00
trent	d446640bc8	Fixed tab issues.	2017-05-01 13:28:26 -04:00
trent	773563850c	Merge hifi/master with my branch, fixed merge issue.	2017-05-01 13:23:02 -04:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
trent	53f47c132f	Avatar snap-turn rotation smoothing (sent out from the local client outward).	2017-04-27 16:12:25 -04:00
ZappoMan	bc2f893294	format and spelling changes	2017-04-26 21:47:54 -07:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
ZappoMan	1f9e07b828	more logging	2017-04-26 16:40:13 -07:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
ZappoMan	7154a11192	add some more logging	2017-04-26 14:03:36 -07:00
Andrew Meadows	4511156d7b	cache avatar identity info forever	2017-04-26 12:50:48 -07:00
ZappoMan	517bbc795f	interface/	2017-04-26 11:29:42 -07:00
ZappoMan	5164aa4056	hacking	2017-04-25 18:21:09 -07:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
ZappoMan	fbc699d6b2	handle overflow case	2017-04-21 09:30:00 -07:00
ZappoMan	c03182546b	some cleanup	2017-04-21 09:11:51 -07:00
ZappoMan	125b3d5f4e	ignore old identity packets	2017-04-21 07:51:17 -07:00
ZappoMan	c197979354	add more logging	2017-04-20 18:36:00 -07:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
kunalgosar	ffdbc12968	copy into new vector	2017-04-18 12:20:03 -07:00
kunalgosar	06c5fa0585	correctly resizing blendshapes vector	2017-04-18 11:44:59 -07:00
kunalgosar	d215856b23	cleanup to blendshapes	2017-04-18 11:44:59 -07:00
kunalgosar	0a295fc258	setBlendshapes will presist	2017-04-18 11:44:59 -07:00
Zach Fox	e13000410e	Whoops	2017-04-17 11:02:27 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -07:00
Zach Fox	6569de697d	Merge pull request #10187 from zfox23/fix/getAvatar_Fix ... Fix FB3999; Fix crashes caused by getAvatar() design bug	2017-04-11 11:17:48 -07:00
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	2017-04-10 22:15:45 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Zach Fox	16be0ca70c	Birarda's CR changes	2017-04-10 22:15:44 -07:00
Zach Fox	5edd5d2b30	It's working...it's workinggit add -A!	2017-04-10 22:15:44 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	2017-04-10 22:15:44 -07:00
Zach Fox	297da90118	Semicolons lol	2017-04-10 22:15:44 -07:00
Zach Fox	bc75ff4462	Checkpoint	2017-04-10 22:15:44 -07:00
Zach Fox	177445c371	Does this work?	2017-04-10 22:15:44 -07:00
Stephen Birarda	4ed22ad7ac	move audio loudness to AvatarData, change AvatarData to ScriptOwnership	2017-04-10 22:15:44 -07:00
Zach Fox	1ed53113a9	Commit for birarda - testing QSharedPointer instead; doesn't work right now	2017-04-10 22:15:44 -07:00
Zach Fox	6ddd7a612c	Initial pass at fix looks promising	2017-04-10 22:15:44 -07:00
Andrew Meadows	662c34c266	fix avatar scale animation and avatar render debug	2017-04-07 11:06:16 -07:00
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
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
ZappoMan	8b662647bd	CR feedback	2017-01-24 12:01:57 -08:00
ZappoMan	0655b47dd7	fix warnings	2017-01-23 16:44:55 -08:00
ZappoMan	6801099cd9	more cleanup	2017-01-23 16:03:07 -08:00
ZappoMan	81b5a3c585	more cleanup	2017-01-23 15:12:54 -08:00
ZappoMan	5f9f051c3c	more tweaks	2017-01-23 15:01:50 -08:00
ZappoMan	e0bad95257	some cleanup	2017-01-23 13:18:55 -08:00
ZappoMan	29fff2e556	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-23 13:09:59 -08:00
ZappoMan	292d472a59	checkpoint - got first cut at distance based rotation tolerance working	2017-01-23 13:06:29 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
ZappoMan	6e5e9d3492	more work	2017-01-16 18:28:01 -08:00
Zach Fox	e98a40c30e	Does this work?	2017-01-16 14:43:30 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Zach Fox	2f176f50fa	Another checkpoint	2017-01-16 10:44:54 -08:00
ZappoMan	c9c311e275	checkpoint for distance joints	2017-01-15 11:47:48 -08:00
ZappoMan	3a9a6e8283	local position tweaks	2017-01-13 09:09:29 -08:00
ZappoMan	ee4df20df3	duh	2017-01-12 19:27:28 -08:00
ZappoMan	2e48444422	hack	2017-01-12 19:03:58 -08:00
ZappoMan	aed1b69ee0	make the avatar bounding box be avatar local and only change when it actually changes	2017-01-12 17:19:06 -08:00
ZappoMan	dd85cd9558	one more shot at kens way	2017-01-12 08:48:33 -08:00
ZappoMan	0e600fc8fd	more audio loudness tweaks	2017-01-12 07:56:09 -08:00
ZappoMan	fe06dfdca7	tweak audioLoudness packing	2017-01-11 18:58:43 -08:00
ZappoMan	0661531e3a	try another version of an 8bit audio loudness	2017-01-11 17:51:12 -08:00
ZappoMan	407ad633e0	more cleanup use kens 1 byte audio gain	2017-01-11 11:01:49 -08:00
Anthony J. Thibault	9db6806026	In desktop mode, tablet is in front of camera. ... * added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7 this can be used to attach objects to the camera. * WebTablet.js has been changed to detect when entering and exiting HMD mode to move the tablet appropriately. There's a known bug with the tablet entity position lagging the camera by one frame.	2017-01-10 11:31:45 -08:00
ZappoMan	182edf0e9a	change avatarOrientation to use SixByteQuat packing	2017-01-10 09:41:11 -08:00
ZappoMan	8bbfb51419	some cleanup	2017-01-10 08:37:01 -08:00
ZappoMan	eadb1758f9	adding some rate debugging	2017-01-09 17:07:47 -08:00
ZappoMan	13198fd949	add datarate	2017-01-09 13:57:59 -08:00
Brad Hefta-Gaub	ef7b9bfde0	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub	785582057e	more comments	2017-01-08 20:35:52 -08:00
Brad Hefta-Gaub	251495978c	more work on delta sending	2017-01-05 19:46:19 -08:00
Zach Fox	495925a017	This behavior was harder to change than expected...	2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub	5acae04420	fix some warnings	2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub	acca9dbe87	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo ... Conflicts: libraries/networking/src/udt/PacketHeaders.cpp libraries/networking/src/udt/PacketHeaders.h	2017-01-04 18:07:22 -08:00
Brad Hefta-Gaub	99f180f945	more hacking	2016-12-29 08:16:19 -08:00
Zach Fox	800389cf20	Remove HRS logging	2016-12-28 14:37:19 -08:00
Brad Hefta-Gaub	c7a5e873df	debug by sending all	2016-12-27 18:34:47 -08:00
Brad Hefta-Gaub	73bfc069da	more work on only sending changes	2016-12-27 17:19:55 -08:00
howard-stearns	0ad9786f6b	requestsDomainsListData	2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub	be61052368	check point	2016-12-26 12:12:23 -08:00
Brad Hefta-Gaub	474cb604f1	fix unix error, don't send all all the time	2016-12-23 10:43:34 -08:00
Brad Hefta-Gaub	01d48a5e27	grrr	2016-12-23 10:18:48 -08:00
Brad Hefta-Gaub	62b4a132a0	more hacking	2016-12-23 09:02:13 -08:00
Brad Hefta-Gaub	02a6060b5e	hacking on new format	2016-12-22 16:16:44 -08:00