Stephen Birarda
94d270b3d5
remove equals at beginning of AvatarData
2013-08-08 11:21:39 -07:00
Stephen Birarda
a6cf3be4c4
only keep one assignment in assignment-server for demo
2013-08-07 15:52:04 -07:00
Stephen Birarda
2a9330c41e
Merge branch 'master' of github.com:worklist/hifi into assignee
2013-08-07 11:47:54 -07:00
Andrzej Kapolka
e17149a49d
Merge pull request #812 from Atlante45/master
...
Rendering changes
2013-08-07 11:46:43 -07:00
Andrzej Kapolka
fc7f548920
Merge pull request #809 from machinelevel/dev4
...
Rave tweak: keep the right arm on the right-most Leap hand.
2013-08-07 11:44:22 -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
Stephen Birarda
72b53ea089
add Q_PROPERTY for handPosition
2013-08-07 10:41:32 -07:00
Stephen Birarda
c0793146bd
Avatar instance in JS should be referenced as Avatar
2013-08-07 10:41:17 -07:00
Philip Rosedale
25a9c9335b
Merge pull request #808 from Ventrella/particles
...
fixed bug in mohawk physics
2013-08-07 10:40:56 -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
Stephen Birarda
955b7f0d24
Merge branch 'master' of github.com:worklist/hifi into assignee
2013-08-07 10:26:26 -07:00
Jeffrey Ventrella
6997d0174a
clean up in mohawk code
2013-08-07 10:24:21 -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
Philip Rosedale
cdfabd7647
Merge pull request #805 from ZappoMan/master
...
Tweaks for Grayson
2013-08-07 10:01:58 -07:00
ZappoMan
ef63553b72
Merge pull request #804 from machinelevel/dev4
...
Rave tweaks: Use separate light settings for avatars and particles
2013-08-06 19:23:32 -07:00
ZappoMan
61560af28f
cleanup
2013-08-06 19:21:46 -07:00
ZappoMan
ac693c703a
added --domain option and --BuildStreet option
2013-08-06 19:19:04 -07:00
ZappoMan
a5f472254d
removed ground plane grid, and changed start position
2013-08-06 19:15:26 -07:00
ZappoMan
24ec0b0ddc
fixed packet header bug in createVoxelEditMessage()
2013-08-06 19:15:05 -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
Philip Rosedale
b884a7a35a
Merge pull request #803 from machinelevel/dev4
...
Rave tweaks per Ryan's request: Mood lighting for the avatars. This also...
2013-08-06 17:11:12 -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
ZappoMan
8a912feb32
Merge pull request #800 from Atlante45/master
...
- Made collision On by default
2013-08-06 16:27:42 -07:00
atlante45
ee5306f55f
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-06 16:27:34 -07:00
ZappoMan
ecaaa60c75
Merge pull request #801 from ZappoMan/fun_fade
...
fixed crash
2013-08-06 16:27:21 -07:00
ZappoMan
23461c2e95
fixed crash
2013-08-06 16:26:48 -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
Philip Rosedale
179c2324f8
Merge pull request #798 from ZappoMan/multiple_voxel_servers
...
fixed packets per second command line with new frame rate
2013-08-06 15:07:52 -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
ZappoMan
19941a4a63
fixed packets per second command line with new frame rate
2013-08-06 14:51:46 -07:00
Philip Rosedale
4c9467a806
Merge pull request #794 from ZappoMan/multiple_voxel_servers
...
Visualization for Voxel Server Add/Kill
2013-08-06 14:44:42 -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
