Commit graph

5955 commits

Author SHA1 Message Date
Stephen Birarda
04a40be97a remove an extra g 2013-09-11 12:29:07 -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
Philip Rosedale
972dd795dd Merge pull request #918 from ey6es/master
Restore head rotation/lean to neutral when not tracking, have eyelids follow top of iris.
2013-09-10 14:39:05 -07:00
Andrzej Kapolka
cea645dfc7 Tweak to blink angles. 2013-09-10 12:34:41 -07:00
Andrzej Kapolka
6614a13c64 Align the eyelids to the top of the iris. 2013-09-10 11:58:45 -07:00
Andrzej Kapolka
7e98e3f4e3 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-10 11:26:07 -07:00
Andrzej Kapolka
db8575b59a Reduced the restore rate. 2013-09-10 11:25:30 -07:00
ZappoMan
befbc1b93a Merge pull request #916 from LionTurtle/master
Nudge
2013-09-10 11:16:12 -07:00
Andrzej Kapolka
c56778c3bf When devices become inactive (including when Faceshift reports loss of
tracking), smoothly restore neutral head rotation/lean.
2013-09-10 11:14:36 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
Andrzej Kapolka
13a19e2986 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-10 10:32:56 -07:00
ZappoMan
679224691f Merge pull request #917 from birarda/assignment
handle AC and DS on same network using global AS
2013-09-10 10:11:17 -07:00
Stephen Birarda
fb8c9dbfea fix spacing in Assignment 2013-09-10 09:58:42 -07:00
Stephen Birarda
a8f85f5b82 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-10 09:48:47 -07:00
Philip Rosedale
4245f33c3c Merge pull request #915 from ey6es/master
Subtract the long term average from the eye gaze directions.  Best solution I've found so far for aligning the gaze.
2013-09-10 09:36:04 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
Stephen Birarda
fa521a5dc9 handle case where AC is on same network as DS but not AS 2013-09-09 18:15:33 -07:00
Stephen Birarda
e53807ca82 store an attached local and public socket with assignment 2013-09-09 17:29:33 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Stephen Birarda
93ca5278da cleanup is assignment-client destination socket handling 2013-09-09 16:47:48 -07:00
Stephen Birarda
97803b827e pack destination socket for assignment as tightly as possible 2013-09-09 16:45:44 -07:00
Andrzej Kapolka
6e447415df Merge branch 'master' of https://github.com/worklist/hifi 2013-09-09 15:49:55 -07:00
ZappoMan
e31ba3b75b Merge pull request #914 from birarda/assignment
add a verbose logger to Logging class and leverage in assignment-client
2013-09-09 15:40:15 -07:00
Stephen Birarda
1c792cf46a some newline additions for logging in NodeList 2013-09-09 15:35:28 -07:00
Stephen Birarda
bbc051a764 add doxygen comments to refactored Logging class 2013-09-09 15:27:27 -07:00
Stephen Birarda
613334074f leverage qDebug and custom message handler for verbose logging 2013-09-09 15:11:11 -07:00
Leonardo Murillo
f63149e563 Merge pull request #913 from murillodigital/jenkins
Adding assignment-client to DSL
2013-09-09 14:54:15 -07:00
Leonardo Murillo
9a259ea618 Adding assignment-client to DSL 2013-09-09 15:51:52 -06:00
Stephen Birarda
b0c9dfeddc more leveraging of standardized logging 2013-09-09 14:47:15 -07:00
Stephen Birarda
fe8fabee38 add a static method to the Logging class to change target name 2013-09-09 14:31:27 -07:00
Andrzej Kapolka
f8aee88a5b Let's try subtracting the long-term average from the eye directions. 2013-09-09 14:30:26 -07:00
Stephen Birarda
8077963bb1 add standardized logging and leverage forked assignment clients 2013-09-09 14:21:33 -07:00
Andrzej Kapolka
8fec78d82a Disable random saccades for own eyes. 2013-09-09 13:48:46 -07:00
Leonardo Murillo
14b0bc02c3 Merge pull request #912 from murillodigital/jenkins
Removing audio-mixer and avatar-mixer jobs
2013-09-09 13:39:56 -07:00
Leonardo Murillo
001ecec729 Removing audio-mixer and avatar-mixer jobs 2013-09-09 14:38:57 -06:00
Andrzej Kapolka
2bcb4098a8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-09 13:00:33 -07:00
ZappoMan
361c8b8cd0 Merge pull request #911 from birarda/assignment
change assignment-client forks to have a parent monitor
2013-09-09 12:55:34 -07:00
Stephen Birarda
3f941a3371 add a missing include for waitpid 2013-09-09 12:42:18 -07:00
Stephen Birarda
f770dd623b have parent assignment-client make sure there are always n 2013-09-09 12:31:53 -07:00
Andrzej Kapolka
597c57a117 Revert "Try using the eye coefficients rather than the eye directions reported by"
This reverts commit 37aa909322.
2013-09-09 12:17:12 -07:00
Stephen Birarda
bb073bdff3 fork off n children and keep the parent process as a monitor 2013-09-09 11:59:58 -07:00
Andrzej Kapolka
37aa909322 Try using the eye coefficients rather than the eye directions reported by
Faceshift.
2013-09-09 11:22:46 -07:00
ZappoMan
218ac4641b Merge pull request #910 from birarda/assignment
more feature additions to assignment
2013-09-09 10:15:45 -07:00
Stephen Birarda
d1c602df07 remove an extra g 2013-09-09 10:10:16 -07:00
Stephen Birarda
64e3c19a8c fix an incorrectly typed const 2013-09-09 10:07:31 -07:00
Stephen Birarda
2fd043b55c code review comments 2013-09-09 10:02:30 -07:00