Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 16:42:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5978 commits 67 branches 56 tags 1.2 GiB
Commit graph

5978 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Andrzej Kapolka
4b19e3d0fe Incorporate the "eye open" coefficients for eye widening. 2013-09-10 17:43:06 -07:00
Andrzej Kapolka
b9878bbbd6 Adjustment to UDP code. 2013-09-10 16:55:59 -07:00
Andrzej Kapolka
5c7913068e Support for UDP input from Faceshift. 2013-09-10 16:21:08 -07:00
Stephen Birarda
c71ef85538 remove web directory before copying, clean more of ace 2013-09-10 14:55:30 -07:00
Stephen Birarda
6256388171 remove unused parts of ace editor 2013-09-10 14:52:02 -07:00
Stephen Birarda
53e0afa63b open up a JS editor at /assignment on DS webserver 2013-09-10 14:42:30 -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
Stephen Birarda
1781f1607e add mongoose webserver to domain-server 2013-09-10 14:31:20 -07:00
Stephen Birarda
bfcea9d41a Merge branch 'master' of github.com:worklist/hifi 2013-09-10 13:19:11 -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
Stephen Birarda
2d101fcddb Merge branch 'master' of github.com:worklist/hifi 2013-09-10 10:11:52 -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
Stephen Birarda
0f988b1a61 Merge branch 'master' of github.com:worklist/hifi 2013-09-09 16:19:47 -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