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
12770142fa
Add bubble button to android bottombar
2018-02-19 16:59:34 -03: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
Brad Hefta-Gaub
0ef2794c35
Merge pull request #12395 from druiz17/fix-qml-tablet-apps
...
Prevent adding the same tablet url to the tabletApps list
2018-02-18 19:10:24 -08:00
Cain Kilgore
47ed45b5e9
Fixed extra " in backup_instructions.html
2018-02-17 18:14:44 +00: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
Seth Alves
d1c0f0a40f
Merge pull request #12390 from druiz17/add-control-mapping
...
add control button mapping for controller API
2018-02-14 15:02:28 -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
Zach Fox
69a06bf1b7
Wrong fonts file
2018-02-13 14:42:03 -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
Dante Ruiz
ddcee05b14
added control button for controller API
2018-02-13 09:41:00 -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
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
David Back
7bcfd0cf8d
Merge pull request #12114 from dback2/polymaterials
...
Additional mtl spec support & fixes for Poly & more
2018-02-09 13:18:14 -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
Cristian Luis Duarte
b6ce3409d8
Android - Make it possible to use the touchpad for walk/fly (and orientate/see) when not in independent camera mode (allowing first person and third person).
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
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -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
David Back
880ef17c75
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-07 18:11:15 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
Seth Alves
84ed23f547
Merge pull request #12292 from ElderOrb/FB11855
...
FB11855 - Change bubble icon on tablet
2018-02-07 14:03:16 -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
b1be12a5d4
Remove errant GPUCache files
2018-01-31 17:38:26 -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
Alexander Ivash
a0c41f26d1
FB11855 - Change bubble icon on tablet
2018-02-01 01:25:29 +03: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
Cristian Luis Duarte
cc361385d9
Android - Make it possible to use the touchpad for walk/fly (and orientate/see) when not in independent camera mode (allowing first person and third person).
2018-01-31 15:33:14 -03: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
Brad Davis
361b767586
Merge branch 'fix/render_config' into android
2018-01-25 14:50:41 -08:00
Dante Ruiz
07842f8e54
Merge branch 'master' of github.com:highfidelity/hifi into fix-multihighlight
2018-01-25 13:30:45 -08:00
Brad Davis
d4aef1ea88
Fix URLs in QSS files to use QRC base path
2018-01-25 13:03:42 -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
Brad Davis
3ad6084b37
Fixing mannequin GLES KTX files
2018-01-23 12:24:53 -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
5bf2bda96d
Merge branch 'android' into android_new
2018-01-23 08:17:46 -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
ZappoMan
f6062ebfcc
new icon and button layout
2018-01-19 16:00:08 -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
Brad Davis
3e7872637d
Merge branch 'android' into android_new
2018-01-19 14:40:01 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -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
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Brad Davis
3dba928b72
Merge remote-tracking branch 'upstream/android' into android_new
2018-01-19 10:36:46 -08: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
Brad Davis
a9b2cc3408
Fixing lighting shader and removing being of light
2018-01-18 15:25:22 -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
Alexander Ivash
29625953f6
update privacy-specific disabled preview image
2018-01-18 23:26:43 +03:00
Alexander Ivash
a74b093b60
FB11109 Preview disabled image swap (Commerce only)
2018-01-18 23:26:43 +03:00
Triplelexx
cede8ed597
add focused color
...
keyboard navigation uses focusedColor
2018-01-18 19:56:55 +00:00
Brad Davis
d3c4b0ef45
Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new
2018-01-18 10:04:03 -08: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
Gabriel Calero
970ca5e08f
Add virtual pad for android
2018-01-17 15:00:43 -03: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
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Sam Gateau
df0660f823
Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles
2018-01-13 01:00:41 -08:00
Brad Davis
ab7aa52a10
GLES emulaton on windows
2018-01-12 19:17:35 -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
John Conklin II
da2c56dbc9
Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings
...
RC62: Fix for black screen when clicking Settings from Snap app
2018-01-11 09:48:03 -08:00
Brad Davis
65794cf142
Better skybox for android testing
2018-01-10 20:20:57 -08: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
Dante Ruiz
125eb9ce44
add new tablet model and adjust screen offset
2018-01-09 14:31:57 -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
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -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
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
...
Added exponential smoothing filter for vive pucks.
2018-01-05 16:50:55 -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
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering
...
Log filtering
2018-01-05 08:40:41 -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
Anthony J. Thibault
eff77b995e
Merge branch 'master' into feature/exp-smoothing-input-filter
2018-01-04 15:24:33 -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
Anthony J. Thibault
9beb3ac5b6
Merge branch 'master' into feature/exp-smoothing-input-filter
2018-01-04 13:45:27 -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
RebeccaStankus
f52a6d8eae
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 10:49:32 -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
RebeccaStankus
9471dbeba9
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-03 11:39:38 -08: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
RebeccaStankus
9edb85efdc
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-03 09:25:38 -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
RebeccaStankus
dd48972e44
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-02 14:06:41 -08:00
RebeccaStankus
bf59697aa5
better dropdown
2018-01-02 13:56:49 -08:00
Zach Fox
47a209dc4c
Make things slightly better?
2018-01-02 13:11:00 -08:00
RebeccaStankus
fe69498976
initial changes...ready for feedback
2018-01-02 13:04:52 -08:00
vladest
a84e585679
Merge
2018-01-02 21:49:00 +01:00
RebeccaStankus
efdba3b6e6
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2
2018-01-02 08:59:42 -08: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
RebeccaStankus
296f0a323a
saving for Wednesday
2017-12-26 15:56:05 -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
RebeccaStankus
720f186bd7
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter
2017-12-22 13:47:42 -08:00
RebeccaStankus
1d4dedc1a1
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter
2017-12-22 07:52:31 -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
RebeccaStankus
95d94e1c8f
UI Done
2017-12-20 16:52:56 -08: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
Seth Alves
4956978c76
Merge pull request #11973 from luiscuenca/webPrivacyFix
...
Fix web entities accessing the webcam
2017-12-12 17:01:38 -08:00
luiscuenca
2d21f4d364
Fix web entities accessing the webcam
2017-12-12 16:00:17 -07: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
Anthony J. Thibault
42424d32f1
Added exponential smoothing filter
...
Tuned coefficients to maximize glitch and vibration damping while minimizing latency.
2017-12-08 09:29:54 -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
Anthony J. Thibault
68ad27a38d
Merge branch 'master' into bug-fix/flying
2017-12-07 10:28:13 -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
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable
...
stable -> master
2017-12-05 11:58:23 -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
NissimHadar
ec1c4c37fa
Merge pull request #11912 from ElderOrb/FB9461
...
9461 Keyboard for create appear then disappears immediately (HMD)
2017-12-04 16:49:25 -06: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
Brad Hefta-Gaub
ec33aa9c4b
Merge pull request #11880 from ElderOrb/FB7991
...
7991 Change Instances of Edit Mode to Create Mode
2017-12-02 12:50:48 -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
Anthony Thibault
fe16cc3fab
Merge pull request #11902 from luiscuenca/onloadFix
...
Fixes create list and web and QML audio sync
2017-12-01 16:05:07 -08: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
b8f7ba9aa6
Fix month display in commerce...
2017-12-01 10:45:36 -08:00
Alexander Ivash
48b50e33dd
9461 Keyboard for create appear then disappears immediately (HMD)
2017-12-01 20:29:35 +03: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
luiscuenca
b890a29b3a
Clean console log
2017-11-29 19:05:01 -07:00
luiscuenca
b817143e2e
Fixes on web and QML audio sync
2017-11-29 18:16:21 -07:00
vladest
8c9e530adf
Merge branch 'master' into move_to_qqc2
2017-11-29 16:33:59 +01:00
Anthony J. Thibault
dff49cafaa
Embiggen the stick deadspots for oculus touch controllers
...
This effectively splits the controller into directional zones.
This should make driving/flying navigation more predictable and less prone
to drifting in unintentional directions, which could induce nausea.
2017-11-28 17:11:44 -08: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
Alexander Ivash
02684e3fed
remove not used files
2017-11-27 22:49:11 +03:00
Alexander Ivash
da06b2656f
7991 Change Instances of Edit Mode to Create Mode
2017-11-27 22:47:42 +03: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
