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

1273 commits

Author SHA1 Message Date
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Thijs Wenker
dfb4c7cf89 avatarFinderBeacon 2016-12-09 01:41:19 +01:00
David Rowe
4c236b293e First pass at controller interaction with 3D Web overlay 2016-12-09 01:47:40 +13:00
David Rowe
c4c2a95e83 Add "back" button to marketplaces footer 2016-12-08 10:58:37 +13:00
David Rowe
1de2c14fee Remove e-mail message hyperlink if displaying on tablet 2016-12-07 12:52:53 +13:00
David Rowe
e821ec5593 Inject navigation footer into Clara account createion page 2016-12-07 12:38:16 +13:00
David Rowe
01226b03ef Improve text and robustness of marketplaces footer 2016-12-07 12:20:43 +13:00
David Rowe
eafd51ba9e Merge branch 'master' into 21089 2016-12-07 11:27:15 +13:00
David Rowe
460d332c6f Delete redundant code 2016-12-07 10:06:32 +13:00
David Rowe
8e30674069 Tidying 2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
howard-stearns
3ba5e1ed4a new mic toolbar button art 2016-12-06 10:52:40 -08:00
Andrew Meadows
7db8e8f31b Merge pull request #9156 from hyperlogic/out-of-body-revert 
Revert Out of Body experience
 2016-12-06 08:37:20 -08:00
howard-stearns
7621672964 new mic unumute art 2016-12-05 16:00:03 -08: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
David Rowe
b83d5c6275 Inject Clara Web page modifications 2016-12-05 21:34:34 +13:00
David Rowe
2f42f4cfa5 Merge branch 'master' into 21089 2016-12-05 18:33:38 +13:00
David Rowe
f04c493e16 Fix navigation bar and opaqueness of Web page 2016-12-05 17:48:20 +13:00
David Rowe
a5bdd9066f Add JavaScript event bridge for Web 3D overlay 2016-12-05 17:20:30 +13:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
David Rowe
b723f3d92e Fix Web tablet screen size 2016-12-05 10:03:30 +13:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Zach Fox
30dade242c GIFs: Quality improvements; duration tweaks; processing notif (#9139) 2016-12-01 14:53:18 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +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
a35f28725b fixed child not commit back when performing undo 2016-12-01 10:54:26 -08:00
Dante Ruiz
3c1d434449 fixed typo 2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4 fixed child of parent not being added when performing an undo 2016-12-01 10:54:26 -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
Chris Collins
c0a0a16ff8 Merge pull request #9127 from huffman/fix/hand-controller-grab-release 
Fix 'releaseGrab' not being called when using grip buttons
 2016-12-01 09:58:36 -08:00
David Rowe
0136534954 Use overlay instead of entity to display tablet Web content 2016-12-01 21:32:57 +13:00
Anthony J. Thibault
7f840d3a08 Can use 'xboxLaser' in third person camera 2016-11-30 10:01:11 -08:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Anthony J. Thibault
78559934a1 Merge branch 'master' into third-person-lasers 2016-11-29 16:38:34 -08:00
Ryan Huffman
aa1e813d72 Fix 'releaseGrab' not being called when using grip buttons 2016-11-29 15:04:14 -08:00
Ryan Jones
a59df5b04d one last indentation fix 2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55 revert changes to dev utils, apply changes to system utils 2016-11-28 17:18:31 -08:00
Ryan Jones
4be1922df5 add bind polyfill 2016-11-28 14:47:15 -08:00
Howard Stearns
030f0d7103 Merge pull request #9114 from howard-stearns/bubble-state 
bubble state
 2016-11-28 12:16:39 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
howard-stearns
414371d1fc record starting href/domainId, not ending 2016-11-22 16:13:08 -08:00
howard-stearns
2c9046742e allow movement during .gif recording 2016-11-22 16:02:01 -08:00
howard-stearns
5188de924f allow for SnapshotReview dialog to be up during a change of href for all 
media capture
 2016-11-22 11:09:43 -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
Philip Rosedale
c81d5b0793 Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-22 09:07:13 -08:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
howard-stearns
da56457c4a Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-18 17:13:32 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Ryan Huffman
541ef21801 Merge pull request #9094 from Atlante45/edit-js 
Turn Edit.js on when importing entities
 2016-11-18 15:36:50 -08:00
Zach Fox
35d075a78f Fix notifications.js formatting 2016-11-18 14:39:30 -08:00
Zach Fox
20a2d1275a Bugfixes and GIF uploads workinggit add -A! 2016-11-18 14:39:30 -08:00
Zach Fox
adcbb0b760 Code clarity and potential bugfix 2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7 Huge progress today. Buggy behavior with multiple snapshots remains 2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f code cleanup; simultaneous gif and still capture 2016-11-18 14:39:29 -08:00
Zach Fox
704476c197 Initial progressgit add -A! 2016-11-18 14:39:28 -08:00
Atlante45
cfd4294743 Turn Edit.js on when importing SVO 2016-11-18 11:31:12 -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
David Kelly
40914d9790 Logging to help find audio device issue 
We sometimes show duplicate devices in Audio > Devices menu.  But
I cannot reproduce it, so maybe best thing is log timing and contents
of input and output device arrays, to try to run down where the issue
is.
 2016-11-15 12:58:51 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
David Rowe
591db37a21 Fix up navigation footer fonts 2016-11-15 15:09:33 +13:00
David Rowe
e4b8d34080 Add navigation bar to marketplace pages 2016-11-15 14:38:03 +13: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
David Rowe
1eeec2a3a1 Fix up script injection methods 2016-11-15 10:24:38 +13:00
howard-stearns
47bef18bd4 show the hand controllers when in third-person+hmd, but currently, they're 
at avatar hands instead of physical hand, which is not what we want!
 2016-11-14 13:05:35 -08:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
howard-stearns
06a6da3931 Merge branch 'master' of https://github.com/highfidelity/hifi into third-person-lasers 2016-11-14 09:58:54 -08:00
Stephen Birarda
212d518109 use for loop for kick and mute overlay cleanup 2016-11-13 12:17:12 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
David Kelly
3d7e075897 Added mute to mod.js script 2016-11-11 11:18:24 -08:00
howard-stearns
e2fded846f make hand-controller ui work in third person 2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub
a90a0fe8ba Merge pull request #8976 from druiz17/FixMenuOutOfView 
Fixed menu out of view with HMD and Xbox controller
 2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub
f55b660820 Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser 
Fix users.js maximize button unclickable with hand controllers
 2016-11-10 17:53:17 -08:00
howard-stearns
8299e23cc3 diable some viewpoint menu options when in hmd. 2016-11-10 15:15:11 -08:00
Philip Rosedale
c0b1392685 Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-10 13:41:13 -08:00
David Rowe
1caca601f2 Update user instructions 2016-11-10 20:39:29 +13:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
humbletim
35f857ef9d inhibit user interactions when window is disabled 2016-11-09 13:21:24 -05:00
Ryan Huffman
5dab2ac2a7 Add margin to left and right side of users.js 2016-11-08 09:47:09 -08:00
Ryan Huffman
284b458148 Increase margin at bottom of users.js 2016-11-08 09:46:47 -08:00
Seth Alves
42d13f7e77 Merge pull request #9024 from huffman/fix/userdata-showing-old-data 
Fix userData in edit.js sometimes showing wrong value when locked
 2016-11-07 13:37:03 -08:00
Ryan Huffman
c4f35bf7bf Fix userData in edit.js sometimes showing wrong value when locked 2016-11-07 11:39:36 -08:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13: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
David Rowe
852218815b Display "content loading" while there are pending GPU texture transfers 2016-11-07 13:40:49 +13:00
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar 
centered toolbar
 2016-11-03 14:18:32 -07:00
howard-stearns
8eb6699420 help script 2016-11-02 16:50:37 -07:00
Seth Alves
d0c0cdd82f polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again 2016-11-02 16:31:34 -07:00
David Rowe
de5e02310b Provide keyboard in marketplaces window 2016-11-03 09:00:40 +13: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
David Rowe
0c6ed67e3b Tidying 2016-11-02 00:05:30 +13:00
David Rowe
35448b6c09 Update Clara.io instructions 2016-11-02 00:05:10 +13:00
Brad Hefta-Gaub
dc836cbefc Merge pull request #8949 from ctrlaltdavid/21090 
Fix comment typo
 2016-10-28 13:29:47 -07:00
David Rowe
9a79345493 Fix comment typo 2016-10-29 09:04:50 +13:00
Ryan Huffman
b8cf4e9c0e Merge pull request #8943 from ctrlaltdavid/21090 
QA READY: Revise loading progress bar
 2016-10-28 08:24:40 -07:00
David Rowe
b548e6441c Animate progress bar without regard for amount of content left to load 2016-10-28 18:57:54 +13:00
David Rowe
610159fcbe Improve bar for 4K displays 2016-10-28 18:20:33 +13:00
David Rowe
73b2bc433d Improve bar positions 2016-10-28 18:03:13 +13:00
Stephen Birarda
c41af25776 Merge pull request #8939 from huffman/fix/tutorial-fixes 
Tutorial fixes
 2016-10-27 21:43:55 -07:00
Ryan Huffman
d933155c71 Fix trigger highlight configuration 2016-10-27 20:16:34 -07:00
David Rowe
edc9b1fa07 Update bar graph for desktop and HMD displays 2016-10-28 15:50:50 +13:00
David Rowe
c9e4fddeab Remove background image 2016-10-28 14:17:18 +13:00
David Rowe
0824142987 Add "loading" text 2016-10-28 14:12:24 +13:00
David Rowe
4befab1151 JSLint progress bar code 2016-10-28 11:34:00 +13: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
Ryan Huffman
1782f97dbd Fix away.js not unsubscribing on shutdown 2016-10-27 11:12:46 -07:00
Ryan Huffman
a801832a55 Fix away.js allowing any user to disable away.js 2016-10-27 11:12:31 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Ryan Huffman
727fabeab2 Fix away.js logging all Messages 2016-10-25 15:28:11 -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
Brad Hefta-Gaub
1bbf0179dd Merge pull request #8894 from ZappoMan/xboxLasers 
Adds support for "lasers" to the Oculus+xbox controller
 2016-10-25 09:18:00 -07:00
Ryan Huffman
af749605ea Update vive controller display to not hide on equip 2016-10-25 08:27:20 -07:00
Chris Collins
325cd0ae61 Merge pull request #8870 from ctrlaltdavid/21084 
Reinstate "reload" button for entity scripts in entities editor
 2016-10-24 22:17:14 -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
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -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
Howard Stearns
ca0d6587b5 Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers 
edit.js: Fix for picking and manipulating objects via hand controllers.
 2016-10-20 16:59:56 -07:00
David Rowe
c6558ebebd Reinstate "reload" button for entity scripts in entities editor 2016-10-21 11:14:57 +13:00
Anthony J. Thibault
53864abaf2 edit.js: Fix for picking and manipulating objects via hand controllers. 
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
 2016-10-20 13:37:31 -07:00
Ryan Huffman
fad0607bf6 Remove showing of overlays in away.js 2016-10-20 11:49:23 -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
Ryan Huffman
f42683cf8b Update users.js to be minimizable when logged out, and by default 2016-10-19 13:19:29 -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
Chris Collins
d70b58555e Merge pull request #8794 from howard-stearns/clientOnly-tablet 
make marketplace tablet be clientOnly
 2016-10-14 10:54:54 -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
howard-stearns
d232d115d5 persist tablet data, and clean it up on startup 2016-10-13 16:53:44 -07:00
Brad Hefta-Gaub
5638f6228b Merge pull request #8792 from howard-stearns/allow-hmd-hand-controllers-without-interface-focus 
allow hand controller operations when Interface doesn't have focus, but ONLY when in hmd
 2016-10-13 13:48:44 -07:00
Ryan Huffman
55d4695489 Fix edit.js not allowing imports when you only have temp rez permissions 2016-10-13 11:51:54 -07:00
howard-stearns
78f96a80bd oops 2016-10-12 16:31:12 -07:00
howard-stearns
b377127fc1 make marketplace tablet be clientOnly 2016-10-12 14:46:04 -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
0f1e61e240 Merge pull request #8781 from ZappoMan/tweakGrabPoint 
adjust grab indicators
 2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub
6630ec3208 Merge pull request #8746 from ctrlaltdavid/21033 
Send High Fidelity user's visibility when users.js starts up
 2016-10-11 21:36:22 -07:00
Brad Hefta-Gaub
8ac31a041d Merge pull request #8654 from ZappoMan/betterAway 
fix away HMD unmouted logic
 2016-10-11 20:35:08 -07:00
Anthony J. Thibault
f76dbeeffd Edit.js now works with new ignoreIK default 2016-10-11 17:12:02 -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
Andrew Meadows
abb05bc686 Merge pull request #8753 from ctrlaltdavid/21068 
Improve indication of user not being logged in
 2016-10-11 10:40:37 -07:00
Brad Hefta-Gaub
774d87a7a7 Merge pull request #8773 from howard-stearns/marketplace-button-state 
make marketplace button state match whether tablet is being shown
 2016-10-10 15:50:07 -07:00
Brad Hefta-Gaub
a877f182f7 Merge pull request #8771 from howard-stearns/kick-by-laser 
fix kick by laser
 2016-10-10 15:36:16 -07:00
howard-stearns
333ec388a8 make marketplace button state match whether tablet being shown 2016-10-10 14:30:47 -07:00
howard-stearns
1051c068e1 kick by hand controller 2016-10-10 13:47:08 -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
Brad Hefta-Gaub
20c522a9bc fix more bugs in away 2016-10-08 13:45:18 -07:00
Brad Hefta-Gaub
3aa1c36f53 Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway 2016-10-08 11:50:10 -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
Ryan Huffman
c74df965ba Fix misnamed function and duplicate onFinish in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
fec8049226 Add proper disabling to advanced movement script 2016-10-07 10:30:18 -07:00
Ryan Huffman
827506e929 Disable 180 spin in tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
a4ffa7b23f Add disabling of right click menu with vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
14323a06b3 Add interface to disable hand controller grab functionality 2016-10-07 10:30:18 -07:00
Ryan Downe Karpf
ed2571704f Merge pull request #8735 from huffman/feat/teleport-improvements 
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to  certain surfaces
 2016-10-07 09:56:30 -07:00
David Rowe
52fbb654fa Tweak location of users online minimize/maximize button 2016-10-07 15:43:54 +13:00
David Rowe
c637649805 Make users online title say to login to view 2016-10-07 15:25:47 +13:00
David Rowe
4ca0048ec9 Display minimized users list when not logged in 2016-10-07 15:21:24 +13:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
David Rowe
b2f3b47db9 Send High Fidelity user's visibility when users.js starts up 2016-10-06 12:16:57 +13:00
Ryan Huffman
d50689b795 Remove disabling of teleport in hand grab 2016-10-04 20:25:46 -07:00
Ryan Huffman
d0ba53a069 Change name of isTooCloseToTeleport to be more descriptive 2016-10-04 20:22:22 -07:00
Ryan Huffman
1e6aba1928 Fix teleport not removing overlay on teleport 2016-10-04 20:21:32 -07:00
Ryan Huffman
2ef7c9a57a Disable smooth movement in teleport.js 2016-10-04 20:21:32 -07:00
Ryan Huffman
53623f7583 Make teleport.js normal rejection more lenient 2016-10-04 20:21:30 -07:00
Ryan Huffman
813ed59f00 Update teleport to not collide with non collidable entities 2016-10-04 20:19:54 -07:00
Ryan Huffman
75265cff6e Update teleport to not let you teleport into walls 2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737 Disable ray picking against invisible objects in far grab and teleport 2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Ryan Huffman
8343cfd687 Add grip to unequip 2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b Adjust hand controller unequip rotation threshold 2016-10-04 16:34:18 -07:00
Anthony J. Thibault
aab974e6ae Merge branch 'master' into out-of-body-experience 2016-10-04 11:17:52 -07:00
David Rowe
caf1a93354 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-10-04 10:51:14 +13:00
Brad Hefta-Gaub
546d4ff986 remove mic and window resize notifications 2016-10-02 09:10:12 -07:00
David Rowe
ad5d525340 Fix keyboard status when switching between entities editor tabs 2016-09-30 14:13:35 +13:00
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
Menithal
a6040197eb Fixed HandcontrollerGrab unequip. 
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
 2016-09-29 22:24:07 +03:00
David Rowe
e3be34528f Fix keyboard flickering when select entities 
Fix entities list footer count of selected entities in the process.
 2016-09-29 16:53:20 +13:00
David Rowe
8e44096981 Fix last entities properties not scrolling when keyboard raised 2016-09-29 15:59:24 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
David Rowe
b60f649e0a Scroll HTML window if necessary when raise keyboard 2016-09-28 19:27:16 +13:00
David Rowe
a94d77ee12 Raise and lower keyboard in entities editor 2016-09-28 17:57:53 +13:00
Brad Hefta-Gaub
f7228993a5 go into away if the application starts in HMD mode but it's not mounted 2016-09-26 17:29:37 -07:00
Brad Hefta-Gaub
c4a80996d5 fix away HMD unmouted logic 2016-09-23 16:17:28 -07:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Seth Alves
785e187a27 edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around 2016-09-21 11:39:25 -07:00
Brad Hefta-Gaub
2b01c60a55 Merge pull request #8615 from davidkelly/dk/1264 
Make the equip sphere emissive
 2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215 Fix for jittery far-grab at low update rates 
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
 2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2 whitespace 2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456 PR feedback 2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b Switch to the cool looking model instead 2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1 Make the equip sphere emissive 
maybe this will make it visible in low ambient light situations?
 2016-09-15 17:12:35 -07:00
Chris Collins
84ffda5281 Merge pull request #8608 from huffman/fix/particle_explorer 
Fix eventBridgeLoader path in particle explorer
 2016-09-15 16:51:41 -07:00
Ryan Huffman
6a32ef29dc Fix eventBridgeLoader path in particle explorer 2016-09-15 13:07:00 -07:00
howard-stearns
03a8af76e3 don't do hand-controller edit object-selection when pointed at a HUD 
element
 2016-09-14 12:02:33 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
David Rowe
fa0aeb4563 Display render info values only when valid provided 2016-09-13 13:03:47 +12:00
Andrew Meadows
09c4720665 fix typo in teleport.js 2016-09-12 16:35:52 -07:00
Andrew Meadows
9728cf6904 fix typos in teleport.js 2016-09-12 16:24:08 -07:00
Andrew Meadows
0d300c3a47 teleport.js drags avatar along 2016-09-12 16:24:08 -07:00
David Rowe
d61e4c5c11 Display textures size in MB 2016-09-13 10:52:19 +12:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
David Rowe
44282499c5 New glyph for "has transparent" 2016-09-10 14:37:09 +12:00
Anthony J. Thibault
86351ca21c Teleport bugs 
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
 2016-09-09 17:32:02 -07:00
Andrew Meadows
82522fbbb1 fix C++ism typo in JS script 2016-09-09 16:40:07 -07:00
Andrew Meadows
6b9cdb440b update teleport.js to teleport HMD before avatar 
(in theory, not tested)
 2016-09-09 16:33:13 -07:00
David Rowe
a06f49f791 Fix footer entities count not being updated when change filter value 2016-09-10 11:14:23 +12:00
David Rowe
487cb7d893 Use findInFrustum in entities list and filter results per search radius 2016-09-09 18:58:38 +12:00
Seth Alves
ecb0669972 try to keep far grab from getting stuck if the entity is brought very near to the grab-point 2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89 distance-grabbed things collide with static entities 2016-09-08 16:13:22 -07:00
Seth Alves
9e99cc1f78 fix mod.js 2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
a4b5f5395d Add "in view" button 2016-09-08 12:56:41 +12:00
Seth Alves
9c96ffc9cb don't show grab-point spheres if controller poses aren't valid 2016-09-07 16:31:02 -07:00
David Rowe
7d6ab77c16 Merge branch 'master' into 21040 2016-09-08 11:30:19 +12:00
Seth Alves
746d0cd91c get various hand lasers to all line up with grab-point sphere 2016-09-07 16:10:37 -07:00
Seth Alves
b45181ea92 don't back up pick-ray from hand 2016-09-07 13:32:26 -07:00
Anthony J. Thibault
9f0550ea7e Raised dpi of WebTablet to fit 480 width keyboard 2016-09-07 10:59:54 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Seth Alves
5303488f52 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-07 09:40:51 -07:00
David Rowe
db30e36b3b Implement expand/collapse action to show/hide table columns 2016-09-07 19:11:53 +12:00
David Rowe
b372f82f78 Ensure that the expand/collapse icon is always visible 2016-09-07 17:09:56 +12:00
David Rowe
dba3efd857 Add expand/collapse extra info toggle icon to entities table header 2016-09-07 15:04:27 +12:00
SamGondelman
88d0aa3737 removed showButtonDown, which didn't exist 2016-09-06 17:36:55 -07:00
Seth Alves
616b094111 experimenting with position of grab sphere 2016-09-06 16:16:09 -07:00
David Rowe
156866f835 Fix "has script" entities list icon 2016-09-07 11:12:04 +12:00
David Rowe
83593087b6 Resize table headers after filter value changed 2016-09-07 11:08:06 +12:00
Seth Alves
34e4b4ae19 move haptic-pulse for when grab-point enters a grabbable entity to the right section of code 2016-09-06 15:37:37 -07:00
Seth Alves
215fd4ddfd fix grab-point sphere for right hand 2016-09-06 15:15:46 -07:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
Seth Alves
43c98b3f1e attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere 2016-09-06 14:42:53 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
David Rowe
c44bd902c3 Display render info values only if provided 2016-09-03 13:07:40 +12:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html 
Include a marketplace status bar and access to "marketplace" of marketplaces
 2016-09-02 17:12:05 -07:00
David Rowe
980df19db1 Merge branch 'master' into 21040 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2016-09-03 11:38:27 +12:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213 First pass of keyboard raising and lowering 2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
cf242eca9f Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet 
Marketplace tablet is a bit larger and lower DPI.
 2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205 avoid having auto-unequip code trigger during a teleport 2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed avoid a bootstrap 2016-09-01 17:51:02 -07:00
Seth Alves
da35281941 don't assume collides-with-dynamic during a multi-grab 2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d if a hand is disabled while holding something, release it 2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c include which hand in grab messages 2016-09-01 14:58:37 -07:00
Seth Alves
045042a9c6 don't disable grabbing when teleporting 2016-09-01 14:15:49 -07:00
Seth Alves
a35e527128 try to fix far-trigger 2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6 don't do auto-release test unless the hand is equipping 2016-09-01 09:57:46 -07:00
Anthony J. Thibault
823420ae0a Working web entity keyboard 
* Missing many keys
* Does not dynamically appear and disappear
 2016-08-31 17:57:13 -07:00
elisa-lj11
bebf9c5890 Added error feature when user tries to download a non fbx file 2016-08-31 17:46:35 -07:00
Seth Alves
47259ee053 find equip-points with controller position rather than hand 2016-08-31 16:52:46 -07:00
Seth Alves
21b4759b6d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-31 10:27:44 -07:00
Ryan Downe Karpf
6c853ec77d Merge pull request #8538 from AndrewMeadows/workaround-resolvePath 
workaround for Script.resolvePath() bug
 2016-08-31 08:59:14 -07:00
Andrew Meadows
12e6920a8d fix syntax error 2016-08-31 08:15:00 -07:00
elisa-lj11
d16ef521f4 fixed merge conflicts from Howard's webview fix 2016-08-30 15:33:59 -07:00
elisa-lj11
aceddb0cf8 merge with james repo 2016-08-30 15:07:01 -07:00
Seth Alves
78f54a7f33 get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away 2016-08-30 14:39:11 -07:00
Seth Alves
617880479a Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2 ignoreIK for equipping. change how auto-unequip searches 2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam 
When trigger is pulled, snap search beam to correct length instead of animating
 2016-08-30 11:13:58 -07:00
elisa-lj11
37cc50a14a Merge remote-tracking branch 'highfidelity/master' into marketplaces_html 2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b Merge remote-tracking branch 'origin' into marketplaces_html 2016-08-30 10:42:56 -07:00
Seth Alves
f4eee8d480 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-30 09:12:53 -07:00
elisa-lj11
f2e61aa504 added status bar to marketplace 2016-08-29 18:43:32 -07:00
Seth Alves
314b7617ac Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events 
Bug fix for click events received by entity scripts
 2016-08-29 17:57:56 -07:00
James B. Pollack
2b2b2ecbac caps 2016-08-29 17:44:33 -07:00
James B. Pollack
d3aad53e0e cleanup 2016-08-29 17:43:32 -07:00
Andrew Meadows
2d8bb54b93 fix typo 2016-08-29 17:37:24 -07:00
James B. Pollack
2a12f2feae marketplaces html 2016-08-29 17:27:39 -07:00
Andrew Meadows
b50d24fb00 don't use Script.resolvePath() in local functions 2016-08-29 17:11:29 -07:00
Anthony J. Thibault
e34aecde49 Bug fix for click events received by entity scripts 
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
 2016-08-29 16:21:39 -07:00
James B. Pollack
cceae50b90 no more delete with backspace 2016-08-29 14:28:05 -07:00
James B. Pollack
95c627aa71 dev 2016-08-29 14:24:36 -07:00
Anthony J. Thibault
3ed11d2e5f When trigger is pulled, snap search beam to correct length instead of animating. 
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
 2016-08-29 13:22:57 -07:00
Anthony J. Thibault
dcd91d4398 removed debug flag 2016-08-29 12:04:48 -07:00
Anthony J. Thibault
0f42943bfb Marketplace tablet is a bit larger and lower DPI. 
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
 2016-08-29 11:55:04 -07:00
Seth Alves
be1332532f disable debugging prints 2016-08-29 03:39:52 -07:00
Seth Alves
5daf334a0e avoid extra grab-point spheres when resetting scripts 2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef keep near-grab radius small but still allow large equip hotspots 2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76 don't show grab-point sphere when near grabbing or equipping 2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0 handle another type of abandoned grab 2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7 don't leave stray blue search sphere when near-grabbing 2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand 2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4 fix code that notices and fixes an abandoned grab 2016-08-27 16:00:27 -07:00
Seth Alves
e4b2b7158f hotspots with large radius work correctly, again 2016-08-27 09:30:26 -07:00
Seth Alves
76b72e32f0 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-27 09:06:45 -07:00
David Rowe
06f0e76647 Merge branch 'master' into 21040 2016-08-27 14:31:28 +12:00
David Rowe
0d1daecf12 Provide count of textures for entity items 2016-08-27 12:13:34 +12:00
James B. Pollack
264176dac6 css 2016-08-26 14:21:32 -07:00
James B. Pollack
382cbd0a73 start 2016-08-26 14:16:37 -07:00
James B. Pollack
53a2281918 better 2016-08-26 11:57:15 -07:00
James B. Pollack
f6bd04780d add a print to catch errors 2016-08-26 11:56:40 -07:00
James B. Pollack
4c63ad1ac8 code cleanup 2016-08-26 10:19:31 -07:00
David Rowe
a0691a581c Fix sense of column sort order indicators 2016-08-26 18:18:52 +12:00
David Rowe
f55d1f7ce7 Make new columns sortable 2016-08-26 17:56:23 +12:00
David Rowe
6de335e1b1 Column heading text and glyphs 2016-08-26 17:24:25 +12:00
David Rowe
1147adae78 Add columns in entity list for render performance information 2016-08-26 15:16:23 +12:00
Seth Alves
acb04a0bc9 don't add children of controller joints until we know our avatar ID 2016-08-25 19:09:10 -07:00
James B. Pollack
ee190db5eb some comments 2016-08-25 16:27:58 -07:00
James B. Pollack
9be073cc12 handle some more cases 2016-08-25 16:03:12 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Seth Alves
948b4b7a15 in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity 2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde grab-point sphere is a child of controller joint, so it doesn't jitter 2016-08-25 13:31:07 -07:00
Seth Alves
cab30651d0 cleanups 2016-08-25 09:47:14 -07:00
Andrew Meadows
a0911d2b9d add local scope wrappers to new default scripts 2016-08-25 09:04:06 -07:00
Andrew Meadows
fefe5e30ec don't use globals and remove double definitions 2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Anthony J. Thibault
c234f1b65d marketplace.js: merge fix for WebTablet.js path 2016-08-24 16:26:53 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
James B. Pollack
d9ebad7976 Merge pull request #8372 from elisa-lj11/zip_project 
Added Clara.io to the marketplace
 2016-08-24 15:53:58 -07:00
Ryan Huffman
4897d721c3 Merge pull request #8505 from imgntn/json_editor 
New Editor for UserData JSON
 2016-08-24 15:49:32 -07:00