Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-09 09:40:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45794 commits 25 branches 0 tags 1.1 GiB
Commit graph

263 commits

Author SHA1 Message Date
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c Added EntityItem::wantsHandControllerPointerEvents method 2016-08-16 16:23:45 -07:00
Anthony J. Thibault
a595a72d0a handControllerGrab now calls Entities.sendHoverLeaveEntity() 2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
Seth Alves
c85e8d0580 don't show equip sphere until hand is in position to equip. widen unequip/drop cone 2016-08-16 11:18:12 -07:00
Anthony J. Thibault
1ddbd7022a Moved keyboardFocus, mouse/touch event methods from Reticle to Entities 2016-08-11 11:52:04 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
SamGondelman
2360e90d39 simplify valid check for rotation 2016-08-09 15:48:31 -07:00
SamGondelman
956078bc91 teleport works with xbox controller 2016-08-09 15:17:36 -07:00
Brad Hefta-Gaub
b903c974bc Merge pull request #8371 from imgntn/teleport_cancel 
Cancel mode for teleporting
 2016-08-08 13:04:27 -07:00
James B. Pollack
58ccc9581a cleanup 2016-08-08 12:20:48 -07:00
Seth Alves
090a0a6e9a only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip 2016-08-05 18:01:48 -07:00
Seth Alves
e59c010642 speling 2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7 adjust code that auto-unequips items when they are pulled too far from the equipping hand 2016-08-05 15:28:37 -07:00
Anthony J. Thibault
0ba34c5635 Remove input restrictions on grabbable web entities. 
You no longer have to be grabbing a grabbable web entity to interact with it.
 2016-08-05 15:25:54 -07:00
Anthony J. Thibault
1dd276c1a5 Improved support for button rollover and hover 
Send a combination of mouse and touch events to the web browser entity.

* MouseMove events for when the trigger is not depressed.  This will trigger mouse over and hover events within the browser
* Touch Begin, End, Update events when the trigger is squeezed.  This will give us the iPad like scrolling behavior.
 2016-08-05 11:32:50 -07:00
Anthony J. Thibault
90a06f0d40 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-05 11:05:10 -07:00
James B. Pollack
80da690680 incease distance a bit 2016-08-05 00:04:30 -07:00
James B. Pollack
7d37f86337 different swapping method 2016-08-04 23:45:43 -07:00
James B. Pollack
80b6ca2b86 single call to istooclose 2016-08-04 16:47:10 -07:00
James B. Pollack
fb8263a882 cleanup 2016-08-04 16:35:50 -07:00
James B. Pollack
63aa0f8c3f remove weird n 2016-08-04 16:18:13 -07:00
James B. Pollack
f93ed56124 cleaner code 2016-08-04 16:17:21 -07:00
James B. Pollack
c0cfee371e cancel mode for teleporting 2016-08-04 16:08:51 -07:00
Chris Collins
be87f294d8 Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message 
fix remote triggering handControllerGrab
 2016-08-04 11:55:48 -07:00
James B. Pollack
5ad5899140 revert pointer changes 2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056 cleanup dead code 2016-08-02 21:26:04 -07:00
James B. Pollack
9d56c697e7 no delay! 2016-08-02 19:02:20 -07:00
James B. Pollack
364eb992fb no teleport while moving 2016-08-02 18:53:36 -07:00
James B. Pollack
88ebeaa4cb start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck 2016-08-02 18:46:47 -07:00
Thijs Wenker
3a2b0ffa08 Fixes the handControllerGrab Hifi-Hand-Grab message. Was broken since the hotspot changes to handControllerGrab.js. 2016-08-03 00:47:28 +02:00
James B. Pollack
8541d4bd41 small change to protect 2016-08-02 15:41:28 -07:00
James B. Pollack
d00c1f62fc fixes 2016-08-02 15:40:19 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
James B. Pollack
f6984aaff8 clear timeout one more place 2016-08-02 14:42:21 -07:00
James B. Pollack
41aa485f11 one hand teleprt 2016-08-02 12:52:35 -07:00
James B. Pollack
7fae7e9c77 cleanup 2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1 Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df updates 2016-08-02 12:25:24 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Eric Levin
5167809342 release near and far grab at trigger click detent 2016-07-28 08:51:11 -07:00
Eric Levin
f37570dc9a only pulse on release when held 2016-07-28 08:23:45 -07:00
Eric Levin
0f7f9990c2 Tuned haptic pulses for grab, release, equip, de-quip 2016-07-27 17:58:24 -07:00
James B. Pollack
6a72fe7df4 cleanup 2016-07-25 16:58:59 -07:00
James B. Pollack
5ed1e602e6 Merge pull request #8316 from AlexanderOtavka/fix-script-end-errors 
Fix script end errors
 2016-07-25 16:50:05 -07:00
James B. Pollack
05e3a8613a colors back to blue and red 2016-07-25 16:28:47 -07:00
James B. Pollack
9240672c9d change distance hold origin 2016-07-25 13:06:09 -07:00
Brad Hefta-Gaub
1802f8e7a2 Merge pull request #8298 from imgntn/lazzzers 
Update hand controller laser colors
 2016-07-23 13:50:38 -07:00