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

1704 commits

Author SHA1 Message Date
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
1eb7b668bf merge from upstream 2017-01-17 09:33:49 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal 
Manage audio interval timer in PAL
 2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
Seth Alves
23ea65e2b5 more changes to handle camera-relative-controller joints. 2017-01-16 10:26:16 -08:00
Seth Alves
b617b3a114 put code to delete prim-stylus tip back in 2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
4a451e95dc don't call release when off state is entered. don't attempt to unhook stylus as a stray child 2017-01-15 11:29:29 -08:00
Seth Alves
b8234ad75c try a different way of keeping track of original parentIDs of grabbed entities 2017-01-15 10:16:28 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL 
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
 2017-01-14 12:57:00 -07:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Seth Alves
e00814dd53 auto-end a near-grab if the parentID is changed to something else 2017-01-13 14:21:44 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
9430d2a58d get marketplace-in-tablet working again 2017-01-13 11:03:02 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00
David Rowe
ad5822d96d Fix first progress message box not closing 2017-01-13 12:26:42 +13:00
David Rowe
632989e031 Fix progress messages not displaying in HMD 2017-01-13 12:09:22 +13:00
Seth Alves
b4870a14fa Merge pull request #9372 from druiz17/removeHud 
Completely removed HUD
 2017-01-12 14:24:40 -08:00
David Rowe
6f2386eabd Fix processing of Clara.io status messages 2017-01-13 11:20:00 +13:00
Seth Alves
9c148d2be0 Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release 
make sure dynamic things are moving at least a little upon release
 2017-01-12 13:46:50 -08:00
Seth Alves
611a926894 if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet 2017-01-12 13:45:03 -08:00
Dante Ruiz
71083645e9 branch update 2017-01-12 20:51:25 +00:00
David Rowe
4dee0efdd3 Use more reliable Clara.io API parameters 2017-01-13 09:12:49 +13:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
Dante Ruiz
7d84aae670 closing tablet when taking snapshot 2017-01-12 17:29:38 +00:00
David Kelly
e36f6b6521 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-12 08:40:04 -07:00
David Rowe
d45e6f00cb Prepare only one download at a time 2017-01-12 22:35:42 +13:00
David Rowe
288c069687 Make cancelling downloads more robust 2017-01-12 22:31:09 +13:00
David Rowe
6e622b3719 Don't request model be centered as work-around for downloads failing 2017-01-12 21:35:24 +13:00
David Rowe
cbe8ce0c19 Improve handling of zip file generation failing 2017-01-12 21:33:32 +13:00
David Rowe
9587b6a80e Fix initial marketplace URL 2017-01-12 20:53:57 +13:00
David Rowe
37da800a14 Display Clara model preparation progress 2017-01-12 15:47:41 +13:00
howard-stearns
88c2c534ad don't set bogus values 2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628 remove log spam 2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732 use update signal instead of timer 2017-01-11 16:24:05 -08:00
howard-stearns
357b4db1db fix mouse vs lasers, again 2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749 revert "fix competition between seek mouse and lasers" 2017-01-11 14:23:18 -08:00
David Kelly
1e3a00d1fb Enable the LT and RT signals, use them 
A bit cleaner.  Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
 2017-01-11 14:43:37 -07:00
David Rowe
9bdcdf73c1 User must be logged into Clara.io site to download 2017-01-12 09:15:01 +13:00
Seth Alves
c76987c179 Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling 
update lasers when distance-scrolling a web entity/overlay
 2017-01-11 10:45:25 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Dante Ruiz
2d8d5401dc updated tablet position 2017-01-11 08:41:07 -08:00
David Rowe
71d6a5cb1d Implement model request and download 2017-01-11 21:33:03 +13:00
David Rowe
530b176d09 Replace Clara download button with own 2017-01-11 16:36:18 +13:00
David Kelly
0a018e133d Blue laser should be enough to hover 2017-01-10 18:23:39 -07:00
Seth Alves
c93d83dadd update lasers when distance-scrolling a web entity/overlay 2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1 removed committed code 2017-01-10 23:26:37 +00:00
David Kelly
4fade3a53e CR feedback 2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c minor tweak to hover color for glow effect 2017-01-10 16:00:19 -07:00
Dante Ruiz
d0baa0e303 home button works with the stylus 2017-01-10 14:51:46 -08:00
David Kelly
2d55ed2658 Fix hover - probably my merge didn't get this line 2017-01-10 15:51:24 -07:00
druiz17
ad48e79053 Merge pull request #9346 from hyperlogic/tablet-ui 
In desktop mode, tablet is in front of camera.
 2017-01-10 14:48:15 -08:00
David Kelly
17333ee307 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-10 15:24:31 -07:00
druiz17
85c143e64d Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch 
remember previous parentID in the script and try to put it back when releasing
 2017-01-10 14:08:08 -08:00
David Kelly
5c6ae6fe95 HMD hover working now 
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events.  Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
 2017-01-10 14:47:34 -07:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c Merge pull request #9343 from druiz17/menuApp 
Moved the context menu to the tablet
 2017-01-10 13:34:44 -08:00
howard-stearns
e67675ac36 color nodes by audio level 2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e store audio level in overlay data object (so that they gc properly and we 
have the data to color with).
 2017-01-10 13:08:07 -08:00
Seth Alves
0fc1abc068 remember previous parentID in the script and try to put it back when releasing 2017-01-10 13:00:49 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera. 
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
 2017-01-10 11:31:45 -08:00
Seth Alves
bff9e9be38 put back code that replaces previous parentID on release 2017-01-10 09:22:36 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1 first commit 2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
Seth Alves
61f0c56a36 remove code that remembers previous state in userData 2017-01-09 14:20:03 -08:00
Faye Li Si Fi
32eda3a49c redo 2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e undo 2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d set showKeyboardHighlight to false when initialising tablet 2017-01-09 13:36:58 -08:00
Seth Alves
fa803aebe9 use /~/ style to reference includes 2017-01-09 10:21:07 -08:00
David Kelly
fef8c8900f Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-09 08:51:42 -07:00
David Kelly
409e785aa3 fix un-hover, add some comments 2017-01-09 08:42:43 -07:00
David Kelly
5eff12af34 add hover effect to PAL 2017-01-06 18:09:23 -07:00
Dante Ruiz
7205215baa coding standard fix 2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d fixed bug 2017-01-07 00:22:55 +00:00
Dante Ruiz
4ef5c76a65 fixed issues 3.0 2017-01-07 00:08:53 +00:00
Dante Ruiz
55e7b46790 fixed issues 2.0 2017-01-07 00:07:38 +00:00
Dante Ruiz
cec2692c77 fixed issues 2017-01-07 00:06:42 +00:00
Dante Ruiz
32938861cd indentation fix 2017-01-07 00:03:04 +00:00
Dante Ruiz
31e57a0dcd update branch 2017-01-06 15:35:32 -08:00
Dante Ruiz
19c6a672d9 re-did tablet position 2017-01-06 15:35:32 -08:00
Seth Alves
20a84e7288 Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers 
Tablet ui reenable web lasers
 2017-01-06 15:23:16 -08:00
Seth Alves
ad6175857d Merge pull request #9328 from hyperlogic/tablet-ui 
Allow Hifi.SoundEffect to be used in all qml
 2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml 
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
 2017-01-06 14:01:13 -08:00
Seth Alves
d32866c8cd Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-06 13:32:47 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
Howard Stearns
36c99a604b Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal 
Edit button to select in pal
 2017-01-06 13:17:29 -08:00
Clément Brisset
48459be13c Merge pull request #9312 from ZappoMan/fixMouseLasers 
fix competition between seek mouse and lasers
 2017-01-06 13:11:01 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00
howard-stearns
b149fa3d79 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-06 10:21:22 -08:00
David Kelly
a107b2f06e lost my - sign 2017-01-06 08:44:22 -07:00
David Kelly
88ed96918a Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL 2017-01-05 18:30:28 -07:00
David Kelly
4504b31c1d Bugfix, plus minor cr stuff 
Seems to solve the 'due north' issue - we now have the main overlay as
the sphere, and it is the only thing clickable.  The model is no longer
clickable, so you cannot click clouds to select things.  Prevents some
confusion when opaque objects have ignoreRayIntersection, allowing you
to select a cloud you cannot see (i.e clicking near but not on the
sphere you can see).
 2017-01-05 18:20:40 -07:00
howard-stearns
83685740c4 change wording for common case 2017-01-05 16:37:40 -08:00
howard-stearns
f5c4535115 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 16:29:34 -08:00
Seth Alves
4b3a5171d3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-05 15:43:46 -08:00
Seth Alves
2bff5582bc Merge pull request #9321 from hyperlogic/tablet-ui 
Made back button entity collisionless
 2017-01-05 15:43:14 -08:00
David Kelly
1f3c2bb271 Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL 2017-01-05 16:35:47 -07:00
Anthony J. Thibault
baf2fce2c3 Made back button entity collisionless 2017-01-05 15:33:21 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
Anthony J. Thibault
f63ee4ffe0 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:06:35 -08:00
Seth Alves
bacaadc7ca Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-05 14:35:14 -08:00
Seth Alves
195b92d05d lasers on webpage work again 2017-01-05 14:35:02 -08:00
David Kelly
ef92a091b2 node overlay model now an asset 2017-01-05 15:19:09 -07:00
David Kelly
c95e880677 scale offsets to avatar height 2017-01-05 15:04:40 -07:00
Dante Ruiz
879fb93def bug fixed 2017-01-05 22:00:09 +00:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Anthony J. Thibault
85de0d3bbf Added local only spatialized button click sounds to tablet 2017-01-05 13:54:06 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
David Kelly
2949560e90 Corrected lame math error 
so we are centered now, and put the overlay up a bit higher.  Still need
to make that scale properly with avatar size.
 2017-01-05 14:22:35 -07:00
Seth Alves
5e9c37777c Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers 2017-01-05 12:50:07 -08:00
Seth Alves
52ef22770b make showing of stylus be proximity based rather than raypick based 2017-01-05 12:49:50 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub
cb69e70781 fix competition between seek mouse and lasers 2017-01-05 11:31:50 -08:00
David Kelly
75aa32ac6a remove some debugging crap 2017-01-05 12:01:55 -07:00
David Kelly
d5e6afa15a slightly further forward, a little bigger 2017-01-05 11:54:50 -07:00
Anthony Thibault
c972e9ac51 Merge pull request #9301 from fayeli/tablet-button-states 
Tablet Button Active State's Text and Icon
 2017-01-05 10:00:10 -08:00
David Kelly
f1d6335a24 First stab at making PAL avatar highlighting a bit prettier 
Working around rendering issues with model-based overlays and the
drawInFront, we use 2 overlays.  One is the model, another is
a sphere with drawInFront on.  Still need to dial in colors and sizes
but this should be close enough for iteration.
 2017-01-05 10:18:58 -07:00
Howard Stearns
12fffe8530 messages 2017-01-04 20:37:56 -08:00
Brad Hefta-Gaub
368f48f0a7 Merge pull request #9247 from huffman/feat/tutorial-touch-grip 
Add support for new Touch grip mappings to tutorial
 2017-01-04 17:58:05 -08:00
howard-stearns
9709bedca7 checkpoint 2017-01-04 16:55:58 -08:00
Seth Alves
a585d43a5e attempt to get laser-based web scrolling to work, again 2017-01-04 16:51:47 -08:00
howard-stearns
97780ac97e color, infront 2017-01-04 16:09:15 -08:00
Seth Alves
fb4263de93 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-04 16:01:06 -08:00
howard-stearns
d78b7d9a28 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy 2017-01-04 15:48:45 -08:00
Seth Alves
ed934c37ae put code that allows lasers vs web entities or overlays back in 2017-01-04 15:23:55 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
675159be45 Last commit to fix final bugs 2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4 Bugfix re: population; remove user image for now 2017-01-04 14:06:51 -08:00
Zach Fox
03fbfc85f9 Short delay before populating PAL when changing domains 2017-01-04 13:50:37 -08:00
Zach Fox
c695878025 Clear local ignored list upon domain change 2017-01-04 13:31:16 -08:00
Faye Li Si Fi
934b56bd50 replace redundant toggle logic 2017-01-04 12:41:49 -08:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Faye Li Si Fi
475430c1e0 testing new active state with mute.js 2017-01-04 12:25:27 -08:00
howard-stearns
c79c489002 selecting user in pal shows entities lastEditedBy user this session 2017-01-04 11:19:32 -08:00
Dante Ruiz
4dd8a8aa0d added new model 2017-01-04 11:09:27 -08:00
Dante Ruiz
3f34cb863e removed whitespace 2017-01-04 11:09:26 -08:00
Dante Ruiz
f81402fb0f improved tablet position 2017-01-04 11:09:26 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Anthony Thibault
9502a8b0c4 Merge pull request #9294 from fayeli/tablet-mic-level 
Audio level calculation in tabletUI.js
 2017-01-03 16:12:04 -08:00
Faye Li
fc186a281f update audio bar only when tablet is shown 2017-01-03 14:37:25 -08:00
Faye Li
4391e9eaee send the mic level from js 2017-01-03 12:57:08 -08:00
Brad Hefta-Gaub
d440532cff make sure RPC is timely 2017-01-03 11:10:07 -08:00
Anthony Thibault
c201b6a7f9 Merge pull request #9256 from druiz17/moreButtons 
all hub button now on tablet
 2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Faye Li
656ddfe287 audio level calculation in tabletUI.js 2017-01-03 09:27:33 -08:00
Brad Hefta-Gaub
82ab8635d7 debugging 2016-12-30 12:02:48 -08:00
Zach Fox
f26b7c0134 Checkpoint 2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub
7c7d239e00 first cut at using wait signals to improve RPC timing 2016-12-30 09:13:21 -08:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -08:00
Zach Fox
bb2b48d424 Getting very close. 2016-12-29 11:35:20 -08:00
Zach Fox
af1c67a252 Progress! 2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283 First steps, holding off til Howard finishes 2016-12-28 15:12:21 -08:00
howard-stearns
768b747b3a Make avatar go away when ignored, even when pal is up. (But currently, it 
comes back!)
 2016-12-27 10:17:39 -08:00
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Zach Fox
72da05bb30 Merge pull request #9268 from zfox23/PalRefresh 
Add PAL refresh button
 2016-12-23 15:16:51 -08:00
David Kelly
68fb81902b Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal 
Working VU meters in PAL
 2016-12-23 13:24:38 -08:00
David Kelly
5065f027e7 whitespace 2016-12-23 13:11:42 -08:00
Zach Fox
5490dddbbf Cool style changes! 2016-12-23 12:22:33 -08:00
David Kelly
9eed430f49 CR feedback 2016-12-22 18:09:19 -08:00
Zach Fox
f2bdbe051c Halve the volume 2016-12-22 16:35:12 -08:00
David Kelly
2e897e0cc9 Working first pass 
Seems roughly same as mic meter.  Works for other avatars, though
using agent avatars (crowd-agent.js + summon.js), seems not to work.

I'll investigate that...
 2016-12-22 14:01:03 -08:00
Dante Ruiz
61277c0605 Stylus now works in edit mode 2016-12-22 17:33:25 +00:00
Dante Ruiz
bf6178f500 diff minimize 2016-12-21 23:48:45 +00:00
Dante Ruiz
1753508f53 diff minimize 2016-12-21 23:31:00 +00:00
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Zach Fox
630fb8696f Lots of progress today 2016-12-21 12:48:26 -08:00
Zach Fox
7999e14ecf Kinda screwed things up by changing styles 2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833 Frequent checkpoints are good. 2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c More progress 2016-12-21 12:46:23 -08:00
Ryan Huffman
8b5a05c409 Fix right touch controller tip labels not showing up 2016-12-20 18:01:53 -08:00
Ryan Huffman
df0dfc761d Add ability to disable avatar and object scaling in handController grab 2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27 Update tutorial to use new trigger configuration for touch 2016-12-20 18:01:53 -08:00
Dante Ruiz
fa761af1a6 update#2 2016-12-20 15:39:17 -08:00
Dante Ruiz
8698ee61cd commit update 2016-12-20 15:39:17 -08:00
Stephen Birarda
ebd347fc15 only respect release of secondary for hold once pressed 2016-12-20 14:46:55 -08:00
Stephen Birarda
4fcccb5455 check for release of equip in this.nearGrabbing 2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16 return after release, duh 2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf always unequip on secondary release 2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc add special equip for oculus style grab 2016-12-20 14:21:23 -08:00
Philip Rosedale
13e03b35cc removed initial delay for seek beams 2016-12-20 14:11:52 -08:00
Philip Rosedale
250d071788 grip squeezes fingers too 2016-12-20 14:11:45 -08:00
Philip Rosedale
938734d3fc Grip controllers can grab objects, slight delay on search beam 2016-12-20 14:11:33 -08:00
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony Thibault
9d964042c9 Merge pull request #9243 from sethalves/tablet-ui-overlay-stylus-rebase 
use overlays for tablet-ui, use a stylus rather than lasers
 2016-12-20 13:42:22 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Anthony Thibault
bb56701fdb Merge pull request #9241 from druiz17/tabletMenu 
Moved some hud menus to tablet
 2016-12-20 11:13:03 -08:00
Dante Ruiz
bee6e230ae made requested changes 2016-12-20 18:28:07 +00:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4 Merge pull request #9235 from davidkelly/dk/fingerprintInPAL 
Expose Machine Fingerprint in PAL
 2016-12-20 10:06:36 -08:00
Seth Alves
ab3c833dd5 diff minimization 2016-12-20 09:23:21 -08:00
Seth Alves
36e843178a diff minimization 2016-12-20 09:21:41 -08:00
Seth Alves
d8ee4d86b0 merge from upstream 2016-12-20 08:43:19 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Dante Ruiz
fe4fa351d1 clean up 3 2016-12-20 16:04:18 +00:00
Dante Ruiz
31decffb31 clean up 2 2016-12-20 15:59:52 +00:00
Dante Ruiz
7251fa6c18 clean up 2016-12-20 15:54:14 +00:00
Dante Ruiz
74092d8714 removed commented code 2016-12-20 15:46:15 +00:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
95e2f0687d It's working! Untested on human avatars. 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
42127e4e0f Another checkpoint, getting closer 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
Ryan Huffman
bf7066d4e3 Cleanup tutorial scripts 2016-12-20 07:45:35 -08:00
Ryan Huffman
e12ef0a187 Cleanup variable naming in touch controller config 2016-12-20 07:45:35 -08:00
Ryan Huffman
04efea7293 Cleanup implementation of touch controller config 2016-12-20 07:45:35 -08:00
Ryan Huffman
6e1459f4b3 Update Touch controller configuration 2016-12-20 07:45:35 -08:00
Ryan Huffman
3dfc3946ba Fix positioning of Oculus Touch controller visual 2016-12-20 07:45:35 -08:00
Ryan Huffman
8aba8f7bf3 Remove cache buster from touchControllerConfiguration 2016-12-20 07:45:35 -08:00
Ryan Huffman
240dba5306 Fix oculus touch labels in tutorial 2016-12-20 07:45:35 -08:00
Ryan Huffman
74b07273d6 Update oculus touch labels to be emissive 2016-12-20 07:45:35 -08:00
Ryan Huffman
1ddc869c8e Fix emissive channel on touch models 2016-12-20 07:45:35 -08:00
Ryan Huffman
ac33bf4d4a Fix right touch joystick 2016-12-20 07:45:35 -08:00
Ryan Huffman
3879922e78 Reenable disabling of hand controllers 2016-12-20 07:45:35 -08:00
Ryan Huffman
53fb0a95fe Update controller display to support non-string hardware resolution 2016-12-20 07:45:35 -08:00
Ryan Huffman
b835fc7ada Add touch controller support to ControllerDisplay 2016-12-20 07:45:35 -08:00
David Rowe
8ef8de7891 Move Clara download button when displaying on tablet 2016-12-20 07:45:35 -08:00
David Rowe
2a2e8a424b Fix flash of old desktop window content if reopen after closing with "x" 2016-12-20 07:45:35 -08:00
David Rowe
df5d115db7 Fix auto-downloads not happening after forced log in 2016-12-20 07:45:35 -08:00
David Rowe
0ddc1271b2 Continuously update Clara pages because content can change dynamically 2016-12-20 07:45:35 -08:00
howard-stearns
658ae48d3f fix selection and hud-hiding issues 2016-12-20 07:45:35 -08:00
David Rowe
446a7c6a79 Reduce whitespace in Clara categories 2016-12-20 07:45:35 -08:00
howard-stearns
c60a78d727 clean up avatar nodes properly (and add some logging) 2016-12-20 07:45:35 -08:00
Howard Stearns
3ac10f5f79 deal with bubble-bounces (and comment the code a bit) 2016-12-20 07:43:48 -08:00
David Rowe
1f8323fb8f Improve robustness of navigation footer 2016-12-20 07:43:48 -08:00
David Rowe
c4ff129f86 Inform user if can't do Clara.io download because can't write to ATP 2016-12-20 07:43:48 -08:00
howard-stearns
db68a6adcd fix broken search for myself 2016-12-20 07:43:48 -08:00
Seth Alves
e5804dade0 get stylus working with web entities 2016-12-20 07:43:48 -08:00
howard-stearns
3610d5ddeb people.svg 2016-12-20 07:43:48 -08:00
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
howard-stearns
5a97156151 no debug printing 2016-12-20 07:43:48 -08:00
howard-stearns
946d9aa346 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
7e7ce0c103 checkpoint 2016-12-20 07:43:48 -08:00
Howard Stearns
b6b80fb9c1 checkpoint 2016-12-20 07:43:48 -08:00
David Rowe
0ae88c389a Start at HiFi marketplace page instead of directory page 2016-12-20 07:43:48 -08:00
David Rowe
4d35b7a736 Fix Clara marketplace button appearing on top of navigation footer 2016-12-20 07:43:48 -08:00
David Rowe
39d01b8755 Raise and lower keyboard on password fields 2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76 pal prototype 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
David Rowe
f9bd03dd56 Remove extra browse history item created by Clara download 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
4ff3599351 Tidying 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
David Rowe
be0ef820ff Add "back" button to marketplaces footer 2016-12-20 07:40:28 -08:00
David Rowe
eef8c70f10 Remove e-mail message hyperlink if displaying on tablet 2016-12-20 07:40:28 -08:00
David Rowe
78c6441842 Inject navigation footer into Clara account createion page 2016-12-20 07:40:28 -08:00
David Rowe
6e0227f8f7 Improve text and robustness of marketplaces footer 2016-12-20 07:40:28 -08:00
David Rowe
2216ab6def Delete redundant code 2016-12-20 07:40:28 -08:00
David Rowe
5843185683 Tidying 2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
0ef972c1e5 Inject Clara Web page modifications 2016-12-20 07:40:28 -08:00
David Rowe
2db0b4dc59 Fix navigation bar and opaqueness of Web page 2016-12-20 07:40:28 -08:00
David Rowe
bebedd8e51 Add JavaScript event bridge for Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9 Add script injection to Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
beddad5807 Fix Web tablet screen size 2016-12-20 07:40:08 -08:00
David Rowe
1a970dbd79 Use overlay instead of entity to display tablet Web content 2016-12-20 07:38:25 -08:00
David Rowe
4bc1616c07 Fix up navigation footer fonts 2016-12-20 07:33:55 -08:00
David Rowe
fd24d12bc1 Add navigation bar to marketplace pages 2016-12-20 07:33:55 -08:00
David Rowe
57ca34f866 Fix up script injection methods 2016-12-20 07:33:55 -08:00
David Rowe
ef488ec036 Get script injection working in new marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
4dbbb08c98 Update user instructions 2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa Provide keyboard in marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
1c6cb9f905 Tidying 2016-12-20 07:33:55 -08:00
David Rowe
9dbcb94a0c Update Clara.io instructions 2016-12-20 07:33:55 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Anthony J. Thibault
a791ddcc22 Tablet can switch to a web url. 
Help button has been updated to switch to the help.html.  It doesn't look good because
the content was authored expecting landscape window, not portrait.

The API is by no means final.  But it exposes two methods to JS.

* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
  hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.

tabletTest.js and help.js have been updated to use this functionality.
 2016-12-19 17:52:19 -08:00
Dante Ruiz
fc4b4f85f4 added button to menu 2016-12-20 00:24:45 +00:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
Anthony J. Thibault
856791c11d Made TabletRoot.qml the main tablet qml file. 
This file uses a Loader node to load, Tablet.qml.
 2016-12-19 15:15:16 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
Dante Ruiz
c0e82d3e05 moving buttons to tablet 2016-12-19 13:43:49 -08:00
Anthony J. Thibault
10f9233c90 Fixed js interface after recent Tablet.qml changes 
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
 2016-12-19 12:20:56 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858 It's working! Untested on human avatars. 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -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
howard-stearns
70af96669c update pal 2016-12-16 14:59:54 -08:00
Dante Ruiz
61e2fb2366 correct indentation for HomeButton.js 2016-12-16 21:51:01 +00:00
Dante Ruiz
8f36090884 removed tabs and also remove script from host 2016-12-16 21:45:53 +00:00
Dante Ruiz
f7df9a64b2 remmoved tabs 2016-12-16 18:32:05 +00:00
Dante Ruiz
cb4b2473e1 remmoved tabs as whitespace 2016-12-16 18:30:15 +00:00
Dante Ruiz
a0a8ecc158 even more clean up 2016-12-16 17:28:02 +00:00
Dante Ruiz
f2d9f34993 more clean up 2016-12-16 17:25:38 +00:00
Dante Ruiz
889e9e854c clean up 2016-12-16 17:24:53 +00:00
Dante Ruiz
40a79867be removed unnessary comments 2016-12-16 17:24:09 +00:00
Dante Ruiz
571783b90d fixed home buttons issues 2016-12-16 09:19:22 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
David Rowe
3d6fe6efe8 Move Clara download button when displaying on tablet 2016-12-16 14:58:22 +13:00
David Rowe
18a3555453 Fix flash of old desktop window content if reopen after closing with "x" 2016-12-16 12:21:32 +13:00
David Rowe
04aef641c5 Fix auto-downloads not happening after forced log in 2016-12-16 11:45:17 +13:00
David Rowe
a7e0135a6a Continuously update Clara pages because content can change dynamically 2016-12-16 11:28:34 +13:00
Howard Stearns
ba8b585368 Merge pull request #9202 from howard-stearns/pal-proto 
People Action List prototype
 2016-12-15 13:56:12 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub
0923a79139 Merge pull request #9187 from PhilipRosedale/rescale 
Rescale yourself or entities using the grip buttons
 2016-12-15 12:32:04 -08:00
howard-stearns
0e81e71325 fix selection and hud-hiding issues 2016-12-15 11:00:32 -08:00
David Rowe
861ce2c27b Reduce whitespace in Clara categories 2016-12-15 20:33:43 +13:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -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
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
howard-stearns
66e2c651c6 clean up avatar nodes properly (and add some logging) 2016-12-14 11:26:33 -08:00
Howard Stearns
d5c219a761 deal with bubble-bounces (and comment the code a bit) 2016-12-13 19:52:27 -08:00
David Rowe
eb7b2dbdcf Improve robustness of navigation footer 2016-12-14 15:07:06 +13:00
David Rowe
2b0529bcea Inform user if can't do Clara.io download because can't write to ATP 2016-12-14 14:45:33 +13:00
howard-stearns
a50b731faa fix broken search for myself 2016-12-13 16:52:18 -08:00
howard-stearns
03d3e0b550 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-13 16:03:00 -08:00
howard-stearns
b0547750b0 people.svg 2016-12-13 15:53:45 -08:00
howard-stearns
adbfa0752a no debug printing 2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521 checkpoint 2016-12-13 15:05:08 -08:00
howard-stearns
86010af828 checkpoint 2016-12-13 13:01:45 -08:00
Jazmin
b7b4c685e7 Fixed typo 2016-12-13 11:48:06 -08:00
Jazmin
4effdd0394 Update Bubble model in script 2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e Delete old bubble model 2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b Add new bubble model 2016-12-13 11:45:50 -08:00
Jazmin
d9fbde2f66 Update bubble height 
This height allows my friends to stay in my view comfortably, even when the space bubble is on.  Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.
 2016-12-13 11:43:09 -08:00
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
Seth Alves
16128f5087 Merge pull request #9191 from druiz17/homeButton 
Home button prototype
 2016-12-12 16:27:06 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Dante Ruiz
cc0e25720e mimimize the git diffs 2016-12-12 23:29:11 +00:00
Philip Rosedale
9370c8af6b Added ability to rescale avatar 2016-12-12 15:26:53 -08:00
Dante Ruiz
6a8465a6ca removed more whitespace 2016-12-12 23:26:06 +00: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
Dante Ruiz
92993202a4 removed double variable definition 2016-12-12 23:24:56 +00:00
Dante Ruiz
ccecce77de removed unneeded whitespace 2016-12-12 23:21:14 +00:00
Dante Ruiz
737f11fb7a merge fix 2016-12-12 23:03:38 +00:00
Dante Ruiz
1b7c89c41d home button working 2016-12-12 14:34:42 -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
Seth Alves
37b179b00b remove commented-out code 2016-12-09 09:55:02 -08:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -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
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
Seth Alves
e06a445959 remove some cruft 2016-12-08 17:00:50 -08:00
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