Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 03:21:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8038 commits 25 branches 0 tags 1.1 GiB
Commit graph

133 commits

Author SHA1 Message Date
Philip Rosedale
b6ac73bb57 merge 2013-12-19 23:12:11 -08:00
Philip Rosedale
f4a28850cf Merge remote-tracking branch 'upstream/master' 2013-12-19 23:05:37 -08:00
Stephen Birarda
a01a17c30a hook throw and catch sounds to Hand class ball tests 2013-12-19 17:24:30 -08:00
Philip Rosedale
9f7e79e3c1 bigger catch radius, tweak sounds, different new ball button 2013-12-19 14:59:15 -08:00
Philip Rosedale
c0f3ec5b6a merge fix 2013-12-19 10:55:00 -08:00
Philip Rosedale
c287e37691 Reverted key mapping change since Andrzej fixed the underlying problem. 2013-12-19 10:02:43 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
Philip Rosedale
09e5b8ea4a slaps sound only on impact with velocity 2013-12-18 20:55:27 -08:00
Philip Rosedale
13be1ea825 added catch, throw, new ball sounds. Tuned ball speed for handball. 2013-12-17 22:08:52 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -08:00
Philip Rosedale
ae1cc99f3d throwing from fingertips, less gravity, lighter target rendering 2013-12-17 12:48:59 -08:00
Philip Rosedale
35e7cfddba Made drumming and slaps into menu choices from ‘Hand Options’ 2013-12-17 11:20:26 -08:00
Philip Rosedale
d6efcce28e Debugging render call for head/hand positions, debugging for ball injection 2013-12-17 11:08:38 -08:00
Philip Rosedale
fc28034f37 hydra hands hard coded to LH and RH controllers, ball debugging 2013-12-17 09:41:13 -08:00
Philip Rosedale
d4bad3421f fix: get velocity from either hand or fingertip according to where ball is thrown from 2013-12-16 21:49:15 -08:00
Philip Rosedale
14d198f930 Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 21:20:05 -08:00
ZappoMan
e969331f5c implement catching of particles 2013-12-16 20:29:28 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Philip Rosedale
be27f36a7e Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 17:37:22 -08:00
Philip Rosedale
6ab4839c3b it’s the other guys palms you want 2013-12-16 17:14:19 -08:00
Philip Rosedale
0d76b370df only check palms if active 2013-12-16 17:01:46 -08:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
ZappoMan
f8830ed9b1 cleaned up hand target code a bit 2013-12-16 12:04:16 -08:00
Philip Rosedale
893a3900d9 added palm collision sounds 2013-12-15 20:55:51 -08:00
Philip Rosedale
ce986c367e palms detect collision 2013-12-15 19:53:24 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -08:00
ZappoMan
02d3d384ca added basic support for hit particles with the palm of the hand 2013-12-13 19:02:45 -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