Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 07:05:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41659 commits 71 branches 56 tags 1.2 GiB
Commit graph

548 commits

Author SHA1 Message Date
Seth Alves
f05f283b04 disable setting of angular velocity upon release of a parenting grab 2016-04-01 16:58:17 -07:00
Seth Alves
bfa2d8f405 set angular velocity on parenting-grab release 2016-04-01 15:11:01 -07:00
Seth Alves
eb22b5e4a7 velocity is now set when a parenting grab ends, though not angular velocity 2016-04-01 14:50:42 -07:00
Seth Alves
7c8050790b set velocity when something is un-parent-grabbed 2016-04-01 14:20:36 -07:00
Seth Alves
e8d58483aa fix typo 2016-03-31 16:37:08 -07:00
Seth Alves
0e643a1555 debugging prints 2016-03-31 16:26:54 -07:00
Seth Alves
a8b4d1a379 ray follows controller 2016-03-31 13:46:00 -07:00
Seth Alves
a89735cb76 integrate Philip's changes to distance grabbing 2016-03-31 13:29:31 -07:00
Seth Alves
40f30b9141 get rid of distance equip 2016-03-30 17:25:53 -07:00
Seth Alves
2b73b2c6d8 debugging 2016-03-15 13:50:23 -07:00
Seth Alves
9df8c4e969 add velocity argument to release 2016-03-15 09:00:01 -07:00
Seth Alves
8b5b6f5a20 added HOLD state which uses presets but isn't persistent when button is released 2016-03-14 16:39:09 -07:00
Seth Alves
7e5a1e73e5 equip/de-equip with thumb button rather than bumper. trigger and bumper do the same thing 2016-03-14 15:25:59 -07:00
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -08:00
Anthony J. Thibault
e1a3c5b618 Fix for vertical pitch offset. 
Also, added hysteresis to the controller selection, to prevent flapping back and forth between controllers when they are at rest.
 2016-03-09 10:31:58 -08:00
Anthony J. Thibault
f82dc4569e handControllerMouse.js: removed non-uniform scaling. 
If your controller moves in a circle, the mouse pointer should as well.
 2016-03-08 15:59:17 -08:00
Anthony J. Thibault
ce5d83d551 handConttollerMouse.js: improved comments 2016-03-08 15:32:12 -08:00
Anthony J. Thibault
27fb7a3143 handControllerMouse: improve determination of which controller is moving the most 
That controller will have exclusive control of the mouse reticle.
 2016-03-08 15:14:37 -08:00
Anthony J. Thibault
26b4c904f3 handControllerMouse.js: transform hand controllers into sensor frame 2016-03-07 18:42:52 -08:00
James B. Pollack
247ebb380b Merge pull request #7253 from hyperlogic/tony/distance-holding-fixes 
HandControllerGrab: fixes for distance holding
 2016-03-07 12:12:58 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -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
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00
PhilipRosedale
b89b6be210 look for hydra first 2016-02-29 16:45:00 -08:00
PhilipRosedale
0e17506137 hand controller doesn't take mouse if set down, renamed file. 2016-02-29 16:21:06 -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
Brad Hefta-Gaub
25634ea0ca Merge pull request #7204 from PhilipRosedale/betterLeap 
Leap Motion can near grab entities
 2016-02-25 17:48:56 -08:00
PhilipRosedale
4845de68dd fixed typo 2016-02-25 17:29:53 -08:00
PhilipRosedale
0cc1c930c5 mapped finger curl to trigger value 2016-02-25 17:04:46 -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
d1e1067e5a allow hydra mouse to know the correct size of screen to target 2016-02-18 22:30:31 -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