Philip Rosedale
43ad461275
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-08 16:01:02 -07:00
Philip Rosedale
45961b2b64
Collision and click sounds improved
2013-08-08 16:00:50 -07:00
Andrzej Kapolka
c929f67cc4
Update the *other* avatar mixer bandwidth stats.
2013-08-08 12:33:31 -07:00
Andrzej Kapolka
29912d053a
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-08 11:02:59 -07:00
Andrzej Kapolka
aca15d4aef
Disable specular highlights for ground and voxels.
2013-08-08 10:59:01 -07:00
ZappoMan
647c176631
make voxel server fades slightly smaller than bounds to prevent z-fighting
2013-08-08 09:57:48 -07:00
Andrzej Kapolka
9dbec35f6a
Merge pull request #823 from ZappoMan/master
...
Display Frustum and resizeGL() cleanup
2013-08-07 16:29:34 -07:00
ZappoMan
cb211fbb04
CR feedback
2013-08-07 16:27:43 -07:00
ZappoMan
9f5f7d96da
Merge pull request #820 from Atlante45/master
...
Display leap hand and rave glove in first person mode
2013-08-07 16:17:37 -07:00
ZappoMan
f4820143d7
cleanup resizeGL, and Display Frustum menus
2013-08-07 16:12:03 -07:00
Philip Rosedale
a4d1bc5b6e
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 14:43:49 -07:00
Philip Rosedale
0445da3221
Stop rotating more quickly, display avatar position and yaw stats
2013-08-07 14:42:57 -07:00
atlante45
6fb76d3dfe
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 14:30:18 -07:00
atlante45
c48652c2c3
Display leap hand and rave glove in first person mode
2013-08-07 14:28:21 -07:00
Andrzej Kapolka
e9b3cca3de
OpenGL fields of view are vertical, not horizontal.
2013-08-07 14:26:22 -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
19b9be3361
- Now P switch between first and third person view
2013-08-07 12:24:13 -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
377adb30ae
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:14:48 -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
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
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
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
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
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
atlante45
558255ca3d
- Made collision On by default
2013-08-06 16:13:31 -07:00
Philip Rosedale
426abbb55a
Merge pull request #799 from ZappoMan/fun_fade
...
add fade effect to voxel add and delete, fix crash with audio injector
2013-08-06 15:09:43 -07:00
ZappoMan
634b69b545
Merge pull request #797 from machinelevel/dev4
...
Rave demo changes per Ryan's request: Darken the world when you're in ra...
2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa
Merge pull request #796 from PhilipRosedale/touchLook
...
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
2013-08-06 14:59:28 -07:00
ZappoMan
facc9e1ee7
add fade effect to voxel add and delete, fix crash with audio injector
2013-08-06 14:55:40 -07:00
Eric Johnston
2e5dade413
Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened.
...
Also fixed a warning in AvatarData.cpp initialization
2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
...
Conflicts:
interface/src/Application.cpp
2013-08-06 13:49:42 -07:00
Philip Rosedale
ebd5c4832a
Merge branch 'master' of https://github.com/worklist/hifi into touchLook
2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506
Tuned gyro look, added better preferences
2013-08-06 12:34:45 -07:00
