Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 11:13:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5903 commits 71 branches 56 tags 1.2 GiB
Commit graph

5903 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
6b81620098 removed redundant this keyword 2013-09-09 23:54:25 +02:00
stojce
7c7cf667ae WindowModal 2013-09-09 23:38:51 +02:00
stojce
a081f081f8 popup layot 
- center position
- resizable
 2013-09-09 23:27:03 +02:00
stojce
29c62d366f QtWebKitWidgets fix #2 2013-09-09 22:41:03 +02:00
stojce
52f413b59c QtWebKitWidgets reference fix 2013-09-09 22:11:44 +02:00
stojce
3b2b09a67e removed QDebug 2013-09-08 21:31:14 +02:00
stojce
8779e000fe #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:29:35 +02:00
stojce
fef70098a3 #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:28:30 +02:00
stojce
8fb3068816 Merge branch 'master' of https://github.com/stojce/hifi 2013-09-08 21:09:20 +02:00
stojce
e889a9ccbc Merge branch 'master' of https://github.com/worklist/hifi 2013-09-08 21:08:49 +02:00
stojce
330bb29a42 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-08 21:03:11 +02:00
ZappoMan
c8210a3d4f Merge pull request #907 from birarda/assignment 
doxygen documenation for Assignment classes
 2013-09-06 14:44:23 -07:00
Stephen Birarda
9eef894e24 add doxygen documentation for Assignment classes 2013-09-06 14:35:59 -07:00
ZappoMan
1bf4a073d5 Merge pull request #906 from birarda/assignment 
replace audio-mixer and avatar-mixer with assignment-client
 2013-09-06 11:33:30 -07:00
Stephen Birarda
0262184c12 put back DS port numbers, remove magic IPv numbers 2013-09-06 11:29:04 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
eb84bdbeed switch back to the proper assignment server 2013-09-06 11:02:36 -07:00
Stephen Birarda
d8611e408e clear stale assignments from queue, fix CPU usage in client 2013-09-06 10:59:20 -07:00
Stephen Birarda
dbc6fff73b fix removal of assignment from queue to not remove all 2013-09-06 10:28:45 -07:00
Stephen Birarda
f7b0158cfe use deque of pointers, make sure DS silent count is refreshed 2013-09-06 10:26:29 -07:00
Stephen Birarda
9244ec1c25 have client keep track of number of silent DS checkins 2013-09-06 09:41:27 -07:00
Stephen Birarda
67299b0eea fix some memory management stupidity for Assignments 2013-09-05 17:54:37 -07:00
Stephen Birarda
54b50e0e76 add a destructor for Assignment 2013-09-05 17:42:57 -07:00
Stephen Birarda
bb6185ca36 add some queue size debugging to assignment-server 2013-09-05 17:35:55 -07:00
Stephen Birarda
21562abfb1 don't add a second instance of a solo node 2013-09-05 17:29:14 -07:00
Stephen Birarda
8c5937dc78 only ask for an audio/avatar mixer every 5 iterations 2013-09-05 16:58:46 -07:00
Stephen Birarda
d498d97da7 maintain a double ended queue of created assignments 2013-09-05 16:38:48 -07:00
Stephen Birarda
5e4d4b4651 remove static local domain IP address 2013-09-05 16:29:56 -07:00
Stephen Birarda
b88c74c1a1 remove the mongoose webserver 2013-09-05 16:25:42 -07:00
Philip Rosedale
ac6cd959f4 Merge pull request #905 from ey6es/off 
Add option for off-axis projection using Faceshift/LEDs.
 2013-09-05 16:25:23 -07:00
Stephen Birarda
8dad031c9a add mongoose for demo webserver for DS 2013-09-05 15:27:34 -07:00
Stephen Birarda
17727576d8 remove the avatar-mixer target from root CMakeLists 2013-09-05 14:03:34 -07:00
Stephen Birarda
8b601cac0a moved the AvatarMixer to a class the assignment-client can handle 2013-09-05 14:01:05 -07:00
Stephen Birarda
9dc3ddc84a a temporary hack to make sure the domain-server address is IPv4 2013-09-05 13:46:57 -07:00
Andrzej Kapolka
32af1de3ac For clarity, break the projection matrix update out of resizeGL. 2013-09-05 12:34:25 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum 
parameters.
 2013-09-05 12:20:15 -07:00
Stephen Birarda
d5e807ca8e change the default domain server port for ec2 assignment client 2013-09-05 12:13:15 -07:00
Andrzej Kapolka
dd8a40decd Need to call resizeGL in order to update the projection matrix. 2013-09-05 11:41:16 -07:00
Andrzej Kapolka
3a195951db Merge branch 'master' of https://github.com/worklist/hifi into off 2013-09-05 10:56:02 -07:00
Stephen Birarda
a36fb6a35b Merge pull request #901 from ey6es/shifty 
LED tracking and Faceshift support.  Also moved all device files to "devices" source folder.
 2013-09-05 10:48:45 -07:00
Stephen Birarda
bd409abd1f switch assignment server back to ec2 2013-09-05 10:46:20 -07:00
Andrzej Kapolka
03ead34642 Code review cleanup. 2013-09-05 10:34:43 -07:00
Andrzej Kapolka
70a21fc9ad Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-05 10:20:56 -07:00
Andrzej Kapolka
79408560d9 Tweaking the off-axis positions. 2013-09-04 17:48:54 -07:00
Andrzej Kapolka
1532b5d91a Apply eye offset position based on Faceshift/webcam. 2013-09-04 17:33:57 -07:00
ZappoMan
06f34b3163 Merge pull request #903 from birarda/bundle-name 
capitalize the bundle name for interface on OS X
 2013-09-04 17:15:00 -07:00
Stephen Birarda
9ede6b75c6 force the OS X bundle name to be capitalized 2013-09-04 17:09:43 -07:00
Stephen Birarda
609c48214f Revert "temporary removal of QtScript dependency for build on ec2 box" 
This reverts commit f29f8701a1.
 2013-09-04 16:22:51 -07:00
Stephen Birarda
f29f8701a1 temporary removal of QtScript dependency for build on ec2 box 2013-09-04 16:20:19 -07:00
Stephen Birarda
2846d170f7 change default NodeList port to 0 for ephemeral 2013-09-04 16:16:03 -07:00