Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 09:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44217 commits 76 branches 59 tags 1.2 GiB
Commit graph

73 commits

Author SHA1 Message Date
Anthony J. Thibault
408f65100b Bug fix for dropping near-grabbed entities via thump press. 2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884 Change raw for loop to Array.prototype.forEach instead 2016-06-20 13:26:41 -07:00
Anthony J. Thibault
359483d9ba coding standard fix 2016-06-20 11:43:42 -07:00
Anthony J. Thibault
a14bbe4e68 Remove /* style multi-line comments 2016-06-20 11:40:59 -07:00
Anthony J. Thibault
35276c3893 Use Array.prototype.filter instead of my hand rolled filter function 2016-06-20 11:30:40 -07:00
Anthony J. Thibault
7ccbc9e6eb Primary thumb press can be used to drop an equipped object 2016-06-20 11:22:56 -07:00
Anthony J. Thibault
14efd5dc12 Disable WANT_DEBUG_STATE 2016-06-20 10:44:09 -07:00
Anthony J. Thibault
1759132377 Use trigger to both grab and equip objects 
* Removed entry into HOLD state via secondary aka grip buttons.
* Changed equip logic to prioritize equip over near over far grabs.
* Added drop gesture, upside down controller + slight shake + trigger press
* Bug fix for near grab snapping to an incorrect offset after a far grab (this bug is present in master)
 2016-06-20 10:39:07 -07:00
howard-stearns
74a3db4e1c When setting Reticle.depth, don't assume that we're in the center of the 
HUD.
 2016-06-17 11:14:56 -07:00
Howard Stearns
faa2624ca7 Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays 
Continue grabbing through overlays
 2016-06-15 16:07:01 -07:00
Howard Stearns
0915d1287f Merge pull request #8079 from howard-stearns/no-laser-without-trigger 
No laser without trigger
 2016-06-15 16:06:56 -07:00
howard-stearns
6f671b7cde see comment. 2016-06-15 15:17:34 -07:00
howard-stearns
1e3b20b66d Explicit check enumerated states instead of relying on order, per 
feedback.
 2016-06-15 15:06:36 -07:00
howard-stearns
2c7642a367 Do not make ReticleClick when we enter an overlay with the trigger 
pressed.
 2016-06-15 12:28:42 -07:00
howard-stearns
6366ca7508 Go red for full trigger. 2016-06-15 11:08:59 -07:00
Howard Stearns
b9754c8564 continue grabbing through overlays 2016-06-14 20:17:52 -07:00
Howard Stearns
ae65790bf3 no laser (or mouse cursor) from hand controllers unless trigger squeezed 2016-06-14 18:07:08 -07:00
Anthony J. Thibault
071584597d Merge branch 'vive-ui' into feature/grab-script-preliminaries 2016-06-14 15:33:38 -07:00
Anthony J. Thibault
67aac09033 Set state debug flag to false 2016-06-14 14:59:29 -07:00
howard-stearns
5759c2d29d final 2016-06-14 11:28:44 -07:00
Anthony J. Thibault
cb51d00c1d Removed CONTINUE_FAR_TRIGGER and CONTINUE_NEAR_TRIGGER 2016-06-13 19:08:33 -07:00
Anthony J. Thibault
28b6cc2777 handControllerGrab.js is now eslint clean. 2016-06-13 18:54:21 -07:00
howard-stearns
dfd03d5e61 Prepare for working laser. But at this point, we still show the laser AND 
the Reticle.
 2016-06-13 17:15:51 -07:00
howard-stearns
526fc7d062 Make handControllerGrab independent of whether we're using laser or 
Reticle.
 2016-06-13 17:13:10 -07:00
howard-stearns
0366c891cc Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer 2016-06-13 17:06:43 -07:00
Anthony J. Thibault
b01eb0439d removed sticky thumb equip states. 
* removed STATE_WAITING_FOR_EQUIP_THUMB_RELEASE and waitingForEquipThumbRelease
* removed STATE_EQUIP
* removed STATE_WAITING_FOR_RELEASE_THUMB_RELEASE and waitingForReleaseThumbRelease
* removed 'Hifi-Object-Manipulation' 'loaded' support and checkNewlyLoaded method.
 2016-06-13 16:49:38 -07:00
Anthony J. Thibault
fe65df350b Combined the release and off states. 2016-06-13 15:05:34 -07:00
Anthony J. Thibault
bd3326d2fc Collapse continueNearGrabbing and nearGrabbing into a single state. 
* Moved the update logic from STATE_NEAR_GRABBING, STATE_HOLD & STATE_EQUIP into the entryMethods
  for those states.
* Removed STATE_CONTINUE_NEAR_GRABBING, STATE_CONTINUE_HOLD & STATE_CONTINUE_EQUIP states
  This functionality has been moved into the updateMethod for their respective states.

This *should* be a pure re-factor no functionality was changed.
 2016-06-13 14:40:30 -07:00
Anthony J. Thibault
6d2181f0f1 Combine DISTANCE_HOLDING and CONTINUE_DISTANCE_HOLDING states. 2016-06-13 14:40:30 -07:00
Howard Stearns
b0f6b59207 Merge pull request #8040 from hyperlogic/bug-fix/equip-hotspot-render 
Only render equip-hotspots for objects with attach points.
 2016-06-13 11:29:39 -07:00
Howard Stearns
357ccc17aa Merge pull request #8030 from howard-stearns/fix-paused-interactions-with-mouse 
fix paused interactions with mouse
 2016-06-13 11:28:47 -07:00
howard-stearns
4344a35c60 Use the new system pointer functionality. 2016-06-10 16:00:16 -07:00
howard-stearns
542cfb2e11 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-10 13:02:49 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Anthony J. Thibault
42068cf2dd Only render equip-hotspots for objects with attach points. 2016-06-08 15:01:53 -07:00
howard-stearns
3138c4041b Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-08 11:54:00 -07:00
howard-stearns
74c5ddd49f fix paused interactions with mouse 2016-06-07 09:50:10 -07:00
Anthony J. Thibault
b836a580ff Updated some debug print information 2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d Change equip-hotspot to a green sphere. 2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d handControllerGrab: initial rendering of equip hot-spots 
* When trigger is depressed, any entities that are marked with a wearable equip-point
  will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
  this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
  functionality is used to draw and delete the hot spots when entering
  and exiting the searching state.
 2016-06-06 14:40:57 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub
eeb08fb401 Merge pull request #8014 from imgntn/leaphands 
add leap hands to /system
 2016-06-04 16:43:30 -07:00
SamGondelman
4fb8eac8ea much better way of fixing script 2016-06-03 18:12:47 -07:00
James B. Pollack
da023bfbe3 leap 2016-06-03 15:40:04 -07:00
SamGondelman
2367cb1995 fixing input mapping for vive/touch grip button/trigger, script needs fixing 2016-06-03 15:07:21 -07:00
howard-stearns
3e919cb7ac cleanup 2016-06-03 10:42:02 -07:00
howard-stearns
6d3fd4f208 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into click-on-trigger 2016-06-01 14:17:27 -07:00
howard-stearns
84fa4402fd Click on full trigger, activate on partial trigger. 2016-06-01 14:03:49 -07:00
howard-stearns
9ad19a2eaf Draw grab balls in front of entities (not just the lines as before). 
Don't intersect with grab balls (not just lasers as before).
Don't run grab lasers through (2d or 3d) overlays.
Don't try to manage reticle in handControllerGrab because other scripts
do.
 2016-05-31 14:57:31 -07:00