Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 12:56:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41492 commits 71 branches 56 tags 1.2 GiB
Commit graph

308 commits

Author SHA1 Message Date
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -08:00
Anthony J. Thibault
076b0b42d7 HandControllerGrab: fixes for distance holding 
Because controller poses are in avatar space, there is no need
to apply delta avatar position changes and rotation changes.
 2016-03-04 20:36:32 -08:00
Seth Alves
5bf8670bc2 fix SpatiallyNestable::getChildren 2016-02-28 12:16:41 -08:00
Seth Alves
5594f1e4e5 if equipped entity vanishes, reset grab state 2016-02-26 10:27:34 -08:00
Seth Alves
6c9cf386a6 when trigger is squeezed, check for things stuck to hand and unhook them 2016-02-26 10:14:09 -08:00
Seth Alves
6dafc654eb only update heartbeat in userData of grabbed entity every 5 seconds 2016-02-25 13:19:56 -08:00
Seth Alves
7fb67e487e when releasing a near-grab, zero velocity if there is another grab, regardless of the isInitialGrab flag 2016-02-23 16:47:05 -08:00
Seth Alves
efca6ecb1d remove debug print 2016-02-23 16:37:08 -08:00
Seth Alves
acd2caf26c handle case where user grab data didn't have a heartbeat 2016-02-23 16:35:20 -08:00
Seth Alves
0e028fbac8 keep a heart-beat timestamp in userData of grabbed entities. if grabbing something with an out-of-date heartbeat, reset it before grabbing 2016-02-23 16:21:41 -08:00
Seth Alves
23b204c0c6 fix logic that checks getEntityProperties return value 2016-02-22 19:03:12 -08:00
Seth Alves
f113a83c5b merge from upstream 2016-02-22 14:02:38 -08:00
Seth Alves
c470649076 don't crash if entity vanishes while doing touch test 2016-02-22 14:00:01 -08:00
Seth Alves
8a3b233659 don't crash if entity vanishes while doing touch test 2016-02-22 13:58:07 -08:00
Chris Collins
f24e4bc6b1 Merge pull request #7152 from sethalves/fix-touch 
fix grab-script touch
 2016-02-22 09:58:29 -08:00
Seth Alves
5f79500e4d fix grab-script touch 2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
Seth Alves
ca5525cc3f if an entity already was near-picked, don't do a distance-to-center check on it. 2016-02-12 06:58:14 -08:00
Seth Alves
ecf22cd8b8 update toybox toys to use changed grab entityMethod calls 2016-02-10 18:22:20 -08:00
Seth Alves
8e16bda7bb start to clean up grab generated signals 2016-02-10 16:40:50 -08:00
Seth Alves
c2cbca88cb allow grabbing with one hand and then equipping with other 2016-02-09 16:54:32 -08:00
Seth Alves
d567020283 trying to zero velocity during an equiped adjustment 2016-02-05 15:01:46 -08:00
Seth Alves
07c70a1ba2 refix double action grabs 2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37 try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it. 2016-02-05 13:53:45 -08:00
Seth Alves
ae6a5aa286 add some debugging to handControllerGrab 2016-02-04 18:10:43 -08:00
Andrew Meadows
00f30201a7 Merge pull request #7003 from sethalves/save-held-adjustments 
automatically save adjustments to offsets of equipped items
 2016-02-03 12:21:17 -08:00
Seth Alves
ad2a7bfc3c code review 2016-02-03 10:54:08 -08:00
Seth Alves
2501be16cb base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere 2016-02-01 18:11:27 -08:00
Seth Alves
3209ac4f68 use controller hand rotation rather than IK hand rotation in grab script 2016-02-01 15:42:32 -08:00
Seth Alves
e4ef3ae869 automatically save adjustments to offset of equipped items 2016-02-01 15:06:53 -08:00
Seth Alves
2207588c01 merge from upstream 2016-02-01 13:19:45 -08:00
Seth Alves
bc86298097 merge from upstream 2016-02-01 07:01:12 -08:00
James B. Pollack
7767dfb213 remove high freq messages 2016-01-30 19:59:56 -08:00
Seth Alves
6697b5ae5f get multi-near-grabs working again 2016-01-29 18:36:22 -08:00
Seth Alves
9a16bc7d22 when a parented equip or grab releases and the object should fall, give it a little velocity so bullet doesn't consider it static 2016-01-29 18:01:57 -08:00
Seth Alves
0c5c682887 unmuddle saved state in Settings and userData 2016-01-29 17:38:24 -08:00
Seth Alves
464f74fc1b don't attempt to distance-grab non-physical objects 2016-01-29 16:37:19 -08:00
Seth Alves
9ca89172f6 change grab script to equip with parenting rather than action. various other changes to messaging. added initial version of attachedEntitiesManager.js. updated toybox scripts to track messaging changes 2016-01-29 15:17:46 -08:00
Philip Rosedale
9f95a9de89 Limits on distance and mass for far grabbing 2016-01-29 00:52:59 -08:00
Seth Alves
3b7f8ef77d honor hardcoded equip offsets 2016-01-26 15:44:26 -08:00
Seth Alves
11d2f9a8fc equip via parenting rather than action. change name of a messaging channel. minor cleanups. 2016-01-26 14:02:21 -08:00
Seth Alves
41a2173901 adjust grab script so that avatars can't bootstrap themselves during an object hand-off 2016-01-22 16:38:28 -08:00
Chris Collins
5dc1eb986e Merge pull request #6874 from imgntn/fixgrabparticlesystems 
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
 2016-01-21 09:25:11 -08:00
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask 
use "collidesWith" instead of "collisionMask"
 2016-01-21 09:13:34 -08:00
James B. Pollack
c2b5dfdfe6 clear sphere 2016-01-20 16:09:37 -08:00