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

2294 commits

Author SHA1 Message Date
vladest
d41dd1b18d Merge branch 'master' into move_to_qqc2 2018-03-13 19:28:51 +01:00
Dante Ruiz
00fa5cfd06 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-13 10:08:00 -07:00
Dante Ruiz
f521a129b6 fixing issues 2018-03-13 10:07:34 -07:00
Zach Fox
bce7fb1ff1 Improvements 2018-03-12 16:54:10 -07:00
Zach Fox
9c7d857ecb Fix some focus issues 2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da It's working! 2018-03-12 15:54:11 -07:00
Zach Fox
db7eea543e Initial progress 2018-03-12 15:11:09 -07:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
Alexia Mandeville
8c9c7248d4 Reorganize of menu action items as well as QML categories 2018-03-12 12:52:12 -07:00
vladest
fe5d7463fe Merge branch 'master' into move_to_qqc2 2018-03-10 14:42:51 +01:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api 
use correct scripting api  for audio in Audio.qml
 2018-03-09 13:41:20 -08:00
Dante Ruiz
e21c4988fb stereo checkbox text change 2018-03-09 10:11:25 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:41 -08:00
John Conklin II
407dfec342
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:24 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00
Dante Ruiz
c49d0557fc fixing check box issues 2018-03-09 09:29:37 -08:00
Dante Ruiz
8703e9e002 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-09 08:42:50 -08:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
Zach Fox
c22d79041d Cleanup after cherry-pick 2018-03-08 14:35:56 -08:00
howard-stearns
883528488c clear wallet when picking a new one 2018-03-08 14:35:43 -08:00
Zach Fox
747a6b07ce Fix font loading for MacOS via different font loading method 2018-03-08 14:31:48 -08:00
howard-stearns
9d805283d1 clear wallet when picking a new one 2018-03-08 14:24:44 -08:00
Zach Fox
086431d0e7 Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain 2018-03-08 13:50:19 -08:00
Dante Ruiz
9f246ea314 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-08 13:04:02 -08:00
Zach Fox
4df58f1e67 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Zach Fox
a479439b23
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions 
Show Connection instructions in Send Money when 0 connections
 2018-03-08 11:20:23 -08:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Zach Fox
a0eb7e0712 Don't default unknown Marketplace item types to 'Entity' 2018-03-07 15:01:12 -08:00
Zach Fox
d71fc22ed8 Support argument to available_updates endpoint 2018-03-07 14:06:29 -08:00
Zach Fox
eded8586a5 Use correct backend terminology 2018-03-07 13:40:55 -08:00
Zach Fox
0285bf9379 purposeful incorrect indentation to prevent insane diff 2018-03-07 13:27:40 -08:00
Zach Fox
a2eb13b70b Prevent logspam 2018-03-07 13:23:13 -08:00
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
Zach Fox
b764a4d404 Filter out invalid purchases 2018-03-07 09:22:57 -08:00
Dante Ruiz
13767beece Caps change 2018-03-07 08:19:36 -08:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -08:00
Dante Ruiz
97d283cc5f use correct api call for audio and correct function call to set stereo input mode 2018-03-06 16:17:27 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
Zach Fox
48aa862c16 Show Connection instructions in Send Money when 0 connections 2018-03-06 13:52:42 -08:00
Alexander Ivash
53e1a0cae5 forward 'maybeEnableHmdPreview' if control is not visible 2018-03-06 22:25:35 +03:00
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -08:00
vladest
86b9e1b873 Merge branch 'master' into move_to_qqc2 2018-03-06 13:40:51 +01:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -08:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox 
Adding Stereo checkbox in Audio settings
 2018-03-05 12:45:01 -08:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f5a8187fe2 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-05 10:01:55 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
vladest
148faa3a93 Merge branch 'master' into move_to_qqc2 2018-03-04 14:16:21 +01:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
Zach Fox
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
Dante Ruiz
7ce13a3ce7 adding comment 2018-03-02 11:06:28 -08:00
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56:44 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Dante Ruiz
4b572eda6b changing Name 2018-03-01 11:05:40 -08:00
Dante Ruiz
8cae20f53d adding stereo checkbox to audio settings 2018-03-01 11:03:18 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
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
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
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 3201d2ba21, reversing
changes made to c0f20900a0.
 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
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
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
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
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
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
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
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
vladest
c320761900 Merge branch 'master' into move_to_qqc2 2018-02-20 06:01:59 +01: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
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
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
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
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
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
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
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
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
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
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 to address a selection
      issue; however, it's unclear what that issue was.  Selection
      within the Asset Browser works without it at present.
* Amends the ContextMenu within the AssetBrowser to work in conjunction
  with the multi-selection changes.
    * ContextMenu will _only_ display when triggered within the current
      selection be it one or more items as opposed to previous behavior
      of selecting the item the menu was triggered on.
    * CopyURL is only enabled when the selection size is 1
    * Rename is only enabled when the selection size is 1
    * Delete is enabled when the selection size is greater than 0

Changes Committed:
    modified:   interface/resources/qml/controls-uit/Tree.qml
    modified:   interface/resources/qml/hifi/AssetServer.qml
 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
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
b947504849 Merge conflicts 2018-01-22 21:42:32 +01: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
Zach Fox
4d408a8df5 Nearby UI 2018-01-19 14:49:28 -08:00
vladest
c235deb6f0 Merge branch 'master' into move_to_qqc2 2018-01-19 23:01:04 +01:00
Zach Fox
495c4f56e2 Only small tweaks remaining? 2018-01-18 17:51:08 -08: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
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -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
e627925bd3 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 15:14:42 -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
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
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
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08: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
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
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
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
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
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
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
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
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08: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
vladest
35fee739c5 Use buttons index 2017-12-27 23:50:15 +01: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
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
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
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
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
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
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