Hifi Test Account
8cadca4ce7
Resize half cylinder backing to texture in full frame mode.
2013-08-07 15:35:12 -07:00
Andrzej Kapolka
a8099c93c0
Merge pull request #806 from LionTurtle/master
...
Add renderHalfCylinder function and render a static half cylinder behind the face in full frame mode.
2013-08-07 14:43:04 -07:00
Andrzej Kapolka
d3b7a31e3b
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Camera.cpp
2013-08-07 14:27:17 -07:00
Andrzej Kapolka
e9b3cca3de
OpenGL fields of view are vertical, not horizontal.
2013-08-07 14:26:22 -07:00
atlante45
81446f13d5
Fix head not colliding with voxels and environement
2013-08-07 14:18:02 -07:00
atlante45
d0461e36f1
Fix no collision when offset camera on from the beginning
2013-08-07 14:16:49 -07:00
Hifi Test Account
cd8047b01a
Remove unused vars in Face class.
2013-08-07 13:54:38 -07:00
ZappoMan
153e8afd44
Merge pull request #816 from Atlante45/master
...
Fix objects coming into near clip
2013-08-07 12:39:01 -07:00
ZappoMan
393723d8fb
changed delete voxel fade color
2013-08-07 12:36:26 -07:00
atlante45
3bc9dd116e
- Compute collisions radius only when collisions are on
2013-08-07 12:31:31 -07:00
Hifi Test Account
5f90e1a4e9
Fix the last commit. Remove compile error and increased buffer size to
...
to account for the increased size of vertexData.
2013-08-07 12:30:45 -07:00
atlante45
35557e1973
- Change collision radius according to near clip so nothing comes inside
2013-08-07 12:25:31 -07:00
atlante45
19b9be3361
- Now P switch between first and third person view
2013-08-07 12:24:13 -07:00
Hifi Test Account
edf4579d0e
Merge remote-tracking branch 'upstream/master'
2013-08-07 12:08:43 -07:00
Hifi Test Account
1e7dbbbccd
Fix renderHalfCylinder so that normals are correct now. Add facePosition and faceRotation storage to Face class.
2013-08-07 12:07:41 -07:00
ZappoMan
451b2bc595
added Sending Mode to on screen stats
2013-08-07 12:07:39 -07:00
ZappoMan
11b7e84a80
Merge pull request #811 from ey6es/master
...
Several minor fixes for depth camera code.
2013-08-07 12:01:01 -07:00
Andrzej Kapolka
e17149a49d
Merge pull request #812 from Atlante45/master
...
Rendering changes
2013-08-07 11:46:43 -07:00
Andrzej Kapolka
80481747fa
Fix for enabling depth-only webcam after startup.
2013-08-07 11:15:37 -07:00
Andrzej Kapolka
377adb30ae
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:14:48 -07:00
Eric Johnston
5373f85d30
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-08-07 11:13:42 -07:00
atlante45
ce12c51fce
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:13:26 -07:00
ZappoMan
96e6c2f9bd
Merge pull request #810 from ZappoMan/master
...
quick fix crash in parseVoxelStats()
2013-08-07 11:11:46 -07:00
atlante45
08309e3aac
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:11:29 -07:00
ZappoMan
ccf3498ae5
quick fix crash in parseVoxelStats()
2013-08-07 11:11:03 -07:00
Eric Johnston
10e4174ce3
Rave tweak: keep the right arm on the right-most Leap hand.
2013-08-07 11:08:14 -07:00
atlante45
dcdae6c6a0
- Add a translucide sphere around avatars far away with radius relative to average loudness
2013-08-07 11:00:20 -07:00
atlante45
f151b2cfc1
- Don't render body when in first person view
2013-08-07 10:58:30 -07:00
atlante45
132d03e291
Moved string when following to chest
2013-08-07 10:56:32 -07:00
atlante45
414af9811a
- Add fading to lookAt vectors
2013-08-07 10:54:52 -07:00
ZappoMan
d893d4cf16
Merge pull request #807 from machinelevel/dev4
...
Rave tweaks: change the look of the hands, fix screen-darken
2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a
Rave tweaks: change the look of the hands, fix screen-darken
...
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
2013-08-07 10:29:31 -07:00
Jeffrey Ventrella
6997d0174a
clean up in mohawk code
2013-08-07 10:24:21 -07:00
Andrzej Kapolka
ca939fb6b8
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4
Merge remote-tracking branch 'upstream/master' into particles
2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d
fixed mohawk physics bug
2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc
Include received video data in bandwidth usage, clear webcam bits when it's
...
been turned off.
2013-08-07 10:17:04 -07:00
Hifi Test Account
988faeff54
Render static halfCylinder backing to face in full frame mode.
2013-08-07 10:14:35 -07:00
Philip Rosedale
cdfabd7647
Merge pull request #805 from ZappoMan/master
...
Tweaks for Grayson
2013-08-07 10:01:58 -07:00
ZappoMan
61560af28f
cleanup
2013-08-06 19:21:46 -07:00
ZappoMan
a5f472254d
removed ground plane grid, and changed start position
2013-08-06 19:15:26 -07:00
Hifi Test Account
05d933bf33
Successful static half cylinder backing.
2013-08-06 18:38:41 -07:00
Hifi Test Account
d725bcdbff
Fix renderHalfCylinder so it only has 2 args now.
2013-08-06 18:09:51 -07:00
Hifi Test Account
24e47755d4
Merge texture render code to improve PrimeSense.
2013-08-06 17:42:26 -07:00
Eric Johnston
35465686db
Rave tweaks: Use separate light settings for avatars and particles
2013-08-06 17:39:56 -07:00
Philip Rosedale
7583e1cd14
Merge pull request #802 from ey6es/master
...
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae
Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want.
2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-06 16:28:22 -07:00
Andrzej Kapolka
63aeb4df75
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-08-06 16:28:14 -07:00
Andrzej Kapolka
bd3c235fe4
Switching between textured and untextured modes.
2013-08-06 16:23:58 -07:00
