Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 06:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85736 commits 29 branches 28 tags 1.2 GiB
Commit graph

5527 commits

Author SHA1 Message Date
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
Andrzej Kapolka
12f42358d5 Allow cycling between video send modes. 2013-08-01 15:39:53 -07:00
Stephen Birarda
2b0cfe3c67 resolve conflicts on merge with upstream master 2013-08-01 14:33:23 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Philip Rosedale
bc1ac6b455 turn down collision sounds 2013-08-01 12:49:10 -07:00
Jeffrey Ventrella
0cd1018e76 some experimental work on hand rendering 2013-08-01 10:53:20 -07:00
Andrzej Kapolka
a86ceb2759 More work on full frame video. 2013-07-31 18:18:37 -07:00
Jeffrey Ventrella
5b2693f99c added emitter active bool for switching emitters on/off when Leap loses fingers 2013-07-31 17:59:15 -07:00
Jeffrey Ventrella
be8a587d49 named rave glove effects 2013-07-31 16:07:21 -07:00
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
5b1ba56d67 toggle debug print statements for Leap fingers 2013-07-31 15:12:29 -07:00
Jeffrey Ventrella
0aaeb4550a cleanup 2013-07-31 13:07:52 -07:00
Jeffrey Ventrella
2901b58059 changed variable name from t to effectsTimer 2013-07-31 12:34:43 -07:00
Jeffrey Ventrella
482c5f0f4a turned on leap hand diagram 2013-07-31 12:09:46 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Jeffrey Ventrella
1f48de891b Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 11:06:31 -07:00
Andrzej Kapolka
353d674ad9 Masking tweak. 2013-07-30 15:56:47 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other) 
so that we can control their bitrates separately.
 2013-07-30 15:11:32 -07:00
Andrzej Kapolka
f8ba1c4be1 Use the V channel to provide masking information, indicating invalid depths. 2013-07-30 13:42:29 -07:00
atlante45
1b2f236d42 Follow mode operationnal 2013-07-30 12:30:15 -07:00
ZappoMan
c7e3fe5ef6 Added false colorization by voxel server source 
- switched readBitstreamToTree() to take params struct for future expansion
- switched readNodeData() to take params for future expansion
- added sourceID to VoxelNode
- fixed false colorize routines to correctly redraw by marking tree as dirty
 2013-07-30 11:08:48 -07:00
Jeffrey Ventrella
df32c18994 cleanup 2013-07-29 16:15:44 -07:00
Jeffrey Ventrella
a1eba53678 cleanup 2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843 Merge remote-tracking branch 'upstream/master' into particles 2013-07-29 15:07:56 -07:00
Jeffrey Ventrella
37ff8ae030 added color modulation 2013-07-29 15:07:05 -07:00
Mark Peng
d01f694d49 Remove extra semicolon in avatar.cpp 2013-07-29 11:52:29 -07:00
Jeffrey Ventrella
f83ee1e0b5 cleanup 2013-07-29 09:48:28 -07:00
Mark Peng
dd2655825a Fix first person camera positioning to correspond to eyelevel. 
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
 2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
a5a9784e6b cleanup 2013-07-26 15:44:32 -07:00
Jeffrey Ventrella
05e0bf3e84 added collision plane 2013-07-26 15:21:10 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
atlante45
f3c87b81ec Avatar can follow but don't look at the same point for the moment 2013-07-25 16:14:47 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
Jeffrey Ventrella
5e2dcfee53 cleaned up some magic numbers 2013-07-24 16:52:37 -07:00
Jeffrey Ventrella
aee29a0ab1 cleaning up the particle system more 2013-07-24 16:37:13 -07:00
atlante45
68194f2037 Slot calling when pie menu on avatar. 2013-07-24 13:50:00 -07:00
Jeffrey Ventrella
288a218ae2 Merge remote-tracking branch 'upstream/master' into particles 2013-07-24 12:41:32 -07:00
Jeffrey Ventrella
2f28f3ea4b made some extra checks for bogus data coming in, and added more particle effects to rave glove hand 2013-07-24 12:41:01 -07:00
Stephen Birarda
7134d13001 tweaks for iOS compatibility 2013-07-24 12:34:32 -07:00
Stephen Birarda
f27eb5e1d8 small code changes for qt5 compatibility 2013-07-24 12:06:55 -07:00
atlante45
177471e83b First step toward follow mode 2013-07-24 11:24:28 -07:00
ZappoMan
31a1e3e7b5 Merge pull request #720 from LionTurtle/master 
Fix eyePosition so that lookatVectors point directly to eyes,
 2013-07-24 01:19:49 -07:00
Jeffrey Ventrella
f85690c1c4 Merge remote-tracking branch 'upstream/master' into particles 2013-07-23 20:46:34 -07:00
Jeffrey Ventrella
903a248061 cleaned up some code and added asserts to help track down a crash 2013-07-23 20:46:09 -07:00
ZappoMan
e7fb392f38 Merge branch 'master' of https://github.com/worklist/hifi into audio_select 2013-07-23 20:20:49 -07:00
Jeffrey Ventrella
062ee657ca added extra mode and started prototyping "ribbon" effect 2013-07-23 14:41:52 -07:00
ZappoMan
c969570e8c working on selected audio 2013-07-22 23:05:42 -07:00
Mark Peng
0f1ac2b226 Fix eyePosition so that lookatVectors point directly to eyes, 
even when looking at someone from above.
 2013-07-22 16:46:06 -07:00
Jeffrey Ventrella
9f99bff791 Merge remote-tracking branch 'upstream/master' into particles 2013-07-22 14:08:19 -07:00
Jeffrey Ventrella
fdebe166ba fixed it so both leap hands produce particles 2013-07-22 14:07:51 -07:00
Jeffrey Ventrella
8a55db53ce merge 2013-07-22 10:42:18 -07:00
Jeffrey Ventrella
5f0d52ce89 uh, whatever 2013-07-22 10:35:02 -07:00
Jeffrey Ventrella
13e6f2e6fa added sphere resolution to emitter attributes 2013-07-22 10:31:23 -07:00
Eric Johnston
9ab8fecff5 Minor tweaks to Rave Glove mode, per Ryan's testing 
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
 2013-07-22 07:19:25 -07:00
Jeffrey Ventrella
ad0ca748bb added extra mode and improved particle system 2013-07-20 09:48:55 -07:00
Eric Johnston
0cdad1a313 Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-19 19:48:52 -07:00
Jeffrey Ventrella
05039b4e3e adding rave glove modes and changing API of particle system to accommodate 2013-07-19 18:02:48 -07:00
Jeffrey Ventrella
6e84481931 Merge remote-tracking branch 'upstream/master' into particles 2013-07-19 16:08:43 -07:00
Andrzej Kapolka
f70b4dcab2 Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-19 15:49:07 -07:00
Andrzej Kapolka
ff0d63173c Pass the aspect ratio into the shader, since it no longer necessarily 
corresponds to the texture rectangle's aspect ratio.
 2013-07-18 21:25:11 -07:00
Andrzej Kapolka
0ae6887c4a The depth texture needs nearest neighbor filtering. 2013-07-18 21:06:38 -07:00
Andrzej Kapolka
b15724665b Removed unused variable, fixed shader comments. 2013-07-18 18:16:45 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Andrzej Kapolka
b8be66c6fc Now able to stream depth data. 2013-07-18 17:39:49 -07:00
Andrzej Kapolka
7ce04444fc Most of the way towards working video encoding. 2013-07-18 14:14:44 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Andrzej Kapolka
401ef45000 Removed keypoint stuff, fixed stupidity leading to fringed edges (was 
linearly interpolating the missing values).
 2013-07-16 17:56:53 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Andrzej Kapolka
905bd9b011 Track features on face, add a mode to render just key points. 2013-07-16 11:54:19 -07:00
Andrzej Kapolka
d5abb3e6eb Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-15 16:15:12 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
Andrzej Kapolka
6c587af6ac Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/avatar/Head.cpp
 2013-07-15 13:13:51 -07:00
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
Andrzej Kapolka
a59fbfbf3e Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
 2013-07-12 15:34:55 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00