34742 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	9a651c6194	Merge pull request #6400 from jherico/rec3 ... Fixing recording interface times	2015-11-16 21:54:14 -08:00
Brad Hefta-Gaub	eb4bb1cc03	more work	2015-11-16 19:34:53 -08:00
Brad Hefta-Gaub	5f04e4a167	more work	2015-11-16 19:29:54 -08:00
samcake	8553033d59	Refactoring the mess for the Agent	2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub	1e0b66a68f	more work	2015-11-16 19:23:39 -08:00
samcake	065c148e0f	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-16 18:31:48 -08:00
samcake	71cc36fdd8	removing ms to seconds conversion in MyAvatar	2015-11-16 18:31:24 -08:00
samcake	ba952581d0	Merge pull request #6389 from AlessandroSigna/groupRecording ... added group recording feature	2015-11-16 17:57:11 -08:00
samcake	d66049f323	Merge pull request #6386 from AlessandroSigna/recorder ... added examples for messages synchronization	2015-11-16 17:55:32 -08:00
samcake	e6d0b93703	Merge pull request #6394 from EdgarPironti/record_branch ... ControlledAC.js refactoring	2015-11-16 17:53:38 -08:00
ericrius1	d4a8537e8b	changed title of npm module	2015-11-16 17:31:27 -08:00
AlessandroSigna	f40ff69c75	added scripts for group recording	2015-11-16 17:27:00 -08:00
ericrius1	baf1a4dc4b	removed unwanted npm-debug.log file	2015-11-16 17:26:35 -08:00
ericrius1	845a32b51d	removed rogue comment from eraseBoardEntityScript	2015-11-16 17:25:36 -08:00
ericrius1	b79d8824e6	removed another unused npm module from package.json file	2015-11-16 17:23:32 -08:00
ericrius1	f1f601decb	removed unused npm module from package.json file	2015-11-16 17:23:01 -08:00
ericrius1	bbfb282e37	reverted accidental change in AvatarData.h	2015-11-16 17:21:29 -08:00
ericrius1	1c8b3e394c	fixed spacing of app.js	2015-11-16 17:19:31 -08:00
ericrius1	7ea0a626d9	added to readme	2015-11-16 17:17:37 -08:00
ericrius1	6eebb57fab	ws to wss to avoid mixed content server error	2015-11-16 17:14:53 -08:00
ericrius1	0e423d4ccf	load data from server and display on load	2015-11-16 17:06:38 -08:00
ericrius1	cbdf0bbf1f	Added readme	2015-11-16 17:03:04 -08:00
Brad Hefta-Gaub	12f206e2f0	more work on messages	2015-11-16 17:00:03 -08:00
EdgarPironti	b6c27588b6	ControlledAC.js refactoring	2015-11-16 16:50:47 -08:00
ericrius1	c33a539221	got sockets working	2015-11-16 16:38:47 -08:00
ericrius1	09819b4298	sending message to all connections	2015-11-16 16:33:52 -08:00
Brad Davis	8a27a2fba5	Fixing recording interface times	2015-11-16 16:29:10 -08:00
ericrius1	3e7934767a	username is now correct	2015-11-16 16:13:13 -08:00
Stephen Birarda	d2b8ba740a	change BUILD guides for 5.5.1 and homebrew recs	2015-11-16 15:59:52 -08:00
ericrius1	0ef37e4996	board header	2015-11-16 15:58:50 -08:00
Stephen Birarda	f17af601ab	update BUILD for cmake version change	2015-11-16 15:52:48 -08:00
ericrius1	b8cdff7a7a	style tweaking	2015-11-16 15:46:22 -08:00
Brad Hefta-Gaub	40e69f6946	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-16 15:31:06 -08:00
ericrius1	3c363f2664	removed extraneous socketTest.js file	2015-11-16 15:31:05 -08:00
ericrius1	0a9a903f79	made jquery node module	2015-11-16 15:29:06 -08:00
Brad Hefta-Gaub	d42a1a721f	first cut at messages-mixer	2015-11-16 15:26:17 -08:00
ericrius1	6ac53c7276	added game server code	2015-11-16 15:26:17 -08:00
samcake	f036a28602	Merge pull request #6392 from jherico/rec3 ... Recording refactoring	2015-11-16 15:08:41 -08:00
David Rowe	b3b73e8cd1	Fix particle aging	2015-11-17 12:02:35 +13:00
Brad Davis	d099f61170	Updating audio record/playback mechanism to more closely match actual audio input	2015-11-16 14:57:24 -08:00
ericrius1	763c6383f5	added blood splattering effect, and sending score to server	2015-11-16 14:44:42 -08:00
Brad Davis	cb26fc67fc	Move recording interface back to float/seconds	2015-11-16 14:44:22 -08:00
ericrius1	f77b7b9105	renamed weapons folder to exterminatorGame	2015-11-16 14:09:47 -08:00
Howard Stearns	35f7a1cf10	Merge pull request #6391 from AndrewMeadows/sisyphus7 ... simplify MyAvatar::deriveBodyFromHMDSensor() take 2	2015-11-16 13:55:22 -08:00
Eric Levin	ed1ee50865	rand names for testing	2015-11-16 13:54:24 -08:00
Eric Levin	eca11d3a99	sending message in correct format	2015-11-16 12:47:16 -08:00
U-GAPOS\andrew	df05a9c8aa	fix bug: bodySensorMatrix constantly reset when walking	2015-11-16 12:02:16 -08:00
Seth Alves	36af315e5d	Merge pull request #6383 from birarda/goodbye-packet ... send a hopeful disconnect packet from ACs and Interface	2015-11-16 11:28:48 -08:00
Stephen Birarda	584e35e4ab	have killNodeWithUUID return success to avoid double lookup	2015-11-16 10:58:11 -08:00
Stephen Birarda	8dcf245b74	Merge pull request #6395 from hyperlogic/tony/avatar-mixer-identity-fixes ... AvatarMixer: remove redundant identity packet send	2015-11-16 10:35:42 -08:00