Commit graph

3795 commits

Author SHA1 Message Date
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949
AvatarApp
2018-07-09 15:20:18 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows
Create App: Native windows
2018-07-09 14:25:13 -07:00
Alexander Ivash
425209189d reduce precision 2018-07-07 03:03:24 +03:00
Alexander Ivash
7feb9910c9 use rotation degrees instead of quaternions for comparison
re-query entity properties after editing it to get actual changes
2018-07-07 02:36:19 +03:00
Alexander Ivash
4716be01f6 eliminate binding loop which could lead to not updating spinbox UI 2018-07-07 02:36:19 +03:00
Alexander Ivash
536395d199 only compare properties which exist for both objects in 'numeric comparer'
note: this is attempt to quick-n-dirty workaround weird issue with having colors informaiton inside 'dimensions' in the latest master

example:

 "blue": 0.2367398738861084,
   "green": 0.08945406973361969,
   "red": 0.25246158242225647,
   "x": 0.25246158242225647,
   "y": 0.08945406973361969,
   "z": 0.2367398738861084
2018-07-07 02:36:19 +03:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android
Support web3d overlays in android
2018-07-06 13:02:56 -07:00
Thijs Wenker
4b2e0765db - cleanup (parent) signals InteractiveWindow after window is closed 2018-07-06 20:24:43 +02:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Thijs Wenker
eed1f66e71 Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-06 20:01:48 +02:00
Alexander Ivash
67fb8af87c update avatarapp on avatar switch 2018-07-06 21:00:56 +03:00
Alexander Ivash
e943a607b0 'Wear wearable' => 'Wear wearables' (from QA feedback) 2018-07-06 21:00:56 +03:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
68041dc93c get rid of TextStyle1..11 per request from Dante 2018-07-06 21:00:55 +03:00
Alexander Ivash
9b5135b66b remove debug outputs per Dante's request 2018-07-06 21:00:55 +03:00
Alexander Ivash
48fc81b082 Buy wearables from Marketplace [new line]
Wear wearable from My Purchases [new line]
2018-07-06 21:00:55 +03:00
Alexander Ivash
a9f10b2305 avatarisland link should direct to 11.5848,-8.10862,-2.80195 2018-07-06 21:00:55 +03:00
Alexander Ivash
12c0292595 experimental fix for Mukul's issue 2018-07-06 21:00:55 +03:00
Alexander Ivash
e4d6528ab9 fix trashcan overlay over 'guy-in-circle' 2018-07-06 21:00:55 +03:00
Alexander Ivash
41a9b22bf6 long text truncation 2018-07-06 21:00:55 +03:00
Alexander Ivash
8d921b123d The new layout from zeplin (https://zpl.io/aMm76Yr) 2018-07-06 21:00:55 +03:00
Alexander Ivash
46992f04ad replace bodymart & avatarisland images 2018-07-06 21:00:55 +03:00
Alexander Ivash
939749e084 The keyboard should appear at the bottom of the screen. 2018-07-06 21:00:55 +03:00
Alexander Ivash
3f86f3d91f present avatar model name without marketId in black 2018-07-06 21:00:55 +03:00
Alexander Ivash
0ad11c4a6e Open 'Learn to make a custom…' in default external browser 2018-07-06 21:00:55 +03:00
Alexander Ivash
2581157794 "The button changes from Confirm to overwrite, and the button style changes from blue to red" 2018-07-06 21:00:55 +03:00
Alexander Ivash
345c294d47 invalidate avatar model on using custom avatar url
disable navigation if no marketId
2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a reflect changes in grabbed wearable position/rotation in UI 2018-07-06 21:00:55 +03:00
Alexander Ivash
c7570dbf83 integrate onscreen keyboard 2018-07-06 21:00:54 +03:00
Alexander Ivash
5381dce8d8 get rid of 'isExternal' due to changes requirements
show avatar thumbnail if url was specified & valid, show 'guy-in-circle' otherwise
2018-07-06 21:00:54 +03:00
Alexander Ivash
9925bc2822 don't treat empty display name as an error 2018-07-06 21:00:54 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 2018-07-06 21:00:54 +03:00
Alexander Ivash
67b2512a2a query avatar model name for current avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
6ff2ea96f4 crop avatar thumbnails to fit aspect ratio 2018-07-06 21:00:54 +03:00
Alexander Ivash
9a4ea07614 limit avatar name to 14 characters + … at the end 2018-07-06 21:00:54 +03:00
Alexander Ivash
ee856266c7 allow updating existing avatars 2018-07-06 21:00:54 +03:00
Alexander Ivash
b4c4ab88f0 update logging 2018-07-06 21:00:54 +03:00
Alexander Ivash
fdd7644cba use numeric animation for avatar bookmark & page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
3c78ba0060 resolve constant switching between hover/no-hover for page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
afc09c13b2 specify updated shadow params from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
99affb22f5 show spinner during avatar thumbnails loading 2018-07-06 21:00:54 +03:00
Alexander Ivash
567298b59b shadow for wearables indicator (based on mockups) 2018-07-06 21:00:54 +03:00
Alexander Ivash
6efcea2c27 adjust settings layout according to mockups, update style9 2018-07-06 21:00:54 +03:00
Alexander Ivash
b7614684de add check for duplicate names into 'create favorites dialog', style accordingly to mockups 2018-07-06 21:00:54 +03:00
Alexander Ivash
a26248e1d2 switch to regexp-based method of extracting marketplaceId from url 2018-07-06 21:00:54 +03:00
Alexander Ivash
1778e59142 blue version of TextStyle3 should only be used for avatar name under favorites 2018-07-06 21:00:54 +03:00
Alexander Ivash
a4a1ac5d12 The height of the “Take it off” button should be the same as “save” button
“m” and “deg” should align with “Position” and “Rotation” text
The step size in degrees should be 1 degree
2018-07-06 21:00:54 +03:00
Alexander Ivash
17acb5e106 when the user clicks on it should take the user to the marketplace info page of the avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
9f7fd3faa2 add slight animation on hover 2018-07-06 21:00:54 +03:00