Commit graph

241 commits

Author SHA1 Message Date
vladest
8d23bf38ac Merge branch 'master' into login_dialog_rework 2017-09-28 14:55:12 +02:00
vladest
4f907aba1e sign in reworked 2017-09-28 14:49:48 +02:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463)
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
beholder
3677718e48 7926 Create Mode: the keyboard tray is not styled correctly 2017-09-27 21:33:18 +03:00
beholder
5502a639e2 7877 Unexpected Behavior when pressing Enter on Input Field 2017-09-26 01:07:47 +03:00
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
vladest
c48aba423a Rename check box 2017-09-20 22:48:39 +02:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
Atlante45
c04a6b5b88 Add error tooltip 2017-09-13 09:54:56 -07:00
Atlante45
2e84f48539 Fix QML errors 2017-09-13 09:54:55 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
Atlante45
28402be37c Fix status glyphs 2017-09-01 14:17:28 -07:00
vladest
d4332e7776 Adopting according comments from designers 2017-08-26 20:55:16 +02:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
9e6502fe92 More UI work 2017-08-25 10:54:34 -07:00
vladest
c7fe845403 Move common webview flickable code to separate core file 2017-08-24 21:35:47 +02:00
vladest
6f0229f450 Reworked according to designers request. Do not fall back to default audion output 2017-08-22 23:26:27 +02:00
vladest
3be684b973 Fixed spinner in center. Flicking only vertically 2017-08-21 16:31:25 +02:00
vladest
d6c426d064 Reworking according new design 2017-08-17 17:17:02 +02:00
vladest
2cca584e58 Merge branch 'master' into audio_devices_split 2017-08-16 22:47:06 +02:00
Dante Ruiz
459f2c5cdc fixed tab issue 2017-08-14 16:03:12 -07:00
Dante Ruiz
99617600c4 fix selection issue for TreeView.qml 2017-08-14 15:58:28 -07:00
vladest
b22745d57a Fix binding loops 2017-08-12 12:52:35 +02:00
vladest
560696e41c Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2 2017-08-11 20:39:17 +02:00
Cain Kilgore
4e81ebf85c Added Assets for Web Browser MP Script 2017-08-10 22:53:35 +01:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01:00
Zach Fox
a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler
WL 21422 - Add a scale slider for avatar size
2017-07-14 10:30:33 -07:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Dante Ruiz
258c21838e finished calibration-ui updates 2017-07-06 17:32:40 +01:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00
Zach Fox
f6583a1b87 Use correct text color for checkboxes 2017-07-05 14:46:59 -07:00
Zach Fox
5d8d2fd83e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-27 16:47:44 -07:00
Zach Fox
a1dfbc91da Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-22 10:27:52 -07:00
Vladyslav Stelmakhovskyi
30714d5d25 Make background with default color. Fix few warnings 2017-06-22 16:47:40 +02:00
Zach Fox
af3c249ae5 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-21 17:16:10 -07:00
Dante Ruiz
729065749f fixed merge conficts 2017-06-21 16:59:53 +01:00
Zach Pomerantz
1f7e1e8287 add level to active input selection 2017-06-20 17:04:54 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00