Philip Rosedale
|
21d7fe1277
|
Grab and move with button 4
|
2013-12-13 21:59:19 -08:00 |
|
Philip Rosedale
|
a04c544c17
|
Merge fixes
|
2013-12-13 16:35:11 -08:00 |
|
ZappoMan
|
aaf4ff7dfc
|
added lifetime to particles
|
2013-12-13 14:30:29 -08:00 |
|
ZappoMan
|
38d928fa4e
|
make balls for both hands, allow you to change color, remove red wire simulation
|
2013-12-13 11:58:12 -08:00 |
|
Philip Rosedale
|
63243b2e14
|
merge fix
|
2013-12-12 17:58:37 -08:00 |
|
ZappoMan
|
0560b16133
|
only render local toy ball sphere if there is an actual toy ball
|
2013-12-12 15:47:51 -08:00 |
|
Philip Rosedale
|
b87d5fe98c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-12 15:36:13 -08:00 |
|
Philip Rosedale
|
99f6ce2733
|
merge fix
|
2013-12-12 15:36:06 -08:00 |
|
ZappoMan
|
d3197ef8f9
|
fix crash, and remove gravity while in hand
|
2013-12-12 13:54:36 -08:00 |
|
ZappoMan
|
50b93d1e2b
|
added easy access to creating a ParticleEditHandle for a know particle ID
|
2013-12-12 12:40:38 -08:00 |
|
Philip Rosedale
|
305a75c2b7
|
don’t render toy ball if hand controller trigger not pressed at all
|
2013-12-12 12:33:04 -08:00 |
|
ZappoMan
|
cd830efdd4
|
fixed typo
|
2013-12-12 12:26:12 -08:00 |
|
ZappoMan
|
1a6f730659
|
add findClosestParticle()
|
2013-12-12 12:24:07 -08:00 |
|
ZappoMan
|
a80acc6806
|
slight toy ball cleanup
|
2013-12-12 11:25:31 -08:00 |
|
ZappoMan
|
e1b3b9d967
|
fixed indent, added some damping debugging
|
2013-12-12 10:59:28 -08:00 |
|
ZappoMan
|
5d9b7c7f75
|
change toy ball to use ParicleEditHandle class
|
2013-12-12 10:26:55 -08:00 |
|
Philip Rosedale
|
2d72bea27a
|
cleanup test toy ball throwing code
|
2013-12-11 17:35:02 -08:00 |
|
Philip Rosedale
|
c9f96d1adf
|
Basic joystick thrust/view drive behavior
|
2013-12-10 16:52:08 -08:00 |
|
Philip Rosedale
|
83a1654d9c
|
making toy ball
|
2013-12-09 15:12:28 -08:00 |
|
Andrzej Kapolka
|
d374716c7d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-05 17:09:19 -08:00 |
|
Philip Rosedale
|
3f957bbf5d
|
Rave out!
|
2013-12-05 16:46:11 -08:00 |
|
Andrzej Kapolka
|
16cfeff00d
|
Ignore further up the hierarchy.
|
2013-12-05 16:37:40 -08:00 |
|
Andrzej Kapolka
|
02cd97deb1
|
Adjust palm collision size, use last free index when ignoring.
|
2013-12-05 16:28:33 -08:00 |
|
Philip Rosedale
|
a1027b7dda
|
reverse Hz change because I’ve got some other stuff in there
|
2013-12-05 16:03:06 -08:00 |
|
Philip Rosedale
|
006472cb24
|
tweaked RGB->Hz for drum to make piano
|
2013-12-05 15:56:55 -08:00 |
|
Andrzej Kapolka
|
9be30acf82
|
Render the palm collision proxies.
|
2013-12-05 14:40:24 -08:00 |
|
Andrzej Kapolka
|
d2cb6f0243
|
Test hand against other avatars.
|
2013-12-05 14:19:13 -08:00 |
|
Andrzej Kapolka
|
b90c5bdae8
|
Option to render collision proxies, more general avatar penetration test, fix
for meshes with only one joint influence.
|
2013-12-05 14:00:38 -08:00 |
|
Philip Rosedale
|
a7dacec63d
|
Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me.
|
2013-12-05 13:36:00 -08:00 |
|
Andrzej Kapolka
|
0ea0887f66
|
Add a scale factor to bone radii.
|
2013-12-05 11:21:56 -08:00 |
|
Andrzej Kapolka
|
9b3560d414
|
Skip the hands' parents as well as the hands themselves.
|
2013-12-05 11:10:22 -08:00 |
|
Andrzej Kapolka
|
193f676fcb
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-05 10:18:50 -08:00 |
|
Philip Rosedale
|
8d518f85fe
|
Turn off Sixense (kalman?) filtering, cleanup code
|
2013-12-04 17:55:32 -08:00 |
|
Philip Rosedale
|
c1f96ab6b4
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-04 15:49:30 -08:00 |
|
Philip Rosedale
|
0c32f94116
|
Better drums
|
2013-12-04 15:48:41 -08:00 |
|
ZappoMan
|
2b27c91550
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_server
Conflicts:
interface/src/VoxelSystem.cpp
interface/src/VoxelSystem.h
|
2013-12-04 11:40:54 -08:00 |
|
Andrzej Kapolka
|
70ca1106b1
|
Working on testing the Leap/Hydra hands against the avatar body.
|
2013-12-03 17:28:36 -08:00 |
|
Philip Rosedale
|
b04d48a7b8
|
Longer drum sticks
|
2013-12-03 17:19:00 -08:00 |
|
Philip Rosedale
|
423b2e8e0f
|
Highlight voxel being touched
|
2013-12-03 16:52:38 -08:00 |
|
Philip Rosedale
|
8fdd78dc26
|
Added drum sounds and voxel collision detection
|
2013-12-03 16:25:23 -08:00 |
|
Philip Rosedale
|
a84e97c54a
|
Removed obsolete HandControl class, files
|
2013-12-03 08:29:17 -08:00 |
|
Philip Rosedale
|
7ab9cc9c14
|
Voxel editing with hands, flying and rotation with hands
|
2013-12-02 00:17:06 -08:00 |
|
Philip Rosedale
|
2456c26207
|
changed function name so less confusing
|
2013-12-01 20:46:42 -08:00 |
|
Philip Rosedale
|
ea850368de
|
First working voxel insertion at fingertip
|
2013-12-01 20:16:14 -08:00 |
|
Philip Rosedale
|
a9139b05e8
|
Drive with trigger pointing
|
2013-11-29 20:46:16 -08:00 |
|
Philip Rosedale
|
65ec91ec13
|
Add hand thrusters
|
2013-11-29 17:49:35 -08:00 |
|
Philip Rosedale
|
abca79ea3e
|
Add button detection for hydra controller to palmData
|
2013-11-29 16:20:43 -08:00 |
|
Andrzej Kapolka
|
3137e9a3e6
|
Don't leave out the head when we draw our shadow.
|
2013-11-21 13:57:55 -08:00 |
|
Andrzej Kapolka
|
1f2fe5ddee
|
Rudimentary Sixense (Razer Hydra) support.
|
2013-11-15 18:06:32 -08:00 |
|
Andrzej Kapolka
|
52a3071cb3
|
Order of update fix.
|
2013-11-13 12:29:43 -08:00 |
|