Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 19:10:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4128 commits 76 branches 59 tags 1.2 GiB
Commit graph

4128 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
928f8acdac Merge pull request #580 from birarda/jenkins 
use double quotes to fix env interpolation, fix role
 2013-06-26 12:42:25 -07:00
Stephen Birarda
815283d6d5 clean up double quote usage 2013-06-26 12:35:09 -07:00
Stephen Birarda
8e07815322 use double quotes for env interpolation, change role 2013-06-26 12:34:26 -07:00
Leonardo Murillo
5144c84cda Merge pull request #579 from birarda/jenkins 
fix for cURL parameters for branch deploy job
 2013-06-26 12:14:21 -07:00
Stephen Birarda
8a7897d326 use deploy-dev, add missing d options 2013-06-26 12:12:04 -07:00
Stephen Birarda
1f1e520ec8 fix cURL parameters for branch deploy job 2013-06-26 12:10:04 -07:00
Stephen Birarda
383b6ecec2 use correct future appcast URL 2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f switch to silent update checking 2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
Stephen Birarda
800bfd097b alphabetize some includes in Application header 2013-06-26 10:35:17 -07:00
Philip Rosedale
0b37ce5375 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-25 21:08:37 -07:00
Philip Rosedale
f8497b3ee7 Merge pull request #577 from ey6es/master 
Blink less when talking (not at all when brows are raised); force a blink (currently, 250ms) after talking stops.
 2013-06-25 20:57:18 -07:00
Andrzej Kapolka
f2f29d2e60 Well, I guess OS X doesn't like || and && without parentheses. 2013-06-25 16:58:31 -07:00
Andrzej Kapolka
6eb421d564 Blink less when talking (and never when brows are raised); force a blink after 
we stop talking.
 2013-06-25 16:51:22 -07:00
Stephen Birarda
5cf89e90d7 fix redundancy in reference to Rect for OpenCV 2013-06-25 16:45:14 -07:00
Stephen Birarda
8f0478551b add the quazip library and a find module 2013-06-25 16:44:11 -07:00
Andrzej Kapolka
9f681c0709 Merge pull request #576 from ey6es/master 
Fix for OS X.
 2013-06-24 17:27:22 -07:00
Andrzej Kapolka
7ab1055d47 Derp, need to bind the element array buffer. 2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d Turns out sincos is a GNU thing. 2013-06-24 17:16:06 -07:00
ZappoMan
b36404fb98 Merge pull request #574 from ey6es/master 
Very basic eyelids/blinking.
 2013-06-24 16:04:20 -07:00
Andrzej Kapolka
a0ecd167fc Replace 0/1 with FULLY_OPEN/CLOSED. 2013-06-24 10:31:11 -07:00
Andrzej Kapolka
1e258aae99 Define blink speed as a constant. 2013-06-24 10:20:01 -07:00
tosh
7690ace2c3 Merge branch 'master' of git://github.com/worklist/hifi into 19377 
Conflicts:
	interface/src/Audio.cpp
 2013-06-22 05:35:31 +02:00
tosh
09962737dd tightens bounding issues for bandwidth meter's scale indicators 2013-06-22 05:21:15 +02:00
tosh
4f692aeb56 improves bandwidth meter layout / simplifies & fixes rendering 2013-06-22 05:07:01 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02:00
Andrzej Kapolka
ef7c6ebdc6 Basic blinking. 2013-06-21 18:11:31 -07:00
Andrzej Kapolka
81d0373bdc Merge pull request #573 from ey6es/opencv 
Fixed pointer warning, reordered #includes.
 2013-06-21 14:41:23 -07:00
Andrzej Kapolka
5bbff6f63f Merge branch 'master' of https://github.com/worklist/hifi into opencv 
Conflicts:
	interface/src/Balls.cpp
 2013-06-21 14:40:47 -07:00
birarda
e50baad9c4 Merge pull request #572 from birarda/master 
fix shared util casing in balls
 2013-06-21 14:35:29 -07:00
Andrzej Kapolka
e18d9f7ea2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:34:00 -07:00
Philip Rosedale
7e12a0c1d7 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:33:52 -07:00
Philip Rosedale
74f6ee6fca Fixed spacing at parenthesis 2013-06-21 14:33:37 -07:00
Andrzej Kapolka
650e659ee8 Fixed includes, pointer warning. 2013-06-21 14:33:01 -07:00
Stephen Birarda
258eed5890 fix casing of SharedUtil include in balls 2013-06-21 14:32:55 -07:00
Andrzej Kapolka
0c184b9912 Merge pull request #571 from ey6es/opencv 
Quick fix for something I broke in mouse/touch took.
 2013-06-21 14:30:59 -07:00
Andrzej Kapolka
94cbb50dfa Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:30:03 -07:00
birarda
bd0d820fc7 Merge pull request #556 from PhilipRosedale/master 
Dynamic jitter buffer for less stuttering, fixes to stereo
 2013-06-21 14:29:45 -07:00
Andrzej Kapolka
686fc3607e Fix for mouse/touch look: don't apply rotations if the gyros/webcam aren't 
connected.
 2013-06-21 14:25:25 -07:00
Philip Rosedale
12ef87e073 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:23:49 -07:00
Philip Rosedale
accafd0418 Merge pull request #569 from ey6es/opencv 
Added explicit third person mode, option to cycle through different methods of voxeltar rendering.
 2013-06-21 14:23:36 -07:00
Andrzej Kapolka
483407a3f2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:09:38 -07:00
birarda
3644669fe3 Merge pull request #570 from machinelevel/master_central 
Re-issue of change which adds two-finger touch look to avatar.
 2013-06-21 14:07:31 -07:00
Andrzej Kapolka
0000eac95f Implementation parameter name should match interface parameter name. 2013-06-21 14:02:35 -07:00
Andrzej Kapolka
5194fb2ee6 Don't bother with testing the ignore orientations stuff. 2013-06-21 13:58:49 -07:00
Eric Johnston
6825274b65 Re-issue of change which adds two-finger touch look to avatar. 
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
 2013-06-21 13:43:23 -07:00
Andrzej Kapolka
04b72e3e66 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:52:22 -07:00
Philip Rosedale
6eafd6582e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 11:42:29 -07:00
Philip Rosedale
1f6fd31b52 Merge pull request #568 from ey6es/opencv 
Head roll, lean from webcam data.
 2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:35:23 -07:00