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

535 commits

Author SHA1 Message Date
Seth Alves
ae7af3e227 don't hide stylus so quickly 2016-12-20 07:43:48 -08:00
Seth Alves
e9c848bfe8 stylus for web overlays 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519 don't flutter tablet when menu button is pressed. start on a stylus 2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8 Fix keyboard focus when switch highlight between overlays and entities 2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f Fix Web overlay x, y coordinate calcs 2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced First pass at controller interaction with 3D Web overlay 2016-12-20 07:42:21 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Ryan Huffman
9730d07f59 Cleanup tutorial scripts 2016-12-16 16:01:44 -08:00
Ryan Huffman
46d8130782 Cleanup variable naming in touch controller config 2016-12-16 16:01:26 -08:00
Ryan Huffman
009c982cdf Cleanup implementation of touch controller config 2016-12-16 15:05:17 -08:00
Ryan Huffman
19a3fdcc01 Update Touch controller configuration 2016-12-16 15:05:17 -08:00
Ryan Huffman
f7ebda6931 Fix positioning of Oculus Touch controller visual 2016-12-16 15:05:17 -08:00
Ryan Huffman
b599ccea9e Remove cache buster from touchControllerConfiguration 2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1 Fix oculus touch labels in tutorial 2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a Update oculus touch labels to be emissive 2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8 Fix emissive channel on touch models 2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086 Fix right touch joystick 2016-12-16 15:05:17 -08:00
Ryan Huffman
2b88935812 Reenable disabling of hand controllers 2016-12-16 15:05:17 -08:00
Ryan Huffman
6fb39080e2 Update controller display to support non-string hardware resolution 2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5 Add touch controller support to ControllerDisplay 2016-12-16 15:05:17 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Philip Rosedale
9370c8af6b Added ability to rescale avatar 2016-12-12 15:26:53 -08:00
Philip Rosedale
a142c830fa Merge branch 'master' of git://github.com/highfidelity/hifi into rescale 2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09 Both grip buttons enable rescale for a held object 2016-12-12 09:39:32 -08:00
David Rowe
e956608fa4 Fix keyboard focus when switch highlight between overlays and entities 2016-12-09 18:31:52 +13:00
David Rowe
7d8926c802 Fix Web overlay x, y coordinate calcs 2016-12-09 17:00:00 +13:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
David Rowe
4c236b293e First pass at controller interaction with 3D Web overlay 2016-12-09 01:47:40 +13:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Ryan Huffman
996d3f5875 Merge pull request #9135 from druiz17/nearGrab 
Fixed pressing the grip button causes a near grabbed object to drop
 2016-12-05 11:07:15 -08:00
Dante Ruiz
08301d488d clean up 2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f better solution 2016-12-05 18:08:36 +00:00
Seth Alves
24e54f25bf Merge pull request #9108 from PhilipRosedale/drifting 
Grab.js weaker at a distance
 2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5 Fix indents 2016-12-01 12:54:38 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
Dante Ruiz
1b24d373d2 fixed near grab issue 2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083 grip button fix 2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
Anthony J. Thibault
7f840d3a08 Can use 'xboxLaser' in third person camera 2016-11-30 10:01:11 -08:00
Ryan Huffman
aa1e813d72 Fix 'releaseGrab' not being called when using grip buttons 2016-11-29 15:04:14 -08:00
Philip Rosedale
664b54c004 remove whitespace 2016-11-22 10:27:27 -08:00
Philip Rosedale
c1e044364f Added distance attentuation of linear and angular rate 2016-11-22 10:24:02 -08:00
Anthony J. Thibault
270adfe692 removed debug prints 2016-11-17 11:40:05 -08:00
Anthony J. Thibault
38ac6fff03 Hand Controller rendering is camera relative 
Basically, when using the third person camera in HMD mode.  If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.

To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.

These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.

These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
 2016-11-17 11:33:12 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
Philip Rosedale
981f505a9c Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-14 14:26:45 -08:00
howard-stearns
e2fded846f make hand-controller ui work in third person 2016-11-11 11:10:42 -08:00
Philip Rosedale
c0b1392685 Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-10 13:41:13 -08:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
Dante Ruiz
1a83cc2c3e fixed deleted comment 2016-11-02 00:12:23 +01:00
Dante Ruiz
d29b1c34b1 fixed coding standard conflicts 2016-11-02 00:07:58 +01:00
Dante Ruiz
e9d10b609d removed bad commit 2016-11-02 00:05:38 +01:00
Dante Ruiz
86abd9120e Fixed menu out of view with HMD and Xbox controller 2016-11-01 14:30:48 -07:00
Ryan Huffman
d933155c71 Fix trigger highlight configuration 2016-10-27 20:16:34 -07:00
Ryan Huffman
69e7dababc Collapse multiline dict to one line in controllerDisplay 2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380 Remove annotation API from controller display 2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f Update controller tips and trigger highlight in tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5 Add more debug to tutorial, new firecrackers, and adjust fuse 2016-10-27 14:58:20 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Ryan Downe Karpf
7a4302057a Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip 
Update vive controller display to not hide on equip
 2016-10-25 13:16:31 -07:00
Ryan Huffman
af749605ea Update vive controller display to not hide on equip 2016-10-25 08:27:20 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
76ca3aa546 fix residual head laser 2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Andrew Meadows
ccc6f8eee2 fix teleport.js to work for out-of-body 2016-10-24 08:36:51 -07:00
Andrew Meadows
51a9a99381 Merge hifi/master into hifi/out-of-body-experience 2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Anthony J. Thibault
ae301602e7 Fix for incorrect tip texture URLs. 2016-10-21 14:49:46 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode. 
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
 2016-10-21 10:40:39 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Seth Alves
7e4964db3e Merge pull request #8684 from Menithal/controller-grab-unequip 
Fixed HandcontrollerGrab distance unequip
 2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub
c082c74cc0 use head pose for controller in case there are no hand controllers available 2016-10-18 10:01:00 -07:00
Ryan Huffman
5f5dedaa40 Fix equip sphere not showing up 2016-10-17 10:53:02 -07:00
howard-stearns
140caf84d8 never interact with hud elements while holding something 2016-10-14 18:30:52 -07:00
Howard Stearns
fc8bbde60a Merge pull request #8810 from ZappoMan/handControlsWhileLoading 
make laser pointers work even while content is loading
 2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub
ef3c9ba78a better handling of the teleport target overlays to prevent flashing and thrashing 2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a make laser pointers work even while content is loading 2016-10-13 17:50:20 -07:00
Anthony J. Thibault
81db8f7e08 Merge branch 'master' into out-of-body-experience 2016-10-13 17:27:15 -07:00
Andrew Meadows
d54c07ed14 Merge 'master' into 'out-of-body-experience' 2016-10-12 13:35:27 -07:00
howard-stearns
0099a4e549 allow hand controller operations when Interface doesn't have focus, but 
ONLY when in hmd.
 2016-10-12 11:23:06 -07:00
Seth Alves
16af14d1f6 Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false 
allow equipped object to follow hand and not controller
 2016-10-12 09:52:57 -07:00
Brad Hefta-Gaub
e1a3bc7d55 hide/show grab point sphere only when in a grabbable entity 2016-10-11 16:22:42 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
Brad Hefta-Gaub
4ec9299930 fix reticle depth when not moving mouse, but moving head relative to HUD 2016-10-08 14:31:30 -07:00
Menithal
4bed3ee036 Adjusted theoretical Unequip time to 250 ms 2016-10-08 01:36:57 +03:00
Andrew Meadows
55c90e7bca Merge branch 'master' into out-of-body-experience 2016-10-07 15:18:08 -07:00
Anthony J. Thibault
7c7a9055d1 Allow grabbed objects to override the ignoreIK = true default. 
They can do this by adding the following to their userData.

    grabbableKey: {
        ignoreIK: false
    }

When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
 2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb Fix for exception in handControllerGrab.js 
Specifically this:
    [UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
 2016-10-07 14:48:55 -07:00
Ryan Huffman
a5e3fa45c3 Fix advanced movement being disabled 2016-10-07 10:30:18 -07:00