John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
Dante Ruiz
95e14446dd
update qml file to show the current OpenVr headset
2018-03-01 09:03:52 -08:00
vladest
8dd27a1a04
Merge branch 'master' into move_to_qqc2
2018-03-01 11:20:11 +01:00
vladest
02612e0465
cleanup and fits text to buttons
2018-03-01 11:18:18 +01:00
vladest
f51025061c
Make Edit view more consistant with original one #2
2018-03-01 11:03:56 +01:00
vladest
7cbdbe9ab0
Make Edit view more consistant with original one
2018-03-01 11:02:05 +01:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
Cristian Luis Duarte
9acb83632c
Android - Make joystick move up when showing the bottom bar
2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
2018-02-28 15:55:50 -03:00
samcake
9e5ed7b905
Add more timing stats in explanded mode
2018-02-28 10:48:35 -08:00
vladest
531c4dc41d
Merge branch 'master' into move_to_qqc2
2018-02-28 11:40:46 +01:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
Howard Stearns
1fb0f898b4
Merge pull request #12505 from howard-stearns/wallet-help
...
new wallet help
2018-02-27 13:18:36 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding
...
End seeding
2018-02-27 13:18:13 -08:00
howard-stearns
30896c264b
reduced text
2018-02-27 12:04:41 -08:00
howard-stearns
53b976b400
fix typo in bank href
2018-02-27 11:46:06 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
howard-stearns
053640f216
a guess a linking bank
2018-02-27 08:36:45 -08:00
howard-stearns
ce0ae61947
Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help
2018-02-27 08:10:17 -08:00
vladest
90b891dbc3
Fix push issue due to merge errors
2018-02-27 16:42:30 +01:00
vladest
b7f146fd47
Fix clipping issues in scrolling window
2018-02-27 16:27:08 +01:00
vladest
6a5fe0d513
Merge branch 'master' into move_to_qqc2
2018-02-27 15:23:52 +01:00
Clément Brisset
2a7a71db13
Merge pull request #12477 from Atlante45/new-master
...
Merge stable back into master
2018-02-26 17:18:24 -08:00
howard-stearns
eb683d4793
mail is a link
2018-02-26 17:09:33 -08:00
howard-stearns
2f6e2f6b84
new wallet help
2018-02-26 16:52:41 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Zach Fox
0802bd2c21
Fix going to marketplace main page from WalletChoice
2018-02-26 14:27:59 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
Zach Fox
8223ebf393
Correctly handle referrer from WalletChoice
2018-02-26 12:44:41 -08:00
howard-stearns
4e4aebc7ee
get WalletChoice setup flow from My Purchases and confirmation. Still
...
not correct referrer.
2018-02-26 12:02:56 -08:00
John Conklin II
4feea929ce
Merge pull request #12449 from misslivirose/fix/atp-collisions
...
change default add to world shape for asset browser
2018-02-26 11:15:01 -08:00
howard-stearns
2de72c125d
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 10:54:22 -08:00
John Conklin II
e586a35d38
Merge pull request #12489 from vladest/fix_table_sort_indicator
...
Make sure sort indicator is attached to the right of title
2018-02-26 10:33:27 -08:00
howard-stearns
a5cedde3c8
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
...
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -08:00
howard-stearns
30a6cca4b3
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 09:26:09 -08:00
howard-stearns
dee3df5299
remove debugging
2018-02-25 15:26:18 -08:00
howard-stearns
300f611c47
working, with soft reset
2018-02-25 14:06:06 -08:00
vladest
931696322f
Fixed stucked mouse pointer in QQC2 toolbar mode
2018-02-25 08:58:05 +01:00
vladest
62f2ba0dad
More intellectual calculation of title positions taking in account actual sort indicator glyph size
2018-02-24 09:32:08 +01:00
vladest
b1070f85f0
Merge branch 'master' into move_to_qqc2
2018-02-24 02:59:40 +01:00
howard-stearns
726c1ed816
receiveAt with new key
2018-02-23 17:05:46 -08:00
Zach Fox
fe515e949b
New UI for new HFC users
2018-02-23 16:36:20 -08:00
Zach Fox
cc98eb6424
Fix lightbox stuck
2018-02-23 16:14:42 -08:00
howard-stearns
f66e688f41
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f
almost working
2018-02-23 16:12:01 -08:00
Zach Fox
47b25740de
Update commerceLightBox
2018-02-23 15:23:51 -08:00
howard-stearns
34253082d4
always reset when asked
2018-02-23 15:11:08 -08:00
Zach Fox
432e647f7a
Fix 'What's This' link
2018-02-23 15:08:33 -08:00
howard-stearns
3c2626894c
fixes
2018-02-23 14:54:03 -08:00
howard-stearns
050df2ac2a
merge
2018-02-23 14:46:13 -08:00
Zach Fox
9b54ab1080
UI changes, V1
2018-02-23 14:42:05 -08:00
howard-stearns
09091d29f7
more logic framework
2018-02-23 14:35:30 -08:00
howard-stearns
84f9bff330
basic element, but not pretty and not functioning
2018-02-23 13:56:56 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Alexander Ivash
f9de255fa7
FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials
2018-02-23 20:07:09 +03:00
vladest
b8102cfbd7
Make sure sort indicator is attached to the right of title
2018-02-23 10:06:16 +01:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes
...
Android ui fixes
2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
Zach Fox
249f0568a1
New loader
2018-02-22 17:14:23 -08:00
howard-stearns
1aaae94cc1
checkpoint
2018-02-22 17:04:27 -08:00
Zach Fox
e3ccfc9935
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps
2018-02-22 16:39:26 -08:00
Zach Fox
f14673bc50
Fixup Checkout for apps
2018-02-22 16:38:38 -08:00
Zach Fox
33f73fef0d
YAY!
2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346
It's working!
2018-02-22 16:09:01 -08:00
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1
...
Commerce: Extended Certificate Support, V1
2018-02-22 15:19:57 -08:00
Atlante45
7bad82818b
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-02-22 14:45:41 -08:00
Zach Fox
de0eee52d6
cool
2018-02-22 14:45:32 -08:00
Zach Fox
4d2d7fa51f
lots of fun initial progress!
2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Zach Fox
3d4e6de6ab
Quick bugfix
2018-02-22 10:49:11 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs
...
Fix two bugs with Create Menu
2018-02-22 09:43:50 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
vladest
7d7c3bb1f5
Change new material dialog to QQC2
2018-02-22 10:30:42 +01:00
Liv Erickson
aba1cae36d
get rid of magic number
2018-02-21 16:19:50 -08:00
Liv Erickson
990e848de6
fix typo that was breaking popup dialog
2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a
Initial fix - need a little style fixing
2018-02-21 15:44:23 -08:00
Gabriel Calero
2d4bb3bad3
Change color to QML debug info
2018-02-21 20:23:54 -03:00
Gabriel Calero
f2ce3d0268
Fix focus hack. Add QML debug info
2018-02-21 20:10:03 -03:00
Nissim Hadar
b519ebd6f1
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-21 12:36:56 -08:00
Zach Fox
74655bde49
Fix skeletonmodelURLchanged signal
2018-02-21 12:12:20 -08:00
Cristian Luis Duarte
6411d1b35b
Android - Avoid overlapping between hint and input in Go To by clearing text when closing the window
2018-02-21 16:52:57 -03:00
Zach Fox
b548567f5a
Apps protection
2018-02-21 11:17:47 -08:00
Zach Fox
1fbc16aae2
Fix noPermissionGlyph margin
2018-02-21 10:52:17 -08:00
SamGondelman
4dde178b93
fix new material UI
2018-02-21 10:33:15 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome
...
Make sure Flickable for GridView for TabletHome will not flick
2018-02-21 09:21:45 -08:00
vladest
05fab77189
Merge branch 'master' into move_to_qqc2
2018-02-21 11:57:19 +01:00
Nissim Hadar
af484d0af6
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-20 23:48:12 -08:00
Nissim Hadar
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
Liv Erickson
5cd184ddc3
change default add to world shape for asset browser
2018-02-20 17:55:30 -08:00
Cristian Luis Duarte
00958965bc
Android- Center login dialog in both big (Pixel XL, Huawei Mate 9 Pro) and smaller screens (Pixel)
2018-02-20 19:25:41 -03:00
Zach Fox
f08c66e3ac
Remove debug code
2018-02-20 14:16:55 -08:00
Zach Fox
fd6f4b569f
Fix active focus issue
2018-02-20 13:19:31 -08:00
Zach Fox
eb29bdf5d2
Don't allow tabs or newlines
2018-02-20 13:06:10 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Zach Fox
9bde9f5a4f
Fix height of Optional Message in Send Money
2018-02-20 12:36:11 -08:00
Gabriel Calero
5e3ad3fe9a
Disable VPAD on bottom bar tapping and modes bar tapping
2018-02-20 17:20:48 -03:00
Zach Fox
11f897beb0
Initial app support
2018-02-20 10:39:36 -08:00
John Conklin II
aa67a98d02
Merge pull request #12426 from ElderOrb/FB11508
...
fix for toolbar slowly drifting on switching between HMD/Desktop modes
2018-02-20 09:30:01 -08:00
Gabriel Calero
4839a8c720
Remove Forgot labels in login dialog
2018-02-20 12:59:06 -03:00
vladest
c320761900
Merge branch 'master' into move_to_qqc2
2018-02-20 06:01:59 +01:00
Gabriel Calero
94a8aad712
Avoid keyboard appearing on startup
2018-02-19 16:52:51 -03:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
vladest
e5f953c103
Make sure Flickable for GridView for TabletHome will not flick
2018-02-17 16:52:32 +01:00
Cristian Luis Duarte
5f1fc37684
Android - Support display with smaller resolution than 1440p for Go To window
2018-02-16 18:29:22 -03:00
Alexander Ivash
2eb8ebcdbc
FB11508 - toolbar slowly sides downward
2018-02-16 20:22:16 +03:00
Zach Fox
c4e9c76258
Small UIT tweaks
2018-02-15 16:03:49 -08:00
Dante Ruiz
a194c8bc03
Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps
2018-02-15 15:46:16 -08:00
Zach Fox
811ecf9db8
Fix
2018-02-15 14:44:33 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
vladest
a500ba8f2d
Merge branch 'master' into move_to_qqc2
2018-02-15 20:42:17 +01:00
Zach Fox
b8fb08dc74
Avatar support
2018-02-15 11:24:22 -08:00
Zach Fox
3c620282b1
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea
...
PAL: Prevent opening of Availability from WebView
2018-02-15 11:10:05 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Zach Fox
5a8b8d4ac8
Lots of changes
2018-02-14 16:44:02 -08:00
Seth Alves
93d8a6f00d
Merge pull request #12402 from druiz17/fix-tablet-create-rotation
...
Fix tablet rotation when going into and out of create mode
2018-02-14 16:10:10 -08:00
Alexander Ivash
611c67bf2f
FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard
2018-02-15 02:00:51 +03:00
Cristian Luis Duarte
674af54a82
Android - Scale up Sign In and Sign Up windows.
2018-02-14 17:02:03 -03:00
vladest
d71448d217
Merge branch 'master' into move_to_qqc2
2018-02-14 20:47:37 +01:00
John Conklin II
6187731fdc
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865
...
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
2018-02-14 11:14:26 -08:00
Zach Fox
0fca843667
Integrate 'alreadyOwned' endpoint
2018-02-14 10:24:34 -08:00
Dante Ruiz
2a8101a944
Merge branch 'master' of github.com:highfidelity/hifi
2018-02-14 09:35:53 -08:00
Zach Fox
2f0c9e1acb
Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap
...
Commerce: Fix wrap mode for very long P2P memos
2018-02-14 09:14:21 -08:00
Zach Fox
a477a3da70
Done with My Purchases flow for now
2018-02-13 15:04:31 -08:00
Dante Ruiz
119a7554ee
Prevent add the same tablet url app to the tabletApps list
2018-02-13 14:33:15 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Zach Fox
3e41229e8c
Commerce: Fix wrap mode for very long P2P memos
2018-02-13 13:30:17 -08:00
Zach Fox
8cd00c49d6
PAL: Prevent opening of Availability from WebView
2018-02-13 13:21:40 -08:00
vladest
e8959b4cc0
Merge branch 'master' into move_to_qqc2
2018-02-13 22:01:16 +01:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Zach Fox
0809210dc3
No permission card
2018-02-13 11:16:48 -08:00
Dante Ruiz
cf3d8e4463
remove cached file
2018-02-13 11:07:15 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
Zach Fox
ffea8104fc
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-09 15:59:38 -08:00
Zach Fox
abdd50fb45
it's a start
2018-02-09 15:56:28 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
...
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
Cristian Luis Duarte
017f99837a
Android - Sign in, Sign up and Sign out. Note: It's still desktop scaled, being some components small for a phone
2018-02-09 17:32:13 -03:00
Cristian Luis Duarte
8c1a1eba02
Android - Fix modes bar layout when expanded
2018-02-09 17:32:13 -03:00
Cristian Luis Duarte
bb4f57f982
Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.
2018-02-09 17:32:12 -03:00
Gabriel Calero
d5e101c2e8
Add mode selector (my view / radar), not finished
2018-02-09 17:32:12 -03:00
Gabriel Calero
8093ed7c5c
Add audio bar to mute/unmute the mic
2018-02-09 17:32:12 -03:00
Gabriel Calero
a7c77a5247
Fix undefined color in address bar
2018-02-09 17:32:12 -03:00
Gabriel Calero
0f07d0b493
Add bottom bar and address dialog (Android)
2018-02-09 17:32:12 -03:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Zach Fox
ecc0a2f43b
Bugfix.
2018-02-08 10:41:22 -08:00
Zach Fox
679d53e2cf
This works, but is it correct?
2018-02-08 10:41:10 -08:00
Zach Fox
3a7e626463
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-08 10:41:04 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
Zach Fox
2270dcd79d
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-07 13:52:20 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign"
2018-02-07 13:22:09 -08:00
Zach Fox
a40244b5d2
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-07 10:19:30 -08:00
David Back
26a56f0173
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-06 16:12:30 -08:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez
e2bf8ad231
reverted to S3 for model URL
2018-02-02 15:36:28 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
...
Commerce: Send Money Nearby particle effect!
2018-02-02 14:17:48 -08:00
Elisa Lupin-Jimenez
d20ff0955c
qml doesn't work, .js might not work on osx
2018-02-02 11:26:21 -08:00
Zach Fox
f26477b3e1
Slight wording change to Optional Message placeholder
2018-02-02 11:00:32 -08:00
Zach Fox
19235b8d94
Fix a bug where hover events incorrectly propagate under popups
2018-02-02 10:50:35 -08:00
Elisa Lupin-Jimenez
73fde4333e
new local reference to image model
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d7a847930d
added image icon
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a
snapshot referenced locally, won't work on OS
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
cc4bafb46f
image entities shown as images in entity list
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
9f8e2017ce
can add image directly from asset server
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
2ff47fa454
images auto-add to asset server, started asset browser add link
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
d390e20139
removed extraneous commenting and image class
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
fdca8ab93e
added image button to edit.js, working on connecting to cpp
2018-02-02 10:08:39 -08:00
Zach Fox
dd2b7eb107
Send Money Effect & Lightbox
2018-02-01 15:17:50 -08:00
Zach Fox
fa69ea0352
Small comment addition
2018-02-01 13:57:05 -08:00
Zach Fox
ce79504f03
Fix checkbox
2018-02-01 11:51:08 -08:00
Zach Fox
268c12e47a
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-02-01 11:38:47 -08:00
Zach Fox
bd26c9dfc0
More improvements
2018-02-01 09:36:41 -08:00
Zach Fox
14051bce0c
This logic is insane
2018-01-31 17:20:20 -08:00
Zach Fox
fb5308e517
This logic is insane
2018-01-31 17:06:29 -08:00
Zach Fox
ab3a91a1da
Oooooh it's so pretty
2018-01-31 16:53:23 -08:00
Zach Fox
7879fb293f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign
2018-01-31 13:19:39 -08:00
vladest
1c63bcf02e
Merge branch 'master' into move_to_qqc2
2018-01-31 22:13:52 +01:00
Zach Fox
90c2371f0c
It's working!
2018-01-31 12:09:23 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
...
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
2018-01-31 11:19:49 -08:00
Zach Fox
8a729e3cf0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-01-31 10:54:32 -08:00
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight
...
Don't manually highlight tablet buttons from swipeview.
2018-01-31 09:33:33 -08:00
Zach Fox
05fe33e417
Initial work
2018-01-30 18:01:46 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
Zach Fox
d13d0e6ba2
Minor fixes
2018-01-30 14:30:50 -08:00
LaShonda Hopper
70e23f3ce8
[Case 10865] Bringing in multi-select fix from Desktop AssetServer.
...
Changes Committed:
modified: interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
2018-01-30 14:44:34 -05:00
LaShonda Hopper
dfdf28f37e
[Case 10865] Some cleanup for multi-selection (details below).
...
* Remove setCurrentIndex call when looping over current selection.
* Changed selectedItems var name to selectedItemCount to clarify what
it represents.
* Change path arg name to paths to clarify that there can be more
than a single path contained within it.
Changes Committed:
modified: interface/resources/qml/hifi/AssetServer.qml
2018-01-30 14:44:34 -05:00
LaShonda Hopper
5a771e3a16
[Case 10865] Ctrl/Cmd/Shift+Click Multi-Select for Asset Browser.
...
* Removes manual selectionModel update from controls-uit/Tree.qml
* This was interfering with the Key+Click functionality. It
was introduced via Commit 99617600c4
2018-01-30 14:44:34 -05:00
Gabriel Calero
999e3a39fa
Add mode selector (my view / radar), not finished
2018-01-30 14:48:37 -03:00
Gabriel Calero
7fb28f4296
Add audio bar to mute/unmute the mic
2018-01-30 14:48:37 -03:00
Gabriel Calero
7e874510e3
Fix undefined color in address bar
2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d
Add bottom bar and address dialog (Android)
2018-01-30 14:48:37 -03:00
Zach Fox
b60a45d358
Inspection Certificate Redesign
2018-01-29 15:14:29 -08:00
Dante Ruiz
be42f0cfb1
finally fix the multihighlighting
2018-01-26 13:24:44 -08:00
Dante Ruiz
f3e20e72cb
really fix multi-highlighing
2018-01-25 15:09:03 -08:00
Zach Fox
f117dd33a8
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain
2018-01-25 15:04:28 -08:00
Dante Ruiz
07842f8e54
Merge branch 'master' of github.com:highfidelity/hifi into fix-multihighlight
2018-01-25 13:30:45 -08:00
Zach Fox
afc71a5ac5
Fix Purchases sorting (again); Fix (i) icon loading
2018-01-25 12:17:34 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription
...
some settings cleanup
2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9
Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription
2018-01-25 10:39:43 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix
...
RC63 Fix Edit/Asset Browser in HMD mode
2018-01-25 09:38:23 -08:00
Zach Fox
94e1c425ab
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-24 17:03:16 -08:00
Dante Ruiz
c73c0487a0
min diff
2018-01-24 16:41:19 -08:00
Dante Ruiz
6149630ccd
don't manually highlight tablet buttons from swipeview, since the tablet button highligh themselves
2018-01-24 16:36:08 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear
...
Fix security image index clear after back nav
2018-01-24 13:43:49 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter
...
Fix the text filter in My Purchases
2018-01-24 08:42:55 -08:00
luiscuenca
29dd24b05f
Fix GoTo app in HMD mode
2018-01-23 15:50:32 -07:00
Zach Fox
1920bedaf3
Fix the text filter in My Purchases
2018-01-23 13:42:38 -08:00
luiscuenca
fddbf13796
Fix Asset Browser access from Create
2018-01-23 11:12:22 -07:00
Zach Fox
86ce9766f3
Fix security image index clear after back nav
2018-01-23 10:11:23 -08:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
vladest
9fa6b8da6a
Merge branch 'master' into move_to_qqc2
2018-01-22 21:45:34 +01:00
vladest
b947504849
Merge conflicts
2018-01-22 21:42:32 +01:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI
...
Updated UI to fit Toolkit Standards
2018-01-22 10:30:48 -08:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2
...
Commerce: Pixel-perfect "Send Money" UI
2018-01-22 09:39:23 -08:00
ZappoMan
4ad5d34a10
more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel
2018-01-20 17:20:42 -08:00
Zach Fox
1dde640a40
-_-
2018-01-19 16:06:01 -08:00
Zach Fox
89e403d438
Balance text in send money
2018-01-19 15:39:57 -08:00
RebeccaStankus
5db5f24043
Updated UI to fit Toolkit Standards
2018-01-19 14:52:44 -08:00
Zach Fox
4d408a8df5
Nearby UI
2018-01-19 14:49:28 -08:00
vladest
e7a035f954
Fix indent
2018-01-19 23:01:41 +01:00
vladest
c235deb6f0
Merge branch 'master' into move_to_qqc2
2018-01-19 23:01:04 +01:00
Triplelexx
4c27538fa2
change file dialog keyboard navigation
...
Allowed navigating with keyboard to home and up buttons in file dialog.
2018-01-19 12:30:00 +00:00
Triplelexx
f1147948cb
add focused color to GlyphButton
2018-01-19 12:28:27 +00:00
Triplelexx
44740d5716
add sound on button focus changed
...
Feels more consistent with hovering
2018-01-19 12:27:49 +00:00
Triplelexx
e69fdba6ad
add padding to sorting glyph
...
the file dialog sorting glyphs are clipping on the right margin for me, adding 10 extra pixels fixes it
2018-01-19 12:18:29 +00:00
Zach Fox
495c4f56e2
Only small tweaks remaining?
2018-01-18 17:51:08 -08:00
Triplelexx
faf18fcaa8
improve file dialog navigation
2018-01-19 01:49:24 +00:00
Zach Fox
6b5389a167
go go go go go
2018-01-18 17:37:26 -08:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Zach Fox
c6429f4f33
Path towards pixel perfection
2018-01-18 17:05:36 -08:00
David Kelly
2e4fc5e58c
Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory
...
nearby hfc transfers should send the location
2018-01-18 16:46:34 -08:00
David Kelly
844ec6a863
eliminate dash in history, replace with 0 HFC
2018-01-18 16:02:40 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub
77837e2cf0
Merge pull request #12194 from misslivirose/feat/exp-gif
...
change ImageOverlay to use AnimatedImage instead of Image
2018-01-18 14:57:39 -08:00
David Rowe
13bbd1fcbf
Update places feed to use new function
2018-01-19 10:10:33 +13:00
Triplelexx
cede8ed597
add focused color
...
keyboard navigation uses focusedColor
2018-01-18 19:56:55 +00:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
David Back
d4db63f8f8
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-17 17:02:29 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1
...
Commerce: P2P Transfer Iteration 1
2018-01-17 16:41:56 -08:00
Liv Erickson
88ba5e5a00
change ImageOverlay to use AnimatedImage instead of Image to support .gif files in image overlay objects
2018-01-17 13:45:56 -08:00
Seth Alves
8edded7059
Merge pull request #12164 from ctrlaltdavid/21695
...
Remove old ToolWindow code
2018-01-17 13:43:59 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Zach Fox
8cc427a374
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 15:07:53 -08:00
Zach Fox
8cc5a0a7cb
Add UserInfoViewer
2018-01-16 15:06:51 -08:00
David Kelly
a9fc63da4c
fix error when pending
2018-01-16 15:04:05 -08:00
Zach Fox
d64b35729f
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 13:44:29 -08:00
vladest
b3b7a7636f
Merge branch 'master' into move_to_qqc2
2018-01-16 21:08:49 +01:00
David Kelly
d8f8f9ff1a
First cut at alan's new design
2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable
...
Merge stable (RC62) to master
2018-01-16 11:01:07 -08:00
Zach Fox
6b90ceaeb4
Quick bugfix and code change for clarity
2018-01-16 10:40:51 -08:00
Melissa Brown
991dad18ba
Merge pull request #12160 from ElderOrb/FB11241
...
FB11241 Changing options in menu causes the title “Menu” to change to…
2018-01-15 10:46:37 -08:00
Zach Fox
f7ed8c10fa
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-15 10:13:07 -08:00
Brad Davis
bee869d88e
Merge remote-tracking branch 'upstream/master' into android
2018-01-14 13:53:47 -08:00
Zach Fox
bd3474de68
Merge pull request #12166 from zfox23/fixSnapshotSocialSharing
...
Fix social media sharing buttons on Snapshot app
2018-01-12 15:52:56 -08:00
Zach Fox
e627925bd3
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 15:14:42 -08:00
Zach Fox
522007af9d
Fix social media sharing buttons on Snapshot app
2018-01-12 14:58:14 -08:00
David Kelly
579a4d85b3
Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory
2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
David Rowe
1fa31d3c10
Remove old ToolWindow code
2018-01-13 10:27:43 +13:00
Zach Fox
b7f4fe2ba3
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file
...
Do not delete wallet file
2018-01-12 09:44:40 -08:00
Brad Davis
7579451c24
Merge remote-tracking branch 'upstream/master' into android
2018-01-11 23:31:45 -08:00
David Back
5d96559579
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-11 17:01:00 -08:00
Zach Fox
c216144015
Remove unnecessary comments
2018-01-11 16:21:59 -08:00
Zach Fox
464bbe5d43
Bugfixes, refactoring, and improvements
2018-01-11 15:26:51 -08:00
Alexander Ivash
11e918681a
FB11241 Changing options in menu causes the title “Menu” to change to “root”
...
note: fix is based on removing duplicated top-level menu entry from stack view
2018-01-12 02:08:10 +03:00
Zach Fox
1e608b13b2
Show username when admin (this probably isn't the way to get username
2018-01-11 14:45:43 -08:00
John Conklin II
96babdf2e2
Merge pull request #12135 from luiscuenca/palVolumeSlider
...
RC62 Pal volume slider fix
2018-01-11 13:36:03 -08:00
vladest
cff80e86b6
Temporarily disable magnification until further notice
2018-01-11 22:18:22 +01:00
vladest
45144bece6
Fix Properties does not fit in Create tab
2018-01-11 22:05:11 +01:00
Zach Fox
df58065e75
Silly bug
2018-01-11 13:02:00 -08:00
vladest
d8d12e362f
Merge branch 'master' into move_to_qqc2
2018-01-11 21:55:08 +01:00
Zach Fox
d25ef074e1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995
do not delete wallet file when things go wrong, and remove obsolete
...
reset machinery
2018-01-11 11:50:23 -08:00
Zach Fox
d577b2e9e8
Actually add the API calls
2018-01-11 11:45:43 -08:00
luiscuenca
54a1da8d73
Only mod my card
2018-01-11 11:55:28 -07:00
Anthony Thibault
8d5e7dbeff
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
...
Fix for black screen when clicking Settings from Snap app
2018-01-11 09:58:10 -08:00
vladest
b5f3631c21
Merge branch 'master' into move_to_qqc2
2018-01-11 18:54:40 +01:00
Seth Alves
363b9bfe11
Merge pull request #12127 from SamGondelman/freeze
...
Comment out TabletAddressDialog logging of long messages
2018-01-10 18:07:18 -08:00
Seth Alves
457fcd6f40
Merge pull request #12129 from SamGondelman/doubleClick
...
Move key logic from onClicked to onReleased
2018-01-10 18:03:23 -08:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI
...
Fix and improve currentAPI.js
2018-01-10 17:55:08 -08:00
Brad Davis
560fd38547
Merge remote-tracking branch 'upstream/master' into android
2018-01-10 17:31:50 -08:00
MiladNazeri
c77d2f4e58
Merge pull request #12121 from cain-kilgore/21667
...
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
2018-01-10 17:11:54 -08:00
Zach Fox
939012a2d0
Hook up the endpoints!
2018-01-10 17:10:05 -08:00
Zach Fox
0d137d62c8
HMD tweaks
2018-01-10 16:37:47 -08:00
Anthony J. Thibault
1deb75daf7
Fix for black screen when clicking Settings from Snap app
...
(cherry picked from commit d5e3b97c93
2018-01-10 16:31:51 -08:00
Zach Fox
b3e3af4ee7
Add character count :)
2018-01-10 16:23:29 -08:00
Zach Fox
260aee42a8
Improvements
2018-01-10 16:18:34 -08:00
Anthony J. Thibault
d5e3b97c93
Fix for black screen when clicking Settings from Snap app
2018-01-10 16:03:53 -08:00
Zach Fox
c15b1669b1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 15:53:23 -08:00
Zach Fox
93b15c0aa6
Payment Failure
2018-01-10 15:53:13 -08:00
Zach Fox
6812010660
The skeleton is there
2018-01-10 15:33:18 -08:00
Zach Fox
22631065e4
Serious flow state
2018-01-10 15:09:15 -08:00
Triplelexx
24f1fc3546
fix Ui keyboard navigation
...
various fixes to allow some support for keyboard navigation in message boxes and dialogs
2018-01-10 22:30:43 +00:00
Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -08:00
Cain Kilgore
104ac0ffae
Indents, man
2018-01-10 20:30:41 +00:00
Zach Fox
c5a5bddbc9
More progress
2018-01-10 12:21:12 -08:00
vladest
04d45be0a9
Merge branch 'master' into move_to_qqc2
2018-01-10 21:21:03 +01:00
luiscuenca
e54f7d5a45
Fix Pal Master Volume overlap
2018-01-10 13:03:54 -07:00
Cain Kilgore
057c708637
Spaces instead of Tabs
...
(Damnit VS Re-install!)
2018-01-10 19:24:52 +00:00
Zach Fox
e5abdc77d9
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 10:02:56 -08:00
Howard Stearns
fafc98f51c
Merge pull request #12098 from ElderOrb/FB11123
...
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
2018-01-10 10:01:15 -08:00
Zach Fox
f366fdf695
Beginnings of nearby
2018-01-10 09:58:23 -08:00
Brad Davis
fb59a0a56f
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 20:02:55 -08:00
Brad Davis
105dffebaf
Fixing UI
2018-01-09 18:36:42 -08:00
SamGondelman
c46531296f
move key logic from onClicked to onReleased
2018-01-09 18:28:54 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination
...
Commerce: Support pagination at History endpoint; improve Purchases scrolling
2018-01-09 15:57:34 -08:00
Zach Fox
5469025113
More more more
2018-01-09 15:53:25 -08:00
Zach Fox
530df5447d
Even more proress
2018-01-09 15:19:50 -08:00
SamGondelman
a42b0cf485
comment out logging
2018-01-09 14:58:23 -08:00
Zach Fox
40a3f8b31b
Progress
2018-01-09 14:13:36 -08:00
Melissa Brown
19802b33eb
Merge pull request #12109 from vladest/tablet_page_indicator
...
Page indicator visible only when pages more than one
2018-01-09 14:05:32 -08:00
Zach Fox
a6259a5ef5
Initial progress
2018-01-09 13:39:28 -08:00
Brad Davis
d6dd29b952
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 11:43:03 -08:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify
...
Tablet pagination magnify
2018-01-09 08:08:02 -08:00
Cain Kilgore
4534419e53
Merge branch 'master' of https://github.com/highfidelity/hifi into 21667
2018-01-09 09:45:28 +00:00
Cain Kilgore
f78ee7c167
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
2018-01-09 09:44:12 +00:00
Alexander Ivash
0f6b93eaea
FB11123 Make the certificate GOLD (and change title to Proof of Provenance License)
2018-01-09 03:13:31 +03:00
vladest
891663bae9
Page indicator visible only when pages more than one
2018-01-08 23:07:09 +01:00
Zach Fox
611f25d542
Improve scrolling thru My Purchases
2018-01-08 13:17:04 -08:00
Zach Fox
dcfceab078
Remove all work done on paginating purchases
2018-01-08 12:03:56 -08:00
Zach Fox
2231bf2bdd
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination
2018-01-08 11:45:20 -08:00
Zach Fox
cdd62c7119
I don't think auto-refresh and pagination of inventory is possible
2018-01-08 11:29:41 -08:00
David Back
6083978e5e
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-08 10:29:41 -08:00
Zach Fox
99510f522d
Merge pull request #12095 from ElderOrb/FB10621
...
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
2018-01-08 10:05:53 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr
2018-01-08 12:49:52 -05:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser
...
Consistent go to user
2018-01-07 11:07:39 -08:00
vladest
00b1d4b0ea
Merge branch 'master' into move_to_qqc2
2018-01-05 23:40:36 +01:00
David Back
4985c9db83
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-05 13:55:43 -08:00
vladest
02972c92f0
Merge branch 'master' into tablet_pagination_magnify
2018-01-05 19:12:13 +01:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008
...
11008 GoTo app does not focus on address bar when opened
2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
...
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
...
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963 )
2018-01-05 08:15:48 -08:00
Alexander Ivash
437b78dce5
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
2018-01-05 13:35:19 +03:00
Zach Fox
4612ef3d7c
Use atYBeginning
2018-01-04 15:41:01 -08:00
vladest
67ca76baa1
Magninfication
2018-01-04 23:11:42 +01:00
Zach Fox
14447c26a0
Prevent visual data loss
2018-01-04 13:47:31 -08:00
David Back
8f7c3d5a24
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-04 13:16:39 -08:00
Alexander Ivash
7ab7a46530
11008 GoTo app does not focus on address bar when opened
2018-01-04 23:38:10 +03:00
Zach Fox
10d494b51d
Pagination for Recent Activity
2018-01-04 12:32:30 -08:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate
...
Tablet home paginate
2018-01-03 18:12:32 -08:00
David Back
17fdf9698c
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-03 15:51:20 -08:00
David Back
cbaba86881
more texture options
2018-01-03 15:50:24 -08:00
Gabriel Calero
ef8ba1cad0
Include config.h in ResourceImageItem.cpp. Minor fixes
2018-01-03 16:40:14 -03:00
Gabriel Calero
d31346c047
Use qml engine
2018-01-03 16:40:14 -03:00
Zach Fox
6f077f3a92
Fix Security Pic Change dialog after QML security changes
2018-01-03 11:28:39 -08:00
David Back
c1757d6b45
merge
2018-01-03 10:10:12 -08:00
Zach Fox
681b5173cd
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore
...
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
2018-01-03 09:34:14 -08:00
milad
63801ce802
add .jsc, remove duplicate qmlc, and remote Utils.jsc
2018-01-02 17:15:23 -08:00
Zach Fox
917db14879
Add a link to My Purchases from Wallet Home
2018-01-02 15:26:11 -08:00
Zach Fox
47a209dc4c
Make things slightly better?
2018-01-02 13:11:00 -08:00
vladest
a84e585679
Merge
2018-01-02 21:49:00 +01:00
vladest
09c3f93c74
Switch moved
2017-12-31 15:17:44 +01:00
vladest
c953251cfe
TextField moved. Fixed sound on hovering check box
2017-12-30 19:55:52 +01:00
unknown
7531a2ef3b
map_bump wip
2017-12-29 18:00:07 -08:00
vladest
f5f19ea67f
Move RadioButton
2017-12-28 15:53:16 +01:00
vladest
2fbd0a41b1
Move Slider
2017-12-28 15:39:22 +01:00
vladest
afc3082593
Cleanup. Errors checks
2017-12-28 13:16:51 +01:00
David Back
5e45ee456c
more ka
2017-12-27 16:55:45 -08:00
vladest
35fee739c5
Use buttons index
2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez
01c1032540
fixed constant names, added another URL check
2017-12-27 10:51:58 -08:00
vladest
ffcccacfa5
Selection consistency #2
2017-12-25 23:46:06 +01:00
vladest
cb7472c270
Selection consistency #1
2017-12-25 20:14:31 +01:00
vladest
9fa78bae0d
Merge branch 'master' into tablet_home_paginate
2017-12-23 17:46:51 +01:00
vladest
a497047666
Refactored using new GridView approach
2017-12-23 17:44:26 +01:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3
...
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-22 14:31:03 -08:00
Zach Fox
ef71470d85
Small change
2017-12-21 17:03:04 -08:00
Zach Fox
2acea75db3
Commerce: Checkout Layout Revisions
2017-12-21 16:09:46 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
luiscuenca
38bfddf786
Added filter for QT autogenerated functions and integrated it to Developers menu
2017-12-21 16:26:06 -07:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
luiscuenca
54297e00a8
button size fix
2017-12-21 12:48:21 -07:00
luiscuenca
d93828f2f0
Fix an improve currentAPI.js
2017-12-21 11:50:02 -07:00
vladest
2bca0939b3
Preliminary proxy model
2017-12-21 19:32:13 +01:00
vladest
d6e1a3ea41
Merge conflicts solved
2017-12-21 09:02:04 +01:00
vladest
79f9b54f6a
Store button list in the resources section of fake item instead of C++ space
2017-12-20 22:59:07 +01:00
Zach Fox
e02e6790fe
Fix error state for Commerce passphrase TextInputs
2017-12-20 13:46:02 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel
...
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-20 09:18:10 -08:00
Zach Fox
a72ed27a25
CR feedback
2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-19 16:26:58 -08:00
vladest
012f65a87f
Merge branch 'master' into tablet_home_paginate
2017-12-19 21:40:47 +01:00
vladest
5877eeea0b
cleanup
2017-12-19 21:35:11 +01:00
vladest
1cf82b7725
SpinBox now works
2017-12-19 21:28:28 +01:00
howard-stearns
bb499000a6
trailing semicolon
2017-12-19 10:51:32 -08:00
howard-stearns
16a58ddf5a
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
2017-12-19 10:48:34 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
Zach Fox
afd3cf7045
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-18 14:08:09 -08:00
vladest
29a17d366e
Merge branch 'master' into move_to_qqc2
2017-12-18 20:57:04 +01:00
Zach Fox
e075cd79fb
Add Passphrase Auth Status data tracking
2017-12-18 11:51:12 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
vladest
38453afb3b
Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope
2017-12-18 14:56:33 +01:00
vladest
62a762b879
Merge branch 'master' into tablet_home_paginate
2017-12-16 20:32:21 +01:00
vladest
cdb9d72387
Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons
2017-12-16 20:27:19 +01:00
howard-stearns
d730b7b87b
consistent goToUser behavior in PAL, and be able to go to flying user.
2017-12-15 17:00:54 -08:00
Zach Fox
89795272c7
More security images!
2017-12-15 16:26:13 -08:00
Alexander Ivash
32acc8ad47
8992 Login window is small in tablet
2017-12-14 23:53:33 +00:00
Zach Fox
af346f2ced
Protocol change
2017-12-14 10:09:10 -08:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
Seth Alves
d3e24d3629
Merge pull request #11960 from ElderOrb/FB10334
...
10334 Unable to type in Go To app search bar after UI reappears from …
2017-12-13 09:06:53 -08:00
vladest
99a6b12828
Merge branch 'master' into tablet_home_paginate
2017-12-13 16:02:29 +01:00
vladest
2770650b65
Merge branch 'master' into move_to_qqc2
2017-12-12 18:48:41 +01:00
vladest
e052784431
Code style
2017-12-12 14:12:03 +01:00
Zach Fox
2225352b1e
Fix wallet setup
2017-12-11 17:15:15 -08:00
Howard Stearns
8e36228c12
Merge pull request #11948 from MandatoryMania/noFundsSymbol
...
Provides a nice alert in case of insufficient funds to make a purchase
2017-12-11 11:45:27 -08:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
vladest
e797f5cda0
Merge branch 'master' into tablet_home_paginate
2017-12-11 17:53:21 +01:00
vladest
cc78fc1f53
Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections
2017-12-11 17:50:16 +01:00
Alexander Ivash
cb471582e5
10334 Unable to type in Go To app search bar after UI reappears from moving Avatar
2017-12-10 01:34:03 +03:00
Zach Fox
8485503063
Merge pull request #11958 from humbletim/fix-pal-connections
...
Fix for Connections UI lockup
2017-12-08 18:34:25 -08:00
humbletim
abba85ac54
add missing colonsemi
2017-12-08 18:14:30 -05:00
humbletim
34243f4239
disable connections console.log to prevent UI lag
2017-12-08 17:10:57 -05:00
vladest
3aaf666295
Merge branch 'master' into tablet_home_paginate
2017-12-08 19:59:41 +01:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Seth Alves
eda63e5758
Merge pull request #11919 from ElderOrb/FB9706
...
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-08 07:01:00 -08:00
H Q
4ce784291c
Provides a nice alert in case of insufficient funds to make a purchase
2017-12-07 15:13:01 -08:00
vladest
9b3db0725b
Retreive buttons list from tablet proxy
2017-12-07 22:36:34 +01:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
vladest
c9f86e4b6b
Merge branch 'master' into tablet_home_paginate
2017-12-07 19:16:13 +01:00
vladest
3c11d29a7f
Something intermediate
2017-12-07 19:13:39 +01:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633
...
Fix image overlay's subImage property's width and height support
2017-12-07 09:19:43 -08:00
David Rowe
efd72be96f
Fix image overlay's subImage property's width and height support
2017-12-07 12:05:46 +13:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -08:00
Zach Fox
902064ed37
Cleanup debug stuff
2017-12-05 15:26:55 -08:00
Zach Fox
c807fc80e3
Add marketplace cta referrer
2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e
Bugfixes
2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5
Add data tracking for wallet setup
2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222
Add data tracking for purchase and rez
2017-12-05 13:09:09 -08:00
Zach Fox
c80039ea87
Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1
...
Fix gray/incorrect security image after relog
2017-12-05 11:21:06 -08:00
Zach Fox
1507620fd5
Merge pull request #11921 from ElderOrb/FB10024
...
10024 Wallet: TextField Focus Problems
2017-12-05 10:52:08 -08:00
Zach Fox
d59c9bd73a
Fix gray/incorrect security image after relog
2017-12-05 10:27:40 -08:00
luiscuenca
d70a3685b8
Clean up
2017-12-04 15:29:13 -08:00
luiscuenca
390c59b45c
Change menu and minor fixes
2017-12-04 15:29:01 -08:00
Alexander Ivash
f7328f05fb
remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface
2017-12-05 00:51:42 +03:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation
...
Call reset() on Wallet before creating new wallet
2017-12-04 13:05:36 -08:00
Alexander Ivash
8a5904373b
remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button
2017-12-05 00:04:46 +03:00
Alexander Ivash
c67ff3b5d8
10024 Wallet: TextField Focus Problems
...
note: removed excessive MouseArea-s
2017-12-05 00:03:48 +03:00
vladest
a0878298d5
Merge branch 'master' into tablet_home_paginate
2017-12-04 20:55:38 +01:00
vladest
b52163cb24
Intitial SpinBox port
2017-12-04 20:54:35 +01:00
vladest
3e118c58a1
Moved RadiButton and Slider
2017-12-04 12:51:57 +01:00
Brad Hefta-Gaub
06cf194ec7
Merge pull request #11910 from ctrlaltdavid/21626
...
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-03 18:09:17 -08:00
vladest
0f4329be69
Added keyboard support. Cleanup
2017-12-03 22:45:57 +01:00
Alexander Ivash
d60f082796
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-03 23:24:34 +03:00
luiscuenca
4030688e7a
added record wav files
2017-12-03 11:54:37 -07:00
vladest
f2d7e2f607
Merge branch 'master' into move_to_qqc2
2017-12-02 22:41:19 +01:00
vladest
e1df38784b
Merge branch 'master' into tablet_home_paginate
2017-12-02 22:40:10 +01:00
Brad Hefta-Gaub
3f705a7baf
Merge pull request #11858 from vladest/fix_tablet_scrollbars
...
Use ScrollBars from QQC2, which supports mouse and touch events
2017-12-02 12:51:14 -08:00
vladest
fd9539a9e4
Using Flickable signals to remove hover state instead of timer. No more delays
2017-12-02 13:57:12 +01:00
Howard Stearns
e2efe062fe
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh
...
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-12-01 13:57:34 -08:00
Zach Fox
ebb2e50d01
Fix month display in commerce...
2017-12-01 09:29:19 -08:00
vladest
570be69fcf
Fix warnings after apps closed
2017-12-01 09:52:45 +01:00
David Rowe
fd76c7a88b
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-01 17:40:34 +13:00
Zach Fox
24e5994f20
The nuclear option is a bad option.
2017-11-30 15:55:09 -08:00
Zach Fox
009d3a18a3
Call reset() on Ledger and Wallet before creating new wallet
2017-11-30 15:40:20 -08:00
vladest
f510b4bcd8
Swipe area expanded to whole tablet. Icons doesnt stick together anymore
2017-11-30 21:10:12 +01:00
vladest
69264a6ea8
Merge with master. Conflicts solved
2017-11-30 15:34:21 +01:00
vladest
74c002d1f5
Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events
2017-11-30 12:52:26 +01:00
vladest
dfeefe53b8
Make scroll bar handle centered on shaft. Width chaned on par with entities list html view
2017-11-30 11:40:02 +01:00
vladest
ac7a5ebc94
ComboBox: fix closing popup. Started to implement keyboard support
2017-11-30 10:39:01 +01:00
vladest
8c9e530adf
Merge branch 'master' into move_to_qqc2
2017-11-29 16:33:59 +01:00
Zach Fox
3c892920e3
Prevent seeding text from flashing
2017-11-28 17:00:15 -08:00
Zach Fox
5dc8715879
Bugfix
2017-11-28 16:14:17 -08:00
Zach Fox
489d11d5fd
Remove logging
2017-11-28 16:01:58 -08:00
Zach Fox
3e5a2addd2
Use same logic for Recent Activity
2017-11-28 16:00:46 -08:00
Zach Fox
e769d2fbc3
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-11-28 15:44:42 -08:00
vladest
7283f0127b
return back square background for scroll bars
2017-11-28 22:21:52 +01:00
vladest
94937374c5
Make selection not visible under rounded scrollbar
2017-11-28 21:33:13 +01:00
vladest
b2ec2aab15
Merge branch 'master' into fix_tablet_scrollbars
2017-11-28 20:41:07 +01:00
vladest
80eb203008
More precise handle placing. some logging added
2017-11-28 20:20:58 +01:00
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
...
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
vladest
da5090fd49
Implemented more close to QQC2 ideology
2017-11-27 19:43:17 +01:00
Menithal
693da50a68
21539: Fixed None Checkmark being on Desktop mode
2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b
21539: Updated Logic to match request
2017-11-27 07:42:18 +02:00
luiscuenca
027d2d323c
Measure tool and corrections
2017-11-26 22:28:34 -07:00
Menithal
ba1cd74ffe
21539: Moved Desktop HMD to None
2017-11-26 21:58:16 +02:00
vladest
3f0de940a4
Merge branch 'master' into move_to_qqc2
2017-11-26 10:18:44 +01:00
vladest
6136a4cea6
Rounded background
2017-11-25 10:03:56 +01:00
vladest
73a557a8a4
Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views
2017-11-24 15:58:27 +01:00
vladest
b69b580a68
Use ScrollBar from QQC2 which is supports both mouse and touch events
2017-11-23 23:08:43 +01:00
luiscuenca
5bf8367126
add resources
2017-11-22 18:17:50 -07:00
Zach Fox
fada02a76c
Merge pull request #11864 from zfox23/commerce_newHelpText
...
New Help questions/answers/link
2017-11-22 12:53:16 -05:00
Zach Fox
d2ebfbf064
New Help questions/answers/link
2017-11-21 18:55:48 -05:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
Brad Hefta-Gaub
5914f27027
Merge pull request #11706 from luiscuenca/webAudioDev_fresh
...
QML & Web generated audio now follow the client audio device selection
2017-11-21 11:29:48 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -08:00
vladest
4e38b3bace
Started working on ComboBox. Add background for scroll bar
2017-11-20 20:35:41 +01:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
vladest
f20a723a7d
Merge branch 'master' into move_to_qqc2
2017-11-20 17:04:26 +01:00
vladest
f991379c9c
Fix scroll bar
2017-11-20 17:02:34 +01:00
vladest
50ed9e2b2a
Port CheckBox to QQC2
2017-11-19 22:03:38 +01:00
vladest
6b640bd028
Resolve merge conflicts
2017-11-19 20:52:39 +01:00
Brad Hefta-Gaub
e070033ce4
Merge pull request #11793 from ElderOrb/FB9032
...
9032 - Current display mode can be deselected in the toolbar/tablet menu
2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub
ff8ca6da4c
Merge pull request #11303 from vladest/webbrowser_updates
...
Webbrowser updates
2017-11-19 11:11:09 -08:00
vladest
b21f66f666
Port PlaySampleSound to QQC2. Fix crash on press down key in scroll window
2017-11-19 20:09:07 +01:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
...
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
vladest
19f9af0576
Port avatar preferences
2017-11-18 23:03:52 +01:00
vladest
68b08f429c
Port Attachments to QQC2
2017-11-18 22:49:16 +01:00
vladest
d92f461f12
Port ControllerSettings
2017-11-18 20:44:52 +01:00
vladest
41f338e6ad
Port ScrollingWindow and TabletDebugWindow
2017-11-18 20:18:17 +01:00
vladest
c8d864465f
Merge branch 'master' into move_to_qqc2
2017-11-18 18:54:08 +01:00
vladest
34fe517c67
Merge conflicts
2017-11-18 18:48:33 +01:00
Brad Hefta-Gaub
28b75abcee
Merge pull request #11816 from druiz17/fix-bringing-up-logs
...
Fix issue of User is unable to bring up the High Fidelity Interface log.
2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Zach Fox
d31578abae
FIXME LATER! Remove mouseareas from passphrase screens
2017-11-17 15:47:02 -08:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
Zach Fox
ec16f16757
Remove debug buttons from wallet
2017-11-17 15:21:18 -08:00
Zach Fox
4cc8db8aff
Merge pull request #11843 from zfox23/commerce_fixMyItems
...
Fix 'My Items' display
2017-11-17 12:59:51 -08:00
vladest
dbd6ec0dff
Port Edit.qml to QQC2 as well as some tablet preferences compinents
2017-11-17 20:46:21 +01:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596
...
Add instructions and cursor to GOTO dialog input
2017-11-17 11:45:40 -08:00
Zach Fox
f570e3c874
Fix 'My Items' display
2017-11-17 11:27:00 -08:00
vladest
cfacf3b47d
Port web glyph button to QQC2
2017-11-16 21:58:09 +01:00
Zach Fox
7f64ede940
Fix skipping wallet setup step in certain cases
2017-11-16 11:44:52 -08:00
vladest
2aae8edde0
Merge branch 'master' into move_to_qqc2
2017-11-16 19:08:15 +01:00
vladest
b4f6c25f4d
Implement QQC1-compatible Action component
2017-11-16 19:04:35 +01:00
SamGondelman
e3aa79990b
merge with master
2017-11-16 09:45:32 -08:00
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03:00
SamGondelman
7eb22b372f
merge with master
2017-11-15 14:35:30 -08:00
Zach Fox
9f80a5f081
Merge pull request #11817 from zfox23/commerce_rezFix
...
Fix rezzing non-JSON marketplace items
2017-11-15 14:17:05 -08:00
Brad Davis
bb2e061d77
Fixing global declarations in JS
2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
vladest
0e53afc346
Merge branch 'master' into move_to_qqc2
2017-11-15 20:53:14 +01:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
vladest
2852375285
Make QueryDioalogs buttons works
2017-11-15 20:32:28 +01:00
Zach Fox
e8c4878c8f
Fix rezzing non-JSON marketplace items
2017-11-15 11:25:18 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
...
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
Dante Ruiz
b633968865
fix-bringing-up-logs
2017-11-15 10:47:06 -08:00
Howard Stearns
1c293c4c48
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
...
Remove Marketplace's dependency on Edit.js for REZ/WEAR
2017-11-14 16:33:35 -08:00
Zach Fox
f5994375cf
Remove Marketplace's dependency on Edit.js for rez
2017-11-14 14:29:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
...
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-14 22:18:48 +03:00
Zach Fox
5290ee3b4e
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-14 10:07:44 -08:00
Brad Davis
d71fd151c5
Fixing button model exposure
2017-11-13 16:45:27 -08:00
Zach Fox
a3332e15b7
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-13 15:01:26 -08:00
SamGondelman
2fb1981c4a
merge with master
2017-11-13 14:34:39 -08:00
Brad Davis
69029b49f3
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 14:29:49 -08:00
Brad Davis
8f85c7650b
Make sure loaded components get the right parent context
2017-11-13 14:16:04 -08:00
vladest
6b732804eb
Button as QQC2
2017-11-13 21:15:31 +01:00
Zach Fox
641c4656c4
Fix bug with disappearing certificate info
2017-11-13 10:53:16 -08:00
Brad Davis
5cf9c1bb33
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 10:48:21 -08:00
vladest
4c1bbdacec
Fix merge conflicts
2017-11-13 16:45:10 +01:00
vladest
0c13c2b6e2
Remove unused QQC1 imports
2017-11-13 16:37:28 +01:00
Ryan Downe Karpf
f8b1c7978c
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
...
[Case 6569]: Silent failure is possible during Model Creation
2017-11-12 08:36:10 -08:00
vladest
50ea08f3d5
VR stylus and laser need longer timeout than mouse
2017-11-11 16:10:00 +01:00
vladest
9dbcff040d
Tune press delay to be able to swipe tablet pages easier
2017-11-11 09:43:34 +01:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
vladest
637a4ff357
Merge branch 'master' into tablet_home_paginate
2017-11-10 21:12:34 +01:00
Brad Davis
92a3c209aa
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-10 11:44:29 -08:00
beholder
d1969d649a
fix not collapsing keyboard
2017-11-10 21:20:00 +03:00
beholder
0bc95998c4
a few more adjustments based on discussion with Mukul
2017-11-10 21:20:00 +03:00
beholder
4d11f9a434
increase font pixel size for 'collapse keyboard' to 34px
2017-11-10 21:20:00 +03:00
beholder
db3ed81513
adjust to changed requirements:
...
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
beholder
eb4214fb4c
add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard
2017-11-10 21:20:00 +03:00
beholder
fb14e4dc4d
Fixed programmatical lowering of 'TabletAddressDialog'
2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf
4684 Add collapse button on the virtual keyboard
2017-11-10 21:20:00 +03:00
beholder
87519cd26f
use conditional bindings to avoid intermediate binding states
2017-11-10 19:53:54 +03:00
beholder
908faa1334
refactoring: simplify code & fix the issue with menu-es sometimes losing checked state
2017-11-10 19:53:54 +03:00
LaShonda Hopper
0e90c92cf5
[Case 6569] Minor: Break up line to pass column count guidelines.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f
[Case 6569] Fixes clipping of cancel button by window edge.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00
LaShonda Hopper
dac2ae19a4
[Case 6569] Add protection for dynamic vs static collision type (details below).
...
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited. This combination would silently
fail rather than notifying the user of the error.
This commit implements safeguards against the invalid combination:
* If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
* If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
* If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:24 -05:00
Brad Davis
25df649b44
Fix desktop mode script URL injection
2017-11-08 14:55:34 -08:00
David Rowe
c5c1ead400
Fix GOTO dialog's connection status and location not always updating
2017-11-09 10:51:21 +13:00
Zach Fox
a5dff0160b
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-08 13:30:55 -08:00
Zach Fox
38fde43009
...simplify your life
2017-11-08 13:19:47 -08:00
Zach Fox
3190fe1f32
Use keyfilepath instead of cached public keys
2017-11-08 12:30:48 -08:00
Brad Davis
1a58aee385
Fix scripting URL injection, I hope
2017-11-08 12:00:29 -08:00
Zach Fox
72fa0823ba
Logic changes
2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc
Frontend changes
2017-11-08 10:25:11 -08:00
Zach Fox
845ff64c1e
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-08 09:32:09 -08:00
Zach Fox
085355222f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-08 09:31:09 -08:00
Ken Cooke
addcb51ed9
Change slider label from "master gain" to "master volume"
2017-11-08 07:50:35 -08:00
David Rowe
0d21e0be11
Delete old, no longer used file
2017-11-08 17:14:17 +13:00
David Rowe
055470296d
Move current location in GOTO dialog and add placeholder text to input
2017-11-08 17:13:40 +13:00
Brad Davis
b7f31eb5b9
Fixing desktop QML loading, tablet clickthrough bugs
2017-11-07 12:42:26 -08:00
Zach Fox
f248eb5518
Change wallet home when 0 transactions
2017-11-07 11:30:09 -08:00
SamGondelman
f970eb2302
merge with pointers branch
2017-11-06 14:49:50 -08:00
SamGondelman
7d420f5242
isLeftHand, isRightHand, isMouse
2017-11-06 12:29:21 -08:00
Zach Fox
b54627594b
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-06 09:29:26 -08:00
Zach Fox
149c8fbeb2
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-06 09:25:30 -08:00
David Rowe
9db0dd6fea
Fix Asset Browser's "Copy URL" context menu
2017-11-05 20:38:37 +13:00
Menithal
ac1df7b815
21539: Allow HMD to turned off in Desktop Mode
2017-11-05 01:02:08 +02:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
Brad Hefta-Gaub
c1dfa24c12
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix
...
Fix the audio input device peak meters
2017-11-04 13:55:08 -07:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466
...
Fix Avatar Rotation upon Teleporting Using PAL
2017-11-03 11:58:15 -07:00
Nex-Pro
3171418173
Update NameCard.qml
2017-11-03 17:21:35 +00:00
vladest
6659565c39
Merge branch 'master' into tablet_home_paginate
2017-11-03 14:41:54 +01:00
vladest
659afcc43b
Make page indicators non clickable. Attempt to enable swipe even over buttons
2017-11-03 14:38:46 +01:00
Ken Cooke
babaef8399
Fix the audio input device peak meters
2017-11-03 05:59:59 -07:00
Zach Fox
6f3c61c4e0
Slightly modify invalid cert language
2017-11-02 17:59:36 -07:00
Zach Fox
19945c5991
Update cert UI
2017-11-02 10:22:00 -07:00
Zach Fox
56cb98d96f
Make inspection cert work
2017-11-01 12:02:57 -07:00
Zach Fox
b335ba9a75
Timeout timer
2017-11-01 11:34:29 -07:00
vladest
215e64d702
Merge branch 'master' into tablet_home_paginate
2017-11-01 18:51:01 +01:00
Ken Cooke
82d9827571
Merge branch 'master' into audio-louder-mastergain
2017-11-01 08:10:55 -07:00
Ken Cooke
3a2780bdf6
Enable gain slider in PAL menu to control Avatar MASTER Gain
2017-10-30 10:42:26 -07:00
vladest
d3c62db65d
Merge branch 'master' into webbrowser_updates
2017-10-30 18:17:19 +01:00
vladest
586dde7dd7
Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues
2017-10-30 18:15:42 +01:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode
...
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-30 08:56:26 -07:00
vladest
950ac3540a
Fix mute unmute. Scrolling thru suggestions popup now set popup's contains into url. Fixed reload timer
2017-10-29 14:05:47 +01:00
vladest
865c241a13
Merge branch 'master' into webbrowser_updates
2017-10-28 12:31:26 +02:00
vladest
b1601dcd4c
fix typo in tablet avatar browser
2017-10-28 12:07:29 +02:00
vladest
567a219e9c
Cleanup. Remove unused functionality
2017-10-28 12:01:37 +02:00
vladest
6fb1a9954e
Merge branch 'master' into fix_google_vr_height
2017-10-28 10:35:29 +02:00
Brad Hefta-Gaub
8322631a6d
Merge pull request #11695 from luiscuenca/case6719
...
6719 Avatar attachment window will update when attachments are modified
2017-10-27 17:01:05 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211
...
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-27 13:26:41 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
luiscuenca
70b37f2e8a
Cleaning some old tabs
2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd
Clean update bug 8027
2017-10-27 11:03:02 -07:00
Zach Fox
9481824d0a
Fix enabled status of wear button
2017-10-26 17:02:09 -07:00
beholder
6093cef6f0
add comments to explain '-1'
2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2
adjust to coding standards
2017-10-27 01:25:25 +03:00
Zach Fox
c62eb2bf3c
Merge branch 'feature/qml_whitelist_2' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-10-26 14:58:43 -07:00
Brad Davis
ffc51d5387
Working on QML whitelist functionality
2017-10-26 14:20:13 -07:00
Zach Fox
3e95484c4c
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-26 13:58:50 -07:00
beholder
5969e0b118
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-26 23:03:06 +03:00
vladest
794355dc35
Merge branch 'master' into webbrowser_updates
2017-10-26 21:18:00 +02:00
vladest
320ab2e682
Rework using StackView. Now backward takes in account popups as well
2017-10-26 21:14:44 +02:00
Zach Fox
c1e990e7be
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-10-26 10:37:31 -07:00
luiscuenca
f0eab58ebd
Bug 6719 fixed
2017-10-26 09:41:24 -07:00
Ken Cooke
4eb8b826c2
Merge pull request #11681 from luiscuenca/case6443
...
6443 Audio Menu Sample Sound won't play while domain is loading
2017-10-26 08:40:30 -07:00
luiscuenca
3d3077978e
Simplyfied and fixed null pointer
2017-10-25 18:47:10 -07:00
Zach Fox
5898f0bd0c
Gotta do some fancy stuff with anchors for this to work
2017-10-25 15:04:47 -07:00
Zach Fox
dafa830c0d
First steps
2017-10-25 14:44:59 -07:00
luiscuenca
a1c9285c90
Fixed bug on case 6443
2017-10-25 13:13:50 -07:00
Zach Fox
14150c09ac
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-25 12:59:36 -07:00
vladest
9f32b6c634
Merge branch 'master' into webbrowser_updates
2017-10-25 21:46:39 +02:00
vladest
505c281cd3
Merge branch 'master' into tablet_home_paginate
2017-10-25 21:19:16 +02:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Zach Fox
7998984d8e
Missed tons of spots!
2017-10-24 14:30:47 -07:00
Dante Ruiz
f29937fb88
Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard
2017-10-24 13:54:21 -07:00
Dante Ruiz
92f765fe52
property set echomode for keyboard for wallet and webviews
2017-10-24 13:53:50 -07:00
Zach Fox
48c8d52c09
Cleanup
2017-10-24 13:30:27 -07:00
vladest
874b9149e7
Popupd support reworked
2017-10-24 22:04:25 +02:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -07:00
Dante Ruiz
0242e8e4ba
fixed crash and login password
2017-10-23 16:33:49 -07:00
David Back
b5f1793863
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-23 14:21:18 -07:00
vladest
a33b2986cd
Merge branch 'master' into webbrowser_updates
2017-10-23 22:34:31 +02:00
vladest
fd41299efc
Disable profile and custom user agent which broke nav bars
2017-10-23 22:34:22 +02:00
Zach Fox
03b46c5e62
Merge pull request #11652 from cain-kilgore/21508
...
WL 21508 - Improve upon Skybox Changer (Updated)
2017-10-23 12:22:21 -07:00
Zach Fox
30bffdea32
Quick bugfix
2017-10-23 11:45:51 -07:00
Cain Kilgore
b60b58ff35
zFox Changes
2017-10-23 19:40:43 +01:00
Cain Kilgore
3b4185fdb3
WL 21508 - Improve upon Skybox Changer
...
This involved a second PR, due to optimizing the way the Skyboxes are laid out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
2017-10-23 19:30:36 +01:00
