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

245 commits

Author SHA1 Message Date
Howard Stearns
7e88772e85 Merge pull request #8106 from howard-stearns/triggering-change 
triggering change
 2016-06-21 13:51:12 -07:00
Howard Stearns
cd09c61f31 Merge pull request #8108 from jherico/vive-toolbars 
Additional toolbar work
 2016-06-21 13:26:09 -07:00
Anthony J. Thibault
972c292857 Fix for equip-hotspot being visible for whiteboard markers 2016-06-21 11:59:11 -07:00
Anthony J. Thibault
2ed88bca6d Bug fix for bow and arrow. 
* before this change the releaseEquip message was not getting sent to the bow,
  which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
 2016-06-20 17:24:36 -07:00
howard-stearns
bfb697bc77 No hysteresis. 2016-06-20 17:04:23 -07:00
Anthony J. Thibault
8817bbea09 reduce log spam 2016-06-20 15:53:33 -07:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Anthony J. Thibault
e5159ad213 Added "Developer > Hands > Drop Without Shake" menu option 2016-06-20 14:50:15 -07:00
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
howard-stearns
cd1780efef brush clearing 2016-06-20 13:21:06 -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
4aa5e87a26 Merge pull request #8093 from jherico/vive-toolbars 
Support toolbar API
 2016-06-17 13:43:16 -07:00
Howard Stearns
aeebe8b3fb Merge pull request #8094 from howard-stearns/fix-depth-request 
fix depth request
 2016-06-17 13:26:07 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -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
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
99a0804429 Merge pull request #8086 from imgntn/activeElement 
Fix some edit.js errors and log messages
 2016-06-16 18:25:20 -07:00
David Rowe
77976281ab Make audio device selection available without advanced menus enabled 2016-06-17 09:58:44 +12:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -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
980eafb972 Merge pull request #8065 from hyperlogic/feature/grab-script-preliminaries 
grab script preliminaries
 2016-06-15 16:06:06 -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
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -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
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957 
fix model export continued
 2016-06-14 10:57:25 -07:00
howard-stearns
35fac3ca56 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer2 2016-06-14 10:47:23 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -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