Cristian Luis Duarte
3d933e1810
Android - Joystick hidden when opening login and shown after Cancel.
2018-03-09 17:41:05 -03:00
John Conklin II
25b93d9fd7
Merge pull request #12606 from ElderOrb/FB12956_RC65
...
Fix for broken 'toggle audio meter' button
2018-03-09 11:20:27 -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
cfa85b5137
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-09 09:37:08 -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
Alexander Ivash
b427d6c326
FB12956 - Audio Meter Toggle Button Broken
2018-03-09 02:20:34 +03: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
Dante Ruiz
21781c0c40
can keyboard help page
2018-03-07 13:54:50 -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
Dante Ruiz
297273de08
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-07 13:09:47 -08:00
Gabriel Calero
109fa1d832
Add the url of each qml as on-screen debug info
2018-03-07 17:18:37 -03: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
Dante Ruiz
69af12fbc7
chaning speeds
2018-03-06 15:47:01 -08:00
Atlante45
edeed95ccc
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-06 15:22:40 -08:00
Dante Ruiz
fe363e7f2a
changing keybaord mapping
2018-03-06 14:16:25 -08:00
Gabriel Calero
069d3e40bc
Merge branch 'android' into android_bubble_fix
2018-03-06 18:58:49 -03: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
698a224bb0
Next attempt to fix ghosted scroll bars
2018-03-06 16:13:46 +01:00
vladest
86b9e1b873
Merge branch 'master' into move_to_qqc2
2018-03-06 13:40:51 +01:00
vladest
8723b317c9
Move Keyboard under input dialog makes sure it will no shift dialogs content
2018-03-06 13:09:08 +01:00
vladest
7b9d9fad59
Merge branch 'master' into assetbrowser_cosmetics
2018-03-06 11:37:18 +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
43e7f282ec
cleanup
2018-03-04 20:44:46 +01:00
vladest
c2c7962f66
return styling. set implicit sizes
2018-03-04 19:49:47 +01:00
vladest
9f151566bf
temporarily remove styling
2018-03-04 18:46:27 +01:00
vladest
1d43ca48bd
remove wrap
2018-03-04 17:59:56 +01:00
vladest
12a70d57c2
Set Y pos for indicator explicetly
2018-03-04 17:24:52 +01:00
vladest
94e070eae2
Try to fix incorrectly visible scrollbars on Mac
2018-03-04 15:14:49 +01:00
vladest
148faa3a93
Merge branch 'master' into move_to_qqc2
2018-03-04 14:16:21 +01:00
vladest
2a9bbfa808
Wrap text in query dialogs. Add right margins for input field and buttons
2018-03-04 13:19:56 +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
8dd27a1a04
Merge branch 'master' into move_to_qqc2
2018-03-01 11:20:11 +01:00
vladest
02612e0465
cleanup and fits text to buttons
2018-03-01 11:18:18 +01:00
vladest
f51025061c
Make Edit view more consistant with original one #2
2018-03-01 11:03:56 +01:00
vladest
7cbdbe9ab0
Make Edit view more consistant with original one
2018-03-01 11:02:05 +01:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
Cristian Luis Duarte
9acb83632c
Android - Make joystick move up when showing the bottom bar
2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
2018-02-28 15:55:50 -03:00
samcake
9e5ed7b905
Add more timing stats in explanded mode
2018-02-28 10:48:35 -08:00
vladest
531c4dc41d
Merge branch 'master' into move_to_qqc2
2018-02-28 11:40:46 +01:00
Cristian Luis Duarte
428f4b7b9d
Android - Make the virtual pad (joystick) position fixed. Change assets.
2018-02-27 21:24:21 -03:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
Howard Stearns
1fb0f898b4
Merge pull request #12505 from howard-stearns/wallet-help
...
new wallet help
2018-02-27 13:18:36 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding
...
End seeding
2018-02-27 13:18:13 -08:00
howard-stearns
30896c264b
reduced text
2018-02-27 12:04:41 -08:00
howard-stearns
53b976b400
fix typo in bank href
2018-02-27 11:46:06 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
howard-stearns
053640f216
a guess a linking bank
2018-02-27 08:36:45 -08:00
howard-stearns
ce0ae61947
Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help
2018-02-27 08:10:17 -08:00
vladest
90b891dbc3
Fix push issue due to merge errors
2018-02-27 16:42:30 +01:00
vladest
b7f146fd47
Fix clipping issues in scrolling window
2018-02-27 16:27:08 +01:00
vladest
6a5fe0d513
Merge branch 'master' into move_to_qqc2
2018-02-27 15:23:52 +01:00
Clément Brisset
2a7a71db13
Merge pull request #12477 from Atlante45/new-master
...
Merge stable back into master
2018-02-26 17:18:24 -08:00
howard-stearns
eb683d4793
mail is a link
2018-02-26 17:09:33 -08:00
howard-stearns
2f6e2f6b84
new wallet help
2018-02-26 16:52:41 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Zach Fox
0802bd2c21
Fix going to marketplace main page from WalletChoice
2018-02-26 14:27:59 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
Zach Fox
8223ebf393
Correctly handle referrer from WalletChoice
2018-02-26 12:44:41 -08:00
howard-stearns
4e4aebc7ee
get WalletChoice setup flow from My Purchases and confirmation. Still
...
not correct referrer.
2018-02-26 12:02:56 -08:00
John Conklin II
4feea929ce
Merge pull request #12449 from misslivirose/fix/atp-collisions
...
change default add to world shape for asset browser
2018-02-26 11:15:01 -08:00
howard-stearns
2de72c125d
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 10:54:22 -08:00
John Conklin II
e586a35d38
Merge pull request #12489 from vladest/fix_table_sort_indicator
...
Make sure sort indicator is attached to the right of title
2018-02-26 10:33:27 -08:00
howard-stearns
a5cedde3c8
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
...
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -08:00
howard-stearns
30a6cca4b3
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 09:26:09 -08:00
howard-stearns
dee3df5299
remove debugging
2018-02-25 15:26:18 -08:00
howard-stearns
300f611c47
working, with soft reset
2018-02-25 14:06:06 -08:00
vladest
931696322f
Fixed stucked mouse pointer in QQC2 toolbar mode
2018-02-25 08:58:05 +01:00
vladest
62f2ba0dad
More intellectual calculation of title positions taking in account actual sort indicator glyph size
2018-02-24 09:32:08 +01:00
vladest
b1070f85f0
Merge branch 'master' into move_to_qqc2
2018-02-24 02:59:40 +01:00
howard-stearns
726c1ed816
receiveAt with new key
2018-02-23 17:05:46 -08:00
Zach Fox
fe515e949b
New UI for new HFC users
2018-02-23 16:36:20 -08:00
Zach Fox
cc98eb6424
Fix lightbox stuck
2018-02-23 16:14:42 -08:00
howard-stearns
f66e688f41
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f
almost working
2018-02-23 16:12:01 -08:00
Zach Fox
47b25740de
Update commerceLightBox
2018-02-23 15:23:51 -08:00
howard-stearns
34253082d4
always reset when asked
2018-02-23 15:11:08 -08:00
Zach Fox
432e647f7a
Fix 'What's This' link
2018-02-23 15:08:33 -08:00
howard-stearns
3c2626894c
fixes
2018-02-23 14:54:03 -08:00
howard-stearns
050df2ac2a
merge
2018-02-23 14:46:13 -08:00
Zach Fox
9b54ab1080
UI changes, V1
2018-02-23 14:42:05 -08:00
howard-stearns
09091d29f7
more logic framework
2018-02-23 14:35:30 -08:00
howard-stearns
84f9bff330
basic element, but not pretty and not functioning
2018-02-23 13:56:56 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Alexander Ivash
f9de255fa7
FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials
2018-02-23 20:07:09 +03:00
vladest
b8102cfbd7
Make sure sort indicator is attached to the right of title
2018-02-23 10:06:16 +01:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes
...
Android ui fixes
2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
Zach Fox
249f0568a1
New loader
2018-02-22 17:14:23 -08:00
howard-stearns
1aaae94cc1
checkpoint
2018-02-22 17:04:27 -08:00
Zach Fox
e3ccfc9935
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps
2018-02-22 16:39:26 -08:00
Zach Fox
f14673bc50
Fixup Checkout for apps
2018-02-22 16:38:38 -08:00
Zach Fox
33f73fef0d
YAY!
2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346
It's working!
2018-02-22 16:09:01 -08:00
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1
...
Commerce: Extended Certificate Support, V1
2018-02-22 15:19:57 -08:00
Atlante45
7bad82818b
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-02-22 14:45:41 -08:00
Zach Fox
de0eee52d6
cool
2018-02-22 14:45:32 -08:00
Zach Fox
4d2d7fa51f
lots of fun initial progress!
2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Zach Fox
3d4e6de6ab
Quick bugfix
2018-02-22 10:49:11 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs
...
Fix two bugs with Create Menu
2018-02-22 09:43:50 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
vladest
7d7c3bb1f5
Change new material dialog to QQC2
2018-02-22 10:30:42 +01:00
Liv Erickson
aba1cae36d
get rid of magic number
2018-02-21 16:19:50 -08:00
Liv Erickson
990e848de6
fix typo that was breaking popup dialog
2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a
Initial fix - need a little style fixing
2018-02-21 15:44:23 -08:00
Gabriel Calero
2d4bb3bad3
Change color to QML debug info
2018-02-21 20:23:54 -03:00
Gabriel Calero
f2ce3d0268
Fix focus hack. Add QML debug info
2018-02-21 20:10:03 -03:00
Nissim Hadar
b519ebd6f1
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-21 12:36:56 -08:00
Zach Fox
74655bde49
Fix skeletonmodelURLchanged signal
2018-02-21 12:12:20 -08:00
Cristian Luis Duarte
6411d1b35b
Android - Avoid overlapping between hint and input in Go To by clearing text when closing the window
2018-02-21 16:52:57 -03:00
Zach Fox
b548567f5a
Apps protection
2018-02-21 11:17:47 -08:00
Zach Fox
1fbc16aae2
Fix noPermissionGlyph margin
2018-02-21 10:52:17 -08:00
SamGondelman
4dde178b93
fix new material UI
2018-02-21 10:33:15 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome
...
Make sure Flickable for GridView for TabletHome will not flick
2018-02-21 09:21:45 -08:00
vladest
05fab77189
Merge branch 'master' into move_to_qqc2
2018-02-21 11:57:19 +01:00
Nissim Hadar
af484d0af6
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-20 23:48:12 -08:00
Nissim Hadar
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
Liv Erickson
5cd184ddc3
change default add to world shape for asset browser
2018-02-20 17:55:30 -08:00
Cristian Luis Duarte
00958965bc
Android- Center login dialog in both big (Pixel XL, Huawei Mate 9 Pro) and smaller screens (Pixel)
2018-02-20 19:25:41 -03:00
Zach Fox
f08c66e3ac
Remove debug code
2018-02-20 14:16:55 -08:00
Zach Fox
fd6f4b569f
Fix active focus issue
2018-02-20 13:19:31 -08:00
Zach Fox
eb29bdf5d2
Don't allow tabs or newlines
2018-02-20 13:06:10 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Zach Fox
9bde9f5a4f
Fix height of Optional Message in Send Money
2018-02-20 12:36:11 -08:00
Gabriel Calero
5e3ad3fe9a
Disable VPAD on bottom bar tapping and modes bar tapping
2018-02-20 17:20:48 -03:00
Zach Fox
11f897beb0
Initial app support
2018-02-20 10:39:36 -08:00
John Conklin II
aa67a98d02
Merge pull request #12426 from ElderOrb/FB11508
...
fix for toolbar slowly drifting on switching between HMD/Desktop modes
2018-02-20 09:30:01 -08:00
Gabriel Calero
4839a8c720
Remove Forgot labels in login dialog
2018-02-20 12:59:06 -03:00
vladest
c320761900
Merge branch 'master' into move_to_qqc2
2018-02-20 06:01:59 +01:00
Gabriel Calero
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
