Andrzej Kapolka
de52342a14
Working on depth data processing.
2013-07-29 16:04:15 -07:00
Andrzej Kapolka
3b3801915b
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 15:44:41 -07:00
Andrzej Kapolka
6bc3e9b808
Merge pull request #726 from ZappoMan/bug_fixes
...
fix bug with dragonfly leaving trailing bits
2013-07-29 15:44:31 -07:00
ZappoMan
1a73485e36
Improved VoxelNode delete callback based on CR feedback
...
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
2013-07-29 15:30:30 -07:00
Andrzej Kapolka
c678b79373
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 15:17:55 -07:00
Leonardo Murillo
83e90cba49
Merge pull request #729 from murillodigital/master
...
Fixing cmake path on seed's groovy
2013-07-29 15:02:38 -07:00
Leonardo Murillo
9662b956c7
Fixing cmake path on seed's groovy
2013-07-29 16:00:55 -06:00
Andrzej Kapolka
fac3ff1089
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 14:35:31 -07:00
Andrzej Kapolka
855d388424
Merge pull request #727 from LionTurtle/master
...
Fix first person camera positioning to correspond to eyelevel.
2013-07-29 14:35:14 -07:00
ZappoMan
e20f163e0a
changed some defines to consts
2013-07-29 13:34:58 -07:00
ZappoMan
03a75ab295
fixed spacing
2013-07-29 13:08:05 -07:00
ZappoMan
97aaa738c3
fixed typo
2013-07-29 13:07:12 -07:00
ZappoMan
d6428a8145
removed unneeded cast
2013-07-29 13:03:42 -07:00
ZappoMan
6a2bab2a2c
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-29 13:02:14 -07:00
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
1f076cc268
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 10:50:55 -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
Andrzej Kapolka
b02c5f103d
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 10:14:39 -07:00
Andrzej Kapolka
5812747ef8
Double the bitrate to see if we can reduce the blockiness.
2013-07-29 10:06:03 -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
ZappoMan
4cca7e2572
Fixed issue with freeing up abandoned VBO slots when not moving with animation
2013-07-26 11:44:19 -07:00
ZappoMan
0c95dc4adf
Fixed voxel trails from animations
...
- removed stageForDeletion behavior of VoxelNode
- replaced with VoxelNodeDeletionHook strategy
- VoxelSystem now cleans up previously used VBO index slots via hook
2013-07-26 11:12:48 -07:00
ZappoMan
79648ce656
fix bug with dragonfly leaving trailing bits
2013-07-25 15:22:23 -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
