Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 08:59:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 73 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
Andrzej Kapolka
cea645dfc7 Tweak to blink angles. 2013-09-10 12:34:41 -07:00
stojce
934e2e3cc5 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-10 21:07:38 +02:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02: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
30c8af222d Merge remote-tracking branch 'upstream/master' 2013-09-10 11:10:50 -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
stojce
54e7de8e96 remove empty line 2013-09-10 00:44:16 +02: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
stojce
19c8084b64 dynamic height 2013-09-10 00:38:43 +02: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
stojce
7bd565f1f2 removed unused variable 2013-09-10 00:01:09 +02:00
stojce
1a32bf7428 centering fix 2013-09-09 23:59:44 +02:00
stojce
6b81620098 removed redundant this keyword 2013-09-09 23:54:25 +02: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
stojce
7c7cf667ae WindowModal 2013-09-09 23:38:51 +02: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
stojce
a081f081f8 popup layot 
- center position
- resizable
 2013-09-09 23:27:03 +02: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
stojce
29c62d366f QtWebKitWidgets fix #2 2013-09-09 22:41:03 +02:00