8887 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	81e0be7f85	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-09-12 16:19:02 -07:00
Stephen Birarda	25cd800ab4	create a UUID with assignments, store JS for script	2013-09-12 16:18:53 -07:00
Grayson Stebbins	db86e6c090	Merge pull request #927 from birarda/master ... README touchups for local stack	2013-09-12 16:07:47 -07:00
Stephen Birarda	97d00aab03	more touchup to readme for assigned local stack	2013-09-12 16:04:04 -07:00
Stephen Birarda	5e5e2b3bab	add some more clarity for unix makefiles	2013-09-12 12:16:02 -07:00
stojce	921e88ea5d	Merge branch 'master' of https://github.com/worklist/hifi into 19418 ... Merge branch 'master'	2013-09-12 21:11:30 +02:00
stojce	4840f85dde	merge	2013-09-12 20:40:22 +02:00
Stephen Birarda	f72742710f	touchup the README for new local stack	2013-09-12 11:09:36 -07:00
stojce	eefe08e733	non OS X menu ... added help + about menu for non OS X	2013-09-12 19:39:34 +02:00
ZappoMan	53e189e95b	Merge pull request #925 from LionTurtle/master ... Add limit to nudge precision. Fix bugs in certain nudge scenarios. Fix rendering of nudge guide.	2013-09-11 18:46:54 -07:00
LionTurtle	bb1feab661	Merge remote-tracking branch 'upstream/master'	2013-09-11 16:45:29 -07:00
LionTurtle	cef4837654	Fix voxel erase bug in nudge code. Fix rendering of nudge guide.	2013-09-11 16:43:50 -07:00
atlante45	64b462a4f0	Improved smile	2013-09-11 15:19:01 -07:00
ZappoMan	eaa1596a78	Merge pull request #923 from birarda/domain-web-server ... add a mongoose webserver to the domain-server	2013-09-11 15:07:39 -07:00
Stephen Birarda	d3c58b2fe1	Merge branch 'master' of github.com:worklist/hifi into domain-web-server	2013-09-11 14:58:24 -07:00
ZappoMan	33cfd3a961	Merge pull request #922 from birarda/assignment ... rename direction to command for assignment	2013-09-11 14:57:46 -07:00
Stephen Birarda	0fd2341c7e	Merge branch 'assignment' into domain-web-server	2013-09-11 14:52:40 -07:00
Stephen Birarda	7fb73fc040	remove one of birarda's infamous Gs	2013-09-11 14:52:18 -07:00
Stephen Birarda	3dd0b40776	Merge branch 'assignment' into domain-web-server	2013-09-11 14:49:28 -07:00
Stephen Birarda	129c120989	fix deque include for assignment-server	2013-09-11 14:49:16 -07:00
Stephen Birarda	4ebac574ac	fix deque include for domain-server	2013-09-11 14:48:51 -07:00
Stephen Birarda	36b2381d79	Merge branch 'assignment' into domain-web-server	2013-09-11 14:47:26 -07:00
Stephen Birarda	fb8d3e9cf6	add a more helpful message to the DS root index.html	2013-09-11 14:47:23 -07:00
Stephen Birarda	df4973db6b	Merge branch 'master' of github.com:worklist/hifi into domain-web-server	2013-09-11 14:44:35 -07:00
Stephen Birarda	dfede2b947	rename direction to command for assignment	2013-09-11 14:43:37 -07:00
stojce	330b1cdaf1	About menu ... added About menu - OS X version only	2013-09-11 22:08:07 +02:00
atlante45	88e8ef7c7c	eye opening and some better memory handling	2013-09-11 12:57:58 -07:00
ZappoMan	f1810b533d	Merge pull request #921 from birarda/assignment ... assignment JS editor mongoosed with DS, DS acts as AS	2013-09-11 12:54:56 -07:00
Stephen Birarda	803d2975dc	fix queue include	2013-09-11 12:43:57 -07:00
Stephen Birarda	e73ef6204d	add newlines to assignment-server logging so it doesn't clog up	2013-09-11 12:37:14 -07:00
Stephen Birarda	fe3b4a6654	use the verbose message handler in the assignment-server	2013-09-11 12:29:50 -07:00
Stephen Birarda	04a40be97a	remove an extra g	2013-09-11 12:29:07 -07:00
Philip Rosedale	a8a16f2836	Merge pull request #920 from ey6es/master ... Added UDP support to Faceshift interface, eye widening based on "eye open" coefficients.	2013-09-11 12:26:39 -07:00
Stephen Birarda	e1005288cb	prefer that audio-mixer assignment is fulfilled locally	2013-09-11 12:25:59 -07:00
Stephen Birarda	3149431e16	remove notion of pool from assignment-server	2013-09-11 12:23:15 -07:00
Stephen Birarda	ff6fd73187	have the domain-server use the new verbose logging message handler	2013-09-11 12:17:30 -07:00
Stephen Birarda	b7aa49cf97	have DS act as AS and hand assignments directly	2013-09-11 12:16:47 -07:00
atlante45	5618a784c7	Fixed perlin's face eyes	2013-09-11 10:51:31 -07:00
Andrzej Kapolka	80cc278bfa	Increase the eye open scale.	2013-09-11 10:49:12 -07:00
Andrzej Kapolka	feecb4fa25	Fix for eyelids, change Faceshift menu option to indicate that it applies ... specifically to TCP connection.	2013-09-11 10:44:38 -07:00
atlante45	ae5173a730	Added Jaw	2013-09-10 18:32:39 -07:00
atlante45	117565934c	added smooth normals for lighting	2013-09-10 17:54:59 -07:00
Andrzej Kapolka	4b19e3d0fe	Incorporate the "eye open" coefficients for eye widening.	2013-09-10 17:43:06 -07:00
RyanDowne	13c228e796	Added Smile	2013-09-10 17:33:22 -07:00
Andrzej Kapolka	b9878bbbd6	Adjustment to UDP code.	2013-09-10 16:55:59 -07:00
atlante45	61f9088d3e	eyelib handling for faceshift	2013-09-10 16:35:14 -07:00
Andrzej Kapolka	5c7913068e	Support for UDP input from Faceshift.	2013-09-10 16:21:08 -07:00
atlante45	85c3d54718	mouth handling on perlin faces	2013-09-10 15:33:09 -07:00
atlante45	4e3484021e	PerlinFace implementation	2013-09-10 15:31:58 -07:00
Stephen Birarda	c71ef85538	remove web directory before copying, clean more of ace	2013-09-10 14:55:30 -07:00