Mark Peng
147d5fc454
Merge remote-tracking branch 'upstream/master'
2013-08-05 19:52:55 -07:00
Mark Peng
57efea40ee
Add untested renderHalfCylinder function to GeometryCache/
2013-08-05 19:52:02 -07:00
Philip Rosedale
e5de67152e
Merge pull request #786 from Ventrella/particles
...
Added member variables to Hand.cpp to manage rave glove mode switching
2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c
Merge pull request #787 from machinelevel/dev4
...
Rave glove demo: network-glove fixes
2013-08-05 18:58:04 -07:00
Jeffrey Ventrella
f9f925b70b
removed printf
2013-08-05 17:30:04 -07:00
Eric Johnston
d85ce81313
Rave glove demo: network-glove fixes
...
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
2013-08-05 17:27:42 -07:00
Jeffrey Ventrella
cba42808c1
fixed initial rave glove mode
2013-08-05 17:24:31 -07:00
Jeffrey Ventrella
4ceba28632
working with Eric to fix transmission of hand data
2013-08-05 17:00:50 -07:00
Jeffrey Ventrella
2dbd0f7f31
Merge branch 'master' of https://github.com/worklist/hifi into particles
2013-08-05 16:31:49 -07:00
Jeffrey Ventrella
f51db292a4
ya
2013-08-05 16:26:32 -07:00
ZappoMan
cc8c92c4e0
Merge pull request #785 from machinelevel/dev4
...
Disable hand receive logic to keep team from crashing while a bug is bei...
2013-08-05 16:05:06 -07:00
Eric Johnston
39f9729acb
Warning fix: virtual method needs virtual destructor
2013-08-05 16:03:17 -07:00
Eric Johnston
14e470133c
More cleanup after crash tracing
2013-08-05 16:02:09 -07:00
Eric Johnston
858738a10a
Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled
2013-08-05 15:56:49 -07:00
Eric Johnston
002a62d31e
Disable hand receive logic to keep team from crashing while a bug is being tracked.
2013-08-05 15:46:12 -07:00
ZappoMan
07a61a3c8e
Merge pull request #782 from Atlante45/master
...
few fixes on rescaling and following
2013-08-05 15:44:15 -07:00
Andrzej Kapolka
f010b8775b
Merge pull request #784 from ey6es/master
...
Fix for ground rendering (on OS X): enable GL_NORMALIZE, which overrides RESCALE_NORMALS.
2013-08-05 15:28:16 -07:00
atlante45
55e34558cb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48
Normalize when we render the ground. This shouldn't be necessary, but it
...
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand. We'll have to look at that more closely later
on.
2013-08-05 15:24:21 -07:00
atlante45
29062c51b2
- changed according to review comments
...
- added reset scale option
2013-08-05 15:23:40 -07:00
Andrzej Kapolka
ca90a91df4
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:56:01 -07:00
ZappoMan
7021d3c6a5
Merge pull request #777 from Ventrella/particles
...
Added BendyLine
2013-08-05 14:55:26 -07:00
Andrzej Kapolka
8addc9bb03
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:54:48 -07:00
ZappoMan
7ccab1a32c
Merge pull request #783 from LionTurtle/master
...
Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
2013-08-05 14:53:27 -07:00
Andrzej Kapolka
13415afd44
Revert "Working on upgrading to latest version of Oculus software and adding Linux"
...
This reverts commit 98a0c01b29
2013-08-05 14:52:38 -07:00
Andrzej Kapolka
c5cae04587
Revert "Switch to debug libs."
...
This reverts commit 1739371c17
2013-08-05 14:52:22 -07:00
Mark Peng
1790b0595c
Render other avatar's lookat to point at my camera if the other avatar
...
is looking at my head.
2013-08-05 14:26:39 -07:00
Andrzej Kapolka
1739371c17
Switch to debug libs.
2013-08-05 14:18:46 -07:00
atlante45
6c0ea0cf9c
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:11:14 -07:00
Andrzej Kapolka
98a0c01b29
Working on upgrading to latest version of Oculus software and adding Linux
...
support.
2013-08-05 14:10:47 -07:00
Jeffrey Ventrella
1a2c8f9875
Merge remote-tracking branch 'upstream/master' into particles
2013-08-05 14:10:28 -07:00
Jeffrey Ventrella
96b443ec5d
Merge pull request #781 from machinelevel/dev4
...
Rave glove demo: Network rave data
2013-08-05 14:07:57 -07:00
atlante45
3d853f5b90
- Smooth rescaling
...
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
2013-08-05 14:05:58 -07:00
Eric Johnston
a3a5c3d6d4
Rave glove demo: Network rave data
...
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
2013-08-05 13:25:05 -07:00
ZappoMan
fe877b0ec8
Merge pull request #779 from birarda/rave-audio
...
fix resetting of song mix menu item after import is done
2013-08-05 12:27:47 -07:00
Stephen Birarda
25537f78a1
reset the song mix menu item after clip is done
2013-08-05 12:18:59 -07:00
Philip Rosedale
461bf002cf
Merge pull request #776 from ey6es/pointy
...
Render a green plane with fog, per Grayson's request.
2013-08-05 12:09:32 -07:00
Jeffrey Ventrella
405cb516f6
removed 3 magic numbers in particle system
2013-08-05 12:05:15 -07:00
Andrzej Kapolka
c5e673a1e7
Merge pull request #778 from ey6es/master
...
Fix for GCC warning. Someone in Java mode?
2013-08-05 11:59:35 -07:00
Andrzej Kapolka
2722cfa5ac
Fix for GCC warning. #import?
2013-08-05 11:58:09 -07:00
Jeffrey Ventrella
ace133a62e
Merge branch 'master' of https://github.com/worklist/hifi into particles
2013-08-05 11:49:42 -07:00
Andrzej Kapolka
e8365c6b04
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-05 11:42:17 -07:00
Andrzej Kapolka
03de2f3ea7
Render a green plane with fog, per Grayson's request.
2013-08-05 11:41:42 -07:00
Jeffrey Ventrella
e2ba8e22d5
added BendyLine
2013-08-05 11:35:02 -07:00
Jeffrey Ventrella
7693165578
merge
2013-08-05 11:28:59 -07:00
Jeffrey Ventrella
6e69c4fbbb
improved particle rainbow color cycle mode
2013-08-05 11:28:10 -07:00
Stephen Birarda
1876cd4f44
Merge pull request #775 from ZappoMan/multiple_voxel_servers
...
added more color groups for false colorization from source
2013-08-05 11:24:09 -07:00
ZappoMan
92f6fe6bd8
CR feedback
2013-08-05 11:14:30 -07:00
ZappoMan
bdabe709af
added more color groups for false colorization from source
2013-08-05 11:11:10 -07:00
Mark Peng
ea0fa8e5c7
Merge remote-tracking branch 'upstream/master'
2013-08-05 11:03:01 -07:00
