Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 02:28:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49558 commits 25 branches 0 tags 1.1 GiB
Commit graph

1146 commits

Author SHA1 Message Date
Howard Stearns
7c92ad5ced checkpoint 2016-12-13 09:15:28 -08:00
David Rowe
4890e92733 Start at HiFi marketplace page instead of directory page 2016-12-14 00:12:52 +13:00
David Rowe
8195393205 Fix Clara marketplace button appearing on top of navigation footer 2016-12-13 22:54:19 +13:00
David Rowe
20623ebddb Raise and lower keyboard on password fields 2016-12-13 22:48:17 +13:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
howard-stearns
712543a39a Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55 pal prototype 2016-12-12 16:37:16 -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
Chris Collins
4ce1bb3abc Merge pull request #9172 from thoys/avatarFinderBeacon 
avatarFinderBeacon.js -- Find other avatars more easily
 2016-12-12 15:25:36 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -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
14ecb24986 Remove extra browse history item created by Clara download 2016-12-11 17:43:55 +13:00
David Rowe
c87149cfc2 Tidying 2016-12-10 12:59:01 +13:00
Thijs Wenker
3ec06b1a6e Remove redundant parentheses 2016-12-10 00:21:20 +01:00
Thijs Wenker
4d467deb5e Fix if statement to match style rule 4.2.8 2016-12-09 21:26:59 +01:00
Thijs Wenker
3f9aa00fd6 Increased show-radius to 20 meters 2016-12-09 19:39:48 +01: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
Thijs Wenker
9397108b3b clear -> cleanup typo 2016-12-09 03:14:05 +01:00
Thijs Wenker
3ceac7d071 Fix for "cannot access member `sessionUUID' of deleted QObject" error 2016-12-09 02:44:43 +01:00
Thijs Wenker
28e8bb69ec ignore camera man 2016-12-09 02:29:21 +01:00
Thijs Wenker
387f73b349 reset avatar beacons on domain change 2016-12-09 02:11:05 +01: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