Commit graph

44226 commits

Author SHA1 Message Date
Anthony J. Thibault
fc42a3aef5 Grab script hotspot work
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
2016-06-23 15:36:47 -07:00
Anthony J. Thibault
2a82dddc2b Draw attach points as if they were equip-hotspots 2016-06-21 17:36:36 -07:00
Howard Stearns
4f71f621f7 Merge pull request #8102 from hyperlogic/feature/remove-grip-button
Use trigger to both grab and equip objects
2016-06-21 13:09:11 -07:00
Anthony J. Thibault
972c292857 Fix for equip-hotspot being visible for whiteboard markers 2016-06-21 11:59:11 -07:00
Brad Davis
cf57e71f1a Merge pull request #8112 from howard-stearns/do-not-tilt-keyboard
do not tilt virtual keyboard
2016-06-21 11:33:53 -07:00
howard-stearns
2ac6dc8798 do not tilt virtual keyboard 2016-06-21 09:48:01 -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
Anthony J. Thibault
8817bbea09 reduce log spam 2016-06-20 15:53:33 -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
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
Howard Stearns
e104429fa1 Merge pull request #8096 from hyperlogic/bug-fix/reticle-focus
Change rendering of reticle when in HMD mode
2016-06-17 13:25:26 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Anthony J. Thibault
e04d86a75a Change rendering of reticle when in HMD mode
Properly take the overlay model matrix into account.
Reticle depth is now relative to the eye, not relative to the overlay sphere.
2016-06-17 12:10:26 -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
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks
Initial Steamworks integration
2016-06-16 18:49:51 -07:00
Brad Hefta-Gaub
3b132e7376 Merge pull request #8076 from ZappoMan/reduceLogSpam
don't log spam on empty URL
2016-06-16 18:25:54 -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
Brad Hefta-Gaub
7d0cd38c8e Merge pull request #8075 from ctrlaltdavid/20970
fix reporting of JSON export failure
2016-06-16 18:24:48 -07:00
Brad Hefta-Gaub
fd163ecc20 Merge pull request #8089 from ctrlaltdavid/20973
make audio device selection available without advanced menus enabled
2016-06-16 18:24:36 -07:00
David Rowe
77976281ab Make audio device selection available without advanced menus enabled 2016-06-17 09:58:44 +12:00
Brad Hefta-Gaub
d7cd82a24e Merge pull request #8085 from ZappoMan/fixShaders
fix v1 procedural shaders
2016-06-16 13:06:15 -07:00
James B. Pollack
96d6cb12ac supress some messages and errors 2016-06-16 12:27:03 -07:00
Howard Stearns
4f6d65a961 Merge pull request #8082 from jherico/explicit_overlay_alpha
Hand Controller UI Tweaks
2016-06-16 10:35:51 -07:00
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
Bradley Austin Davis
067539ff6d Fix overlay stuck to face 2016-06-15 17:44:58 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -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
357b9353dc Merge pull request #8074 from jherico/lasers
Vive hand controller updates
2016-06-15 16:06:49 -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
Bradley Austin Davis
87dc6649ce Better track keyboard open state, fix text replacement 2016-06-15 15:16:29 -07:00
howard-stearns
1e3b20b66d Explicit check enumerated states instead of relying on order, per
feedback.
2016-06-15 15:06:36 -07:00
David Rowe
775656eb1d Delete comment 2016-06-16 08:48:30 +12: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
Bradley Austin Davis
bc838ac0b4 Fix vive json 2016-06-15 11:41:28 -07:00
howard-stearns
6366ca7508 Go red for full trigger. 2016-06-15 11:08:59 -07:00
Bradley Austin Davis
60035486d3 Build fix 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00