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

742 commits

Author SHA1 Message Date
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
Ryan Huffman
adbd9ff854 Add constants for progress bar offset 2016-08-02 16:34:57 -07:00
Ryan Huffman
1f2e34d59b Remove 3d overlay from progress.js 2016-08-02 16:29:40 -07:00
Ryan Huffman
79a243b171 Clean up progress.js 2016-08-02 16:19:38 -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
Howard Stearns
c2d1f08551 Merge pull request #8342 from highfidelity/dk/snapshot 
Snapshot button
 2016-08-02 15:31:50 -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
Stephen Birarda
6196f5e86f switch back to SVGs, remove triggered for controller pose 2016-08-02 14:35:51 -07:00
Stephen Birarda
fa9199c419 use float for clicked value in mod.js 2016-08-02 14:35:51 -07:00
Stephen Birarda
f02f619597 use boolean from RTClick and LTClick 2016-08-02 14:35:51 -07:00
Stephen Birarda
6d38301a3a rename ignore script to mod.js 2016-08-02 14:35:51 -07:00
Stephen Birarda
6051fcd8f9 use click instead of trigger, change targets to PNG 2016-08-02 14:35:51 -07:00
Stephen Birarda
7d9937e412 handle overlay change if permissions change 2016-08-02 14:35:51 -07:00
Stephen Birarda
a15aef34df modify ignore script to handle kicking 2016-08-02 14:35:51 -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
David Kelly
1d7cdff2bc Snapshot button plus script 
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
 2016-08-01 18:21:01 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Ryan Huffman
5d50389e29 Make updates to the hmd progress bar 2016-07-29 17:17:59 -07:00
Ryan Huffman
9f6da23b15 Update progress bar images 2016-07-29 10:11:28 -07:00
Ryan Huffman
6279b96223 Add minor tweaks to progress.js 2016-07-29 10:11:12 -07:00
Ryan Huffman
91f847a7f0 Update progress bar image 2016-07-28 17:24:35 -07:00
Ryan Huffman
58932a6806 Add reset of progress bar when domain changes 2016-07-28 17:13:05 -07:00
Ryan Huffman
a786224297 Add easing back to progress.js 2016-07-28 16:55:45 -07:00
Ryan Huffman
873e7b63df Update progress-bar.svg 2016-07-28 16:26:12 -07:00
Ryan Huffman
c1b86fe3d2 Update progress.js to only track total number of downloads 2016-07-28 16:16:11 -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
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
James B. Pollack
d4ed347f5f Merge pull request #8293 from AlexanderOtavka/fix-market-title 
Fix marketplace title
 2016-07-22 16:55:41 -07:00
James B. Pollack
c04a41c3cb fix invisible characters from slack copying 2016-07-22 16:51:42 -07:00
Chris Collins
e755528cf2 Merge pull request #8278 from sethalves/fix-equip-fly-away 
fix equip fly-away
 2016-07-22 16:47:31 -07:00
Zander Otavka
2cd97bfe78 Fix squeezeHands.js error on script end 2016-07-22 15:55:42 -07:00
Zander Otavka
cc7e723e07 Remove extra debug print 2016-07-22 15:23:39 -07:00
James B. Pollack
3607a34f55 tweak telecolors 2016-07-22 13:25:33 -07:00
James B. Pollack
e81f65d992 colors 2016-07-22 10:54:57 -07:00
James B. Pollack
54109c6c6f remove all the old visualization methods 2016-07-22 09:39:38 -07:00
James B. Pollack
1d3dc7b195 remove particle beam and lights 2016-07-22 09:19:13 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor 
Vive HMD fixes to prevent user from becoming embedded in the floor.
 2016-07-22 09:04:40 -07:00
Zander Otavka
8976f18290 Change 3.14 literal to Math.PI 2016-07-21 18:36:58 -07:00
Zander Otavka
30c5f277a0 Finish renaming functions 2016-07-21 15:52:19 -07:00
Zander Otavka
72978c5d96 Rename examples -> marketplace 
Includes the title of the marketplace web window.
 2016-07-21 15:44:42 -07:00
Thijs Wenker
be0ccad0d3 Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:26 +02:00
Thijs Wenker
b3b1bf7884 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:02 +02:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
Thijs Wenker
2adff24a05 silly workaround- workaround 2016-07-19 21:34:42 +02:00
Seth Alves
be001a652f when doing a parenting grab, zero velocity 2016-07-19 11:50:53 -07:00
Brad Hefta-Gaub
866ba2f185 Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom 
far-grabbed objects no longer fly away when the avatar body shifts
 2016-07-19 10:40:48 -07:00
Anthony J. Thibault
212175bdaa bug fix for far-grab pulling the object in the wrong direction 2016-07-19 10:23:00 -07:00
Brad Davis
d98ae1ba9c Ensure the pause overlay is unlit (emissive) 2016-07-19 07:10:34 -07:00
Ryan Downe Karpf
6e71e369a4 Merge pull request #8261 from hyperlogic/feature/grab-script-improvements-iii 
grab script improvements
 2016-07-18 16:46:38 -07:00
Thijs Wenker
11b461a730 Fixes duplicate target overlays for teleporter, make sure to delete overlay before creating one 2016-07-19 01:46:29 +02:00
Anthony J. Thibault
69500643f3 bugfix for saving attach points 
The feature to add transition from equip -> near-grab, in inadvertently broke attach point saving.
 2016-07-18 14:17:32 -07:00
Anthony J. Thibault
659e1ff984 remove debug prints 2016-07-18 14:17:06 -07:00
Zander Otavka
d75c2e2a6f Merge branch 'master' into edit-model-ui 2016-07-18 13:11:51 -07:00
Anthony J. Thibault
959a2f9915 far-grabbed objects no longer fly away when the avatar body shifts 
Before this fix, a hand vector was being tracked that was the difference between the avatar's hand in avatar space with the avatar's hand
in avatar space the previous frame.  This hand vector was used to move the grabbed object position.  However, when the body shifts, objects
in the avatar's space will change rapidly, this would cause this hand vector to be incorrect and cause the object to shoot off in the distance.

Now, we track this hand delta in sensor a.k.a. room space.  This is immune to the shifts caused by body shifting.
 2016-07-18 13:10:16 -07:00
Zander Otavka
492f7e0c29 Add gravity to dynamic model entities 2016-07-18 12:43:14 -07:00
Zander Otavka
06985f9278 Make combo box go by index, add default values 2016-07-18 12:06:11 -07:00
Anthony J. Thibault
5a01bf406e remove obsolete handControllerMouse.js to avoid confusion 2016-07-18 11:29:41 -07:00
Anthony Thibault
c7c8046231 De-equip goes into a near grab instead of dropping the object. 2016-07-16 14:58:21 -07:00
Anthony Thibault
4b2fb546eb Re-enable storing of attach points in user settings 
* bug fix, use localOffset property of grabbed entity, which is dynamically updated as
  the near grab action moves the entity.
 2016-07-16 12:21:08 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Brad Davis
cf1c954edc Merge pull request #8257 from jherico/toolbar_hover 
Fix hover states for toolbar buttons
 2016-07-15 18:02:58 -07:00
Philip Rosedale
4925980cbb Merge pull request #8255 from jherico/search_circle 
Make search line termination a circle, like 2D UI
 2016-07-15 17:51:50 -07:00
Brad Davis
1145c3b590 Smaller and hotter circle, per Philip 2016-07-15 17:45:16 -07:00
Zander Otavka
6c47db016f Remove some debug logging 2016-07-15 17:43:37 -07:00
Seth Alves
a0e6654ac6 Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux 
Grab Script Polish (part deux)
 2016-07-15 17:34:50 -07:00
Zander Otavka
6417bb1859 Require tripple equals over double, fix in edit.js 2016-07-15 17:33:47 -07:00
Zander Otavka
ded82294f9 Bring edit.js up to the coding standard 
There were some serious bad practices going on there, I fixed them.
There are still a few, but they are minimized.
 2016-07-15 17:31:41 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
Anthony Thibault
e4794450c2 Disable attach point saving 2016-07-15 15:36:20 -07:00
Brad Davis
0d811c489a Removing debug logging 2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387 Make search line termination a circle, like 2D UI 2016-07-15 13:51:14 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar 
Migrate edit.js toolbar to the new toolbar API
 2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller 
Menu & hand controller polish
 2016-07-15 12:36:31 -07:00
Brad Davis
d084623662 PR feedback 2016-07-15 12:15:23 -07:00
Brad Davis
cd6abadc41 Make sure buttons get removed when shutting down scripts 2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
1adf96c8df Move edit.js to new toolbar API 2016-07-14 17:40:03 -07:00
Anthony J. Thibault
37d60c6c85 eslint clean 2016-07-14 15:58:13 -07:00
Anthony J. Thibault
31f1d69c43 Merge branch 'master' into feature/grab-script-polish-part-deux 2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c Merge pull request #8217 from sethalves/fix-throwing 
fix throwing
 2016-07-14 15:52:41 -07:00
Anthony J. Thibault
6094fb3de3 Remember object attach point offsets in user settings 2016-07-14 15:51:05 -07:00
Brad Davis
8685b23610 When using the hand controller as a mouse, disable the navigation focus state in QML 2016-07-14 12:11:12 -07:00
Anthony J. Thibault
eb5107d9a5 highlight the grabbed hotspot when the drop gesture is detected 2016-07-14 12:07:07 -07:00
Anthony J. Thibault
e62d34136d Added haptics and hysteresis to drop gesture 2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3 removed shake to drop 2016-07-14 10:32:02 -07:00
Brad Davis
091e798267 Make hand pointer lasers 'click' on fully pressing and clicking the vive controller 2016-07-14 10:30:35 -07:00
Anthony J. Thibault
23ea85541c Animate equip hotspots scale instead of alpha 2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538 First pass at equip sphere animation 2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4 Support for model overrides for equip hotspots rendering 
Bug fix for modelScale on hotspots
 2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c Fix for double rendering of equip hotspots 2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975 Reduce calls to Entity.getEntityProperties(). 
By using a single EntityProprtiesCache instance instead of one per controller.
 2016-07-13 19:13:39 -07:00
Stephen Birarda
aa433e7233 handle click event on overlays only when in ignore mode 2016-07-13 16:23:40 -07:00
Stephen Birarda
946c7d4644 only handle trigger events when overlays are shown 2016-07-13 16:21:12 -07:00
Stephen Birarda
61975fe33a use correct function for peeked overlay 2016-07-13 15:47:52 -07:00
Stephen Birarda
9deb9744c6 handle trigger off in controller mapping 2016-07-13 15:34:20 -07:00
Stephen Birarda
cd1c114807 enable the trigger mapping so it's actually usable 2016-07-13 15:20:31 -07:00
Stephen Birarda
a6f39d5e68 add code from entitySelectionTool to handle hmd overlay pick 2016-07-13 15:06:31 -07:00
Stephen Birarda
5fc2afe549 switch to new icon for ignore target 2016-07-13 15:06:31 -07:00
Stephen Birarda
599d9c568a remove unneeded check from copy-paste 2016-07-13 15:06:31 -07:00
Stephen Birarda
aeabae4faf handle removal of an overlay for an avatar that is removed 2016-07-13 15:06:31 -07:00
Stephen Birarda
7bd8c45098 add the correct ignore icon, cleanup data structure 2016-07-13 15:06:31 -07:00
Stephen Birarda
22ab3fc7b5 cleanup a couple of comments 2016-07-13 15:06:31 -07:00
Stephen Birarda
154834b0ab hook up ignoring of user to overlay 2016-07-13 15:06:31 -07:00
Stephen Birarda
3c330d0c48 show simple overlay for script testing 2016-07-13 15:06:31 -07:00
Stephen Birarda
8724f0d0d9 add a stubbed version of the ignore script 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
Seth Alves
1999193907 split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely 2016-07-12 11:42:58 -07:00
Seth Alves
367c26a5ee wait a bit before resetting collides-with-my-avatar 2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487 back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release 2016-07-11 17:02:11 -07:00
James B. Pollack
27f70e9d52 finish merge 2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74 Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing 2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244 reduced radius of grab sphere 2016-07-08 18:23:33 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Anthony J. Thibault
bec71e4af4 Went back to transparent spheres for equip points 2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3 experimenting 2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12 less changes to hand grab 2016-07-08 16:01:17 -07:00
James B. Pollack
ee970c5e07 cleanup 2016-07-08 15:16:26 -07:00
James B. Pollack
4f899d8752 play nice with grab 2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b remove prints and format 2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63 cleanup comments etc 2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211 fix some bugs and also change it to use arrival mode 2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7 Fix for far grab not working until after edit button is pressed 2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70 Added glow effect to search beam 2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394 Merge branch 'master' into feature/grab-script-polish 2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40 simplify code 2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a changes 2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230 Model overlay dimensions fixes 
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
 2016-07-08 11:36:43 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
James B. Pollack
1a46366557 uncomment 2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901 trying to fix interaction with grab script... 2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e Equip hotspots render when your hand is near them. 2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053 make thumb and trigger work in any order and on either button released 2016-07-07 16:36:40 -07:00
James B. Pollack
71392bc1b2 change to sphere now that sphere alpha works. 2016-07-07 16:30:30 -07:00
James B. Pollack
5c83db3b28 take care of naughty intervals 2016-07-07 14:37:51 -07:00
James B. Pollack
4a9f6e677c add new target model 2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177 make thumb and trigger mode an option 2016-07-07 12:39:11 -07:00
James B. Pollack
93081e73d8 thumb and trigger 2016-07-07 12:12:22 -07:00
James B. Pollack
8212ada4de introduce delay 2016-07-07 11:42:41 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
James B. Pollack
54e0c131a5 cleanup and protect against some interval naughtiness 2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4 add instant mode 2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982 working smooth arrival 2016-07-06 17:52:18 -07:00
Anthony J. Thibault
2db8160568 handControllerGrab improvements 
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
 2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3 remove debug prints 2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37 terminate lines at intersection 2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c cleanup stretchy stuff 2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a Don't compare distance when no intersection. 2016-07-06 15:08:57 -07:00
howard-stearns
9495d93a72 Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit 2016-07-06 15:06:51 -07:00
James B. Pollack
e993a69519 last commit for stretched beams -- doesnt work at long distances due to lack of precision 2016-07-06 14:06:53 -07:00
James B. Pollack
b2ef491b97 rotate target toward you 2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c working teleporter in huffmans build 2016-07-06 12:31:03 -07:00
SamGondelman
6a44ea76e5 fixed snapshot preview on windows 2016-07-06 11:57:29 -07:00
Andrew Meadows
76cb80112e support new shape types in edit.js 2016-07-06 10:51:43 -07:00
James B. Pollack
b0494ec9d5 bug notes 2016-07-05 17:48:30 -07:00
SamGondelman
4eb94f8ccb added support for snapshot notification in HMD, although 3d image overlays seem to be broken in master 2016-07-05 17:40:33 -07:00
James B. Pollack
26950eaaa6 working second model adjustment with hack but wtf 2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6 working initial beam, still trying to clear up no intersection beam issues 2016-07-05 17:25:21 -07:00
SamGondelman
04184ee1fb added snapshot notification in desktop mode 2016-07-05 17:21:57 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
James B. Pollack
cbd1f8df88 add stuff for fading in/out and also for a nice stretchy beam 2016-07-05 13:11:14 -07:00
James B. Pollack
056e9e3a72 add teleport models etc 2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0 Merge remote-tracking branch 'upstream/master' into viveteleporter 2016-07-05 10:28:07 -07:00
James B. Pollack
ff745a345e remove dupe 2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1 fix typo 2016-07-05 09:22:19 -07:00
David Rowe
0ad7aa72fb Prevent users window from being dragged offscreen 2016-07-04 14:34:38 +12:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
James B. Pollack
9b822f97c0 end of day 2016-07-01 17:26:52 -07:00
David Rowe
760f4366e1 Don't show users border when hover mouse if logged out 2016-07-02 11:25:04 +12:00
James B. Pollack
00ce75ef48 more notes 2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26 cleanup 2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99 teleportr 2016-07-01 15:19:37 -07:00
howard-stearns
71c44f4f93 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-07-01 13:05:32 -07:00
James B. Pollack
4762091aaf add easy mode 2016-07-01 11:12:20 -07:00
howard-stearns
43c7fd1e27 New art. 2016-07-01 10:34:13 -07:00
howard-stearns
804a187a7b Mute changes. 2016-07-01 10:17:17 -07:00
Ryan Downe Karpf
873b57219a Merge pull request #8167 from hyperlogic/feature/equip-hotspots 
equip-hotspots feature
 2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1 fix vive bug 2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77 notes 2016-06-30 17:05:16 -07:00
howard-stearns
125f6d8b63 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:49:19 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -07:00
James B. Pollack
82e074de0f working teleporter 2016-06-30 16:05:44 -07:00
Anthony J. Thibault
d8e5e3cbe4 equip bug fix 
you should not be able to equip an object that is already equipped, with your other hand.
 2016-06-30 16:00:18 -07:00
Brad Davis
dfb6cb1aa3 Updating entity list 2016-06-30 14:25:36 -07:00
Anthony J. Thibault
82b1cba81d equip improvements 
Allow the user to equip an object while near or far grabbing it from the other hand.
 2016-06-30 13:58:44 -07:00
Howard Stearns
5556bbb0a3 Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered 2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757 Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area 
limit hand controller actions to recommended area
 2016-06-30 11:06:32 -07:00
James B. Pollack
4b4e38a57c end of day 2016-06-29 18:28:39 -07:00
Anthony J. Thibault
6072487c9c Equip-points attachments work 
Also made handControllerGrab.js eslint clean.
 2016-06-29 17:28:53 -07:00
James B. Pollack
fd062d09dc initial notes and research 2016-06-29 15:59:51 -07:00
Anthony J. Thibault
43d4dba4c0 iterate over hotspots not entities. 
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
 2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473 WIP, equip-points work but they don't use the proper attach point. 2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637 Addition of equipHotspots 2016-06-29 13:53:06 -07:00
Howard Stearns
b649b30777 Reduce margin. 2016-06-29 08:20:47 -07:00
Seth Alves
52d017ac74 undo previous change 2016-06-28 19:22:19 -07:00
Howard Stearns
b551bc3c1a Use the whole area, less a margin. 2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b Use normal Script.update (60hz) instead of a timer (@20hz). 2016-06-28 17:44:30 -07:00
Seth Alves
224008afd6 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-06-28 16:56:27 -07:00
Seth Alves
b782ae667c when one hand adjusts something equippd in the other, print out the new local position and rotation in case a content-creator wants to update userData 2016-06-28 16:36:37 -07:00
Seth Alves
630d5cfc82 make trigger more sensitive, print out position and rotation when releasing something 2016-06-28 15:47:17 -07:00
howard-stearns
c492d125e0 limit hand controller actions to recommended area 2016-06-28 13:19:03 -07:00
howard-stearns
799686f29d Only update the (invisible) cursor position from hand controllers when the 
trigger is partially squeezed.
 2016-06-28 11:36:08 -07:00
Brad Hefta-Gaub
3fca0d655c Merge pull request #8145 from ctrlaltdavid/20978 
reduce users window flicker when restart script
 2016-06-28 10:03:46 -07:00
David Rowe
79cfd2e9dc Reduce users window flicker when restart script 2016-06-28 11:40:49 +12:00
Brad Hefta-Gaub
1af455b8b9 Merge pull request #8135 from SamGondelman/fixEditLockHMD 
Prevent entering independent camera mode through edit.js in HMD mode
 2016-06-27 15:50:25 -07:00
Brad Hefta-Gaub
cecd871c66 Merge pull request #8139 from ctrlaltdavid/20978 
fix users.js display and operation
 2016-06-27 12:56:10 -07:00
David Rowe
dc07368dc9 Hide users list when logged out 2016-06-25 14:23:35 +12:00
David Rowe
0b6797acc3 Fix "show me" and "visible to" in users window not being remembered 2016-06-25 13:48:43 +12:00
Howard Stearns
de7738e644 Merge pull request #8134 from highfidelity/vive-ui 
Vive UI bug fixes
 2016-06-24 18:39:06 -07:00
David Rowe
8b0f59c9cf Fix users window minimized state not being remembered 2016-06-25 13:12:16 +12:00
David Rowe
1c1d81ae25 Fix missing users.js menu item 2016-06-25 12:18:03 +12:00
David Rowe
8a5369fcb1 Undo hide users.js when logged out 2016-06-25 12:03:36 +12:00
SamGondelman
d5feac94f4 coding standard fun 2016-06-24 16:23:15 -07:00
SamGondelman
5e69af83c6 can't enter independent mode through edit.js in HMD mode 2016-06-24 16:23:15 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd 
Automatically enter first person when in HMD mode
 2016-06-24 15:58:38 -07:00
Brad Hefta-Gaub
2e8f6c2cc6 Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject 
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
 2016-06-24 14:08:29 -07:00
Anthony J. Thibault
41fcfb45ca Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements 2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-24 12:49:54 -07:00
Anthony J. Thibault
8bf72f28da Fix for grab script search ray length 2016-06-24 12:06:02 -07:00
Zander Otavka
0c56af7ae8 Add default script to enter first person for HMD 2016-06-24 11:57:50 -07:00
Anthony J. Thibault
7bd553c09c near grab logic to uses sphere vs entity box 
instead of sphere vs sphere.  Adjusted debug drawing accordingly.
 2016-06-23 17:03:15 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Anthony J. Thibault
eabb8d08c0 Merge branch 'vive-ui' into feature/equip-hotspots 2016-06-23 15:42:55 -07:00
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
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4 
support btBvhTriangleMeshShape for static mesh entities
 2016-06-23 12:17:32 -07:00
Seth Alves
03b55e6a64 Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-23 10:33:31 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
Ryan Huffman
1be30ccce9 Fix enabled_edit firing on disable 2016-06-22 08:24:50 -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
223f9bda2e gratuitous change to force things. 2016-06-21 17:03:49 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Howard Stearns
7e88772e85 Merge pull request #8106 from howard-stearns/triggering-change 
triggering change
 2016-06-21 13:51:12 -07:00
Anthony J. Thibault
972c292857 Fix for equip-hotspot being visible for whiteboard markers 2016-06-21 11:59:11 -07:00
Andrew Meadows
f41fb30ace add "Static Mesh" option to edit.js 2016-06-20 17:29:20 -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
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
Brad Hefta-Gaub
c297fa7c0e Merge pull request #8060 from imgntn/usersUpdates 
Hide users.js options when logged out
 2016-06-17 14:17:42 -07:00
Brad Hefta-Gaub
852eda3101 Merge pull request #8066 from imgntn/faceCameraText 
Add face camera option to edit.js text entity properties
 2016-06-17 14:14:06 -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
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
bce05df56b Update enabled_edit to only get sent when you have permission 2016-06-16 13:25:14 -07:00
Ryan Huffman
56c84bbc27 Add opened_marketplace and enabled_edit to edit.js 2016-06-16 13:18:08 -07: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
James B. Pollack
b97dc584ea fix bug where buttons would show when minimized 2016-06-14 14:14:31 -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
James B. Pollack
3b2e0842b0 add face camera to text properties 2016-06-13 23:27:08 -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
James B. Pollack
5ac9460592 fix branching 2016-06-13 16:43:33 -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
James B. Pollack
188590a891 cleanup 2016-06-13 13:08:22 -07:00
James B. Pollack
567118f4a9 cleanup 2016-06-13 13:08:12 -07:00
James B. Pollack
342fc07d29 select active element in edit.js after change 2016-06-13 13:06:56 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -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
David Rowe
58f89c88a2 Remember last directory used for Window.browse() and Window.save() 
Use last directory if not specified in method call. Default to desktop.
 2016-06-11 16:45:17 +12: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
howard-stearns
82cc219ab8 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse 2016-06-09 13:30:28 -07:00
David Rowe
0fe93a1e89 Fix capitalization of import and export dialog titles 2016-06-09 16:12:11 +12: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
Brad Davis
0565d3aea1 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-08 14:59:58 -07:00
James B. Pollack
65e2cdbbf3 clear dead code 2016-06-08 13:44: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
f8353fb082 New button content and initial positions. 2016-06-08 11:11:18 -07:00
howard-stearns
74c5ddd49f fix paused interactions with mouse 2016-06-07 09:50:10 -07:00
SamGondelman
1994eabc98 grip buttons on vive and touch will make you active in away.js 2016-06-06 16:22:02 -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
James B. Pollack
15745eb5b2 Merge remote-tracking branch 'upstream/master' into moreshelfstuff 2016-06-06 12:00:41 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Howard Stearns
91450addd3 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into goto-button 2016-06-05 10:46:18 -07:00
Howard Stearns
dbc688f445 Merge pull request #8005 from howard-stearns/pointer-cleanup 
pointer cleanup -- see comment on #8012
 2016-06-05 10:17:36 -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
David Rowe
b6cb5617d3 Save toolbar position when moving it only when stopped moving it 2016-06-05 08:55:27 +12: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
6881956117 Basic HMD toggle button. 2016-06-03 14:57:46 -07:00
James B. Pollack
9c63a6417e fix attached entities manager and add to default scripts 2016-06-03 14:24:07 -07:00
howard-stearns
247286c71f Basic address bar toggle button. 2016-06-03 11:55:33 -07:00
howard-stearns
3e919cb7ac cleanup 2016-06-03 10:42:02 -07:00
Brad Davis
e9b359feb1 Make QML overlays disappear, use fade for non-window types 2016-06-02 19:15:19 -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
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
howard-stearns
a3f1ece978 Do button mapping in C++ and simplify vive.json accordingly. Vive and 
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
 2016-05-24 16:10:12 -07:00