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
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
ZappoMan
c93c6687bf
fix build buster
2013-08-06 13:48:30 -07:00
ZappoMan
fb2a1cce50
Merge pull request #795 from machinelevel/dev4
...
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
2013-08-06 13:45:42 -07:00
Andrzej Kapolka
720ae561df
Working on support for a textured face mode that doesn't rely on the video
...
stream.
2013-08-06 13:27:54 -07:00
Eric Johnston
9a4a0e2819
Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face.
2013-08-06 12:44:29 -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
ZappoMan
c93ed450a2
Merge pull request #791 from Atlante45/stalking_indicator
...
Stalking indicator
2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f
Merge pull request #792 from Atlante45/turn_off_collisions
...
Add option to turn collisions on and off
2013-08-06 12:27:27 -07:00
Philip Rosedale
bb15eb664c
Merge pull request #793 from machinelevel/dev4
...
Rave glove: Fix initialization issues and activate mode switch.
2013-08-06 12:15:01 -07:00
ZappoMan
88e2e3dd3f
added visulization for voxel add/kill
2013-08-06 12:05:43 -07:00
Eric Johnston
ab31c3f82d
Rave glove: Fix initialization issues and activate mode switch.
...
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
2013-08-06 11:59:58 -07:00
atlante45
ddf1b06bf9
Add option to turn collisions on and off
2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb
Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator
2013-08-06 11:07:58 -07:00
atlante45
32c155ef71
Render a string to show who is following who
2013-08-06 10:53:10 -07:00
ZappoMan
13408b607e
Merge pull request #790 from PhilipRosedale/touchLook
...
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:39:57 -07:00
ZappoMan
73510ec975
added notifications with jurisdiction details for when voxel servers come and go
2013-08-06 10:33:09 -07:00
Philip Rosedale
58cb852597
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:06:40 -07:00
Eric Johnston
16aae5993a
Rave glove fixes: removed double-stored glove mode members
...
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
2013-08-06 07:33:18 -07:00
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
ZappoMan
b016c08578
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
...
Conflicts:
libraries/avatars/src/HandData.h
2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e
correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats
2013-08-05 16:51:01 -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
07a61a3c8e
Merge pull request #782 from Atlante45/master
...
few fixes on rescaling and following
2013-08-05 15:44:15 -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
ZappoMan
7a3d254aca
small tweak
2013-08-05 15:02:24 -07:00
ZappoMan
f1a0edb471
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-05 14:57:10 -07:00
ZappoMan
7021d3c6a5
Merge pull request #777 from Ventrella/particles
...
Added BendyLine
2013-08-05 14:55:26 -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
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
atlante45
6c0ea0cf9c
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 14:11:14 -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
ZappoMan
14b7f58fef
Kills local voxels if voxel server is removed from NodeList
...
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
voxel server is killed
2013-08-05 13:47:18 -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
Jeffrey Ventrella
405cb516f6
removed 3 magic numbers in particle system
2013-08-05 12:05:15 -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
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
Stephen Birarda
035f1c81b9
Merge pull request #770 from ZappoMan/tile_import
...
made import work better when tile locations not included in file name
2013-08-05 10:56:53 -07:00
ZappoMan
1c45845842
Merge pull request #772 from birarda/assignee
...
initial stub of assignment work
2013-08-05 10:56:31 -07:00
atlante45
1ee870be38
Fix pie menu appearing in selection mode
2013-08-05 10:35:10 -07:00
ZappoMan
cc9e4eaf45
CR feedback
2013-08-05 10:24:52 -07:00
Stephen Birarda
fdd0e25a60
Merge pull request #771 from ZappoMan/bugfixes
...
fixed disappearing voxel bug
2013-08-05 10:15:56 -07:00
Stephen Birarda
a4ea0f035a
resolve conflicts on merge with upstream master
2013-08-05 09:56:07 -07:00
ZappoMan
edfd5cd543
fixed disappearing voxel bug
2013-08-05 09:45:00 -07:00
ZappoMan
abc8bc332c
made import work better when tile locations not included in file name
2013-08-02 20:12:13 -07:00
ZappoMan
ce937247d1
added back getUprightEyeLevelPosition()
2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33
fixed compiler warnings
2013-08-02 18:33:41 -07:00
Mark Peng
5ef965018c
Fix bug where the lookatIndicator would draw and no longer update.
2013-08-02 18:13:49 -07:00
Mark Peng
da31cd441e
Merge remote-tracking branch 'upstream/master'
2013-08-02 18:08:28 -07:00
Mark Peng
26d6e826c5
Merge remote-tracking branch 'upstream/master'
2013-08-02 18:03:34 -07:00
Mark Peng
71a919f226
Switch back to avatar.getEyePosition() rather than
...
avatar.getHead().getEyePosition() because of mysterious lag.
2013-08-02 18:02:37 -07:00
atlante45
ff27ee1c53
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 18:00:42 -07:00
atlante45
be83bf5635
Fixed fucked up merge
2013-08-02 17:57:53 -07:00
Stephen Birarda
8704964a0f
resolve conflicts on merge with upstream master
2013-08-02 17:56:19 -07:00
Stephen Birarda
222a46189f
some comments and _songFileBytes reset
2013-08-02 17:50:08 -07:00
Stephen Birarda
d259180778
add option to audio menu to stop the mixed audio
2013-08-02 17:46:23 -07:00
atlante45
84eae284ea
Changed shifted and meta variable name
2013-08-02 17:44:21 -07:00
Mark Peng
ff67367221
Remove extra parenthesis.
2013-08-02 17:42:12 -07:00
Mark Peng
e0b7773521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/Head.cpp
2013-08-02 17:35:29 -07:00
atlante45
466d50ea4b
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 17:30:59 -07:00
Stephen Birarda
d56b715432
add menu option to mix RAW audio with microphone audio
2013-08-02 17:30:49 -07:00
Mark Peng
d7cd88a9a7
Fix camera positioning so that it is in between avatar's eyes. Plus
...
some code clean up.
2013-08-02 17:30:26 -07:00
Philip Rosedale
1309e72553
Merge pull request #758 from Ventrella/particles
...
Added avatar nose
2013-08-02 17:26:10 -07:00
atlante45
bceb416d8a
merge
2013-08-02 17:18:35 -07:00
atlante45
d765b58551
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 17:17:35 -07:00
atlante45
e9a53ed9b4
Changed avatar resizing shortcuts to plus and minus.
2013-08-02 17:14:57 -07:00
Andrzej Kapolka
4a122c6dca
Merge pull request #761 from ey6es/pointy
...
Adjusted bitrate for full frame video, fix for underflow errors.
2013-08-02 17:05:00 -07:00
Stephen Birarda
447e332b6f
Merge pull request #760 from Atlante45/fix_key_press_event
...
Fix key press event
2013-08-02 16:45:25 -07:00
Philip Rosedale
936209fd31
When no hovered voxel, lookAt vectors point to distant horizon
2013-08-02 16:37:49 -07:00
atlante45
8c112cbec3
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
2013-08-02 16:37:18 -07:00
atlante45
1b4cdc003d
Fix shortcuts : done
2013-08-02 16:36:53 -07:00
Philip Rosedale
639b6be01a
Merge branch 'master' of https://github.com/worklist/hifi into Remove-body
2013-08-02 16:08:16 -07:00
Jeffrey Ventrella
d87b4a8e1e
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 16:08:01 -07:00
Jeffrey Ventrella
95f15fceb5
added avatar nose
2013-08-02 16:07:33 -07:00
Philip Rosedale
8aa8b5dbfe
Marker lines all the way out to 128Meters
2013-08-02 16:03:34 -07:00
Philip Rosedale
b9a8d6080e
Render world box goes out to edge of world.
2013-08-02 15:43:37 -07:00
atlante45
eb2a1ecedd
merge
2013-08-02 15:41:32 -07:00
atlante45
2e150b97de
Fixed shortcuts issues on mac
2013-08-02 15:24:09 -07:00
Andrzej Kapolka
574752c774
Use saturate_cast when converting from YV12 to RGB to prevent overflow errors.
2013-08-02 14:58:59 -07:00
ZappoMan
db55160f9a
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 14:40:39 -07:00
Andrzej Kapolka
5df4fc95f1
Up the bitrate for full frame video to 4x.
2013-08-02 14:21:21 -07:00
atlante45
f441295eb1
Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option
2013-08-02 14:15:07 -07:00
atlante45
1cae9fc6c7
merge
2013-08-02 14:14:21 -07:00
Jeffrey Ventrella
17f1c82e6f
cleanup
2013-08-02 14:12:32 -07:00
Andrzej Kapolka
8de709a2c6
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-02 14:09:27 -07:00
Jeffrey Ventrella
f80a9fdf31
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 14:09:22 -07:00
Jeffrey Ventrella
90502a3ce5
removed rendering of finger root positions
2013-08-02 14:08:56 -07:00
ZappoMan
55f7028726
Merge pull request #744 from PhilipRosedale/master
...
Smoother movement, rotation, less distracting collision noises. Play sound on click voxel
2013-08-02 14:03:51 -07:00
Jeffrey Ventrella
29c5511a54
test
2013-08-02 13:49:50 -07:00
Jeffrey Ventrella
28dd38c013
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 13:36:01 -07:00
Jeffrey Ventrella
a9ec94de49
fixed a problem with emitters not being coordinated with Leap fingers
2013-08-02 13:35:35 -07:00
ZappoMan
4c15964cdc
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-02 11:44:09 -07:00
Andrzej Kapolka
def4318817
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-02 11:12:59 -07:00
Andrzej Kapolka
61da1826c7
Reduce bitrate for full frame mode.
2013-08-02 11:12:41 -07:00
Jeffrey Ventrella
6ebe33bb0b
Merge remote-tracking branch 'upstream/master' into particles
2013-08-02 11:00:10 -07:00
Mark Peng
6cf42674d5
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
interface/src/Application.cpp
interface/src/Webcam.cpp
interface/src/Webcam.h
2013-08-02 11:00:05 -07:00
Jeffrey Ventrella
8fc800acff
some work on hands
2013-08-02 10:59:04 -07:00
Andrzej Kapolka
11664f9446
Have the particle system default to off.
2013-08-02 10:12:21 -07:00
Philip Rosedale
1b5c79aa8a
Merge branch 'master' of https://github.com/worklist/hifi into Remove-body
2013-08-02 09:37:08 -07:00
Philip Rosedale
56e66f8020
Merge pull request #752 from ey6es/pointy
...
Depth smoothing, full frame video support (along with ability cycle between no video, just face, full frame).
2013-08-01 21:11:09 -07:00
ZappoMan
983db5f70d
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
2013-08-01 20:50:24 -07:00
Andrzej Kapolka
323e21ad4a
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-01 19:28:34 -07:00
Andrzej Kapolka
69cac69067
Go ahead and show the leap hand by default, but don't include the fingers if
...
the palms are inactive (!)
2013-08-01 18:56:14 -07:00
Philip Rosedale
8f95534644
Fix jittering in view from body slowly following head
2013-08-01 16:04:38 -07:00
Andrzej Kapolka
0052221c33
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551
merge
2013-08-01 15:48:57 -07:00
ZappoMan
0a4fcdccb5
Merge branch 'master' of https://github.com/worklist/hifi into tile_import
...
Conflicts:
interface/src/Application.cpp
2013-08-01 15:44:28 -07:00
ZappoMan
a0ba788679
implement grid landscape import
2013-08-01 15:40:39 -07:00
Andrzej Kapolka
12f42358d5
Allow cycling between video send modes.
2013-08-01 15:39:53 -07:00
Philip Rosedale
9defa6255a
disable mouse wheel voxel scale change
2013-08-01 15:31:09 -07:00
atlante45
b6049c9a10
Merge branch 'master' of https://github.com/worklist/hifi into pie_menu
2013-08-01 15:28:35 -07:00
Mark Peng
6a6c51f80e
Add skeleton tracking toggle in options menu in interface.
2013-08-01 15:04:58 -07:00
Philip Rosedale
ef8daffa4d
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc
Sound on click, but not on hover
2013-08-01 15:00:08 -07:00
Stephen Birarda
2b0cfe3c67
resolve conflicts on merge with upstream master
2013-08-01 14:33:23 -07:00
Mark Peng
9ba0e3bb0c
Add reference lines to mouse voxel when adding/deleting voxels.
2013-08-01 13:03:17 -07:00
Andrzej Kapolka
ba9b5888d2
More work on full frame sending.
2013-08-01 13:00:01 -07:00
Philip Rosedale
bc1ac6b455
turn down collision sounds
2013-08-01 12:49:10 -07:00
Jeffrey Ventrella
5c38f78afc
Merge remote-tracking branch 'upstream/master' into particles
2013-08-01 10:53:49 -07:00
Jeffrey Ventrella
0cd1018e76
some experimental work on hand rendering
2013-08-01 10:53:20 -07:00
Philip Rosedale
ba2c98a3eb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-01 10:12:13 -07:00
Stephen Birarda
71ab8ae4f8
some necessary changes for AvatarData transmission
2013-08-01 10:07:10 -07:00
Andrzej Kapolka
a86ceb2759
More work on full frame video.
2013-07-31 18:18:37 -07:00
Jeffrey Ventrella
8f8d230761
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 17:59:37 -07:00
Jeffrey Ventrella
5b2693f99c
added emitter active bool for switching emitters on/off when Leap loses fingers
2013-07-31 17:59:15 -07:00
Andrzej Kapolka
d18a9dc499
Working on full frame video support.
2013-07-31 17:06:09 -07:00
ZappoMan
55988ab802
Merge pull request #738 from Ventrella/particles
...
Changed rave glove modes to use names suggested by Brad
2013-07-31 16:21:04 -07:00
Stephen Birarda
493eda8dd0
Merge pull request #737 from birarda/qt5
...
fix automoc error for OpenNI header
2013-07-31 16:18:32 -07:00
Stephen Birarda
8166ed3a77
move OpenNI include
2013-07-31 16:15:39 -07:00
Stephen Birarda
b3fc378a0f
don't include XnCppWrapper if Q_MOC_RUN is defined
2013-07-31 16:14:17 -07:00
Jeffrey Ventrella
be8a587d49
named rave glove effects
2013-07-31 16:07:21 -07:00
Jeffrey Ventrella
6c1cc911d5
Merge remote-tracking branch 'upstream/master' into particles
2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
5b1ba56d67
toggle debug print statements for Leap fingers
2013-07-31 15:12:29 -07:00
Andrzej Kapolka
415949cc26
Terminology change to reflect the fact that we're no longer using the mean.
2013-07-31 14:40:33 -07:00
Jeffrey Ventrella
0aaeb4550a
cleanup
2013-07-31 13:07:52 -07:00
Jeffrey Ventrella
89f36a7eb7
cleanup
2013-07-31 12:38:40 -07:00
