Mark Peng
bfd7f3a6c9
Remove rendering of your own avatar's lookatVectors. This fixes the
...
behavior where if you are moving and jumping, you will occasionally see
your own lookatVectors on your screen.
2013-07-29 12:25:01 -07:00
Mark Peng
bd663a8c22
Merge remote-tracking branch 'upstream/master'
2013-07-29 12:09:27 -07:00
Mark Peng
d01f694d49
Remove extra semicolon in avatar.cpp
2013-07-29 11:52:29 -07:00
Andrzej Kapolka
cbc0b59c24
Merge pull request #728 from ey6es/master
...
The particle system is killing the frame rate, so let's make it toggleable. Also fixed GCC warnings.
2013-07-29 10:47:15 -07:00
Andrzej Kapolka
20360ad3e9
Make particle system update/render toggleable, fix GCC compile warnings.
2013-07-29 10:41:45 -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
Stephen Birarda
718fa291cf
Merge pull request #724 from ZappoMan/bug_fixes
...
fix voxel-server crash
2013-07-25 13:15:47 -07:00
Stephen Birarda
d444e4860b
Merge pull request #722 from ZappoMan/unlimited_avatars
...
split multiple avatars into multiple packets if needed
2013-07-25 13:15:29 -07:00
ZappoMan
919f2a4a93
fix voxel-server crash
2013-07-25 12:56:00 -07:00
ZappoMan
212fddbd34
CR feedback
2013-07-25 12:29:17 -07:00
ZappoMan
c8bde7146e
Merge branch 'master' of https://github.com/worklist/hifi into unlimited_avatars
2013-07-24 13:42:03 -07:00
ZappoMan
bacb4f96e3
added notes
2013-07-24 09:59:51 -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
ZappoMan
b2b67d2b3d
split multiple avatars into multiple packets if needed
2013-07-24 01:18:54 -07:00
Mark Peng
7177b71bc7
Replace var in renderLookatIndicator with const IDENTITY_UP
2013-07-24 00:19:25 -07:00
Stephen Birarda
adf3f29c29
Merge pull request #721 from ZappoMan/audio_select
...
Implement Audio Source Selection
2013-07-23 20:31:22 -07:00
ZappoMan
e7fb392f38
Merge branch 'master' of https://github.com/worklist/hifi into audio_select
2013-07-23 20:20:49 -07:00
ZappoMan
eb8c565350
dry up code
2013-07-23 20:08:57 -07:00
ZappoMan
9507cd8955
switched to vector
2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e
more removing of SourceID from classes
2013-07-23 19:21:43 -07:00
ZappoMan
686bd6c5d1
removed _sourceID, using getNodeID() feature of Node class
2013-07-23 19:06:47 -07:00
ZappoMan
927b0b6708
style fixes
2013-07-23 18:31:57 -07:00
ZappoMan
13ba913fab
made listen mode a typedef
2013-07-23 18:28:30 -07:00
ZappoMan
a12ebc63c3
made listen mode a typedef
2013-07-23 18:26:10 -07:00
Stephen Birarda
fb05726323
Merge pull request #718 from ZappoMan/voxel_stats
...
Sends Voxel Stats from server to client
2013-07-23 18:16:57 -07:00
ZappoMan
229d16b9c7
added local mode to injector
2013-07-22 23:06:08 -07:00
ZappoMan
c969570e8c
working on selected audio
2013-07-22 23:05:42 -07:00
Mark Peng
4e641eed2f
LookatIndicator now scales with the avatar's scale.
2013-07-22 17:11:11 -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
ZappoMan
d5e62b0f5a
CR feedback
2013-07-22 14:18:16 -07:00
ZappoMan
f4749aa916
CR feedback
2013-07-22 14:17:18 -07:00
ZappoMan
86aeaf175c
CR feedback
2013-07-22 14:15:10 -07:00
ZappoMan
60750d1d80
CR feedback
2013-07-22 14:13:10 -07:00
ZappoMan
8186145d35
CR feedback
2013-07-22 14:09:29 -07:00
ZappoMan
70516c8cb4
CR feedback
2013-07-22 14:08:48 -07:00
ZappoMan
d3c46cce8f
CR feedback
2013-07-22 14:01:47 -07:00
ZappoMan
307cfcc7a2
CR feedback
2013-07-22 13:58:15 -07:00
ZappoMan
c301b799c5
first cut at selecting audio sources
2013-07-22 13:54:47 -07:00
Stephen Birarda
4ce2a8a675
Merge pull request #719 from machinelevel/dev4
...
Minor tweaks to Rave Glove mode, per Ryan's testing
2013-07-22 13:50:48 -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
ZappoMan
dc19a1c5cf
Merge branch 'master' of mini:hifi
2013-07-21 16:25:14 -07:00
ZappoMan
76952a9d13
testing
2013-07-21 16:24:23 -07:00
ZappoMan
70c6ed040c
added averages for bits per voxel and elapsed time
2013-07-21 07:21:23 -07:00
ZappoMan
c3fa37019e
replaced old voxel stats with new voxel stats
2013-07-21 05:18:35 -07:00
ZappoMan
de7cd4db03
added total voxel count to stats
2013-07-20 15:49:04 -07:00
ZappoMan
86ad0da09f
Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats
2013-07-20 11:35:10 -07:00
ZappoMan
e0f115298d
additional stats items
2013-07-20 11:28:12 -07:00
ZappoMan
84328057ba
Merge pull request #717 from machinelevel/dev4
...
Rave glove demo: Greatly improved Leap handling
2013-07-20 10:27:26 -07:00
Eric Johnston
6ceb48127a
Small fix when no Leap connected.
2013-07-19 19:56:05 -07:00
Eric Johnston
d10ffd4f2d
Small .h fix after testing without Leap libs
2013-07-19 19:53:30 -07:00