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

2763 commits

Author SHA1 Message Date
Howard Stearns
75de305ec3 remove dead code 2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
David Rowe
5ab22a1f40 Change play area option text for Oculus 2018-09-27 17:07:42 +12:00
Howard Stearns
da5f77afcd Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-26 15:26:52 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00
Howard Stearns
e1659ed520 fix old bad merge, and if told referrer while already setup, follow 
immediately
 2018-09-26 14:57:47 -07:00
Kerry Ivan Kurian
276125937c Eliminate double equals 2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian
4e7b03883f Use triple equals 2018-09-25 15:13:26 -07:00
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian
0a43c17ce0 Use entity-specific glyphs in marketplace item tester 2018-09-24 21:15:08 -07:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test 
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
 2018-09-24 16:30:49 -07:00
Kerry Ivan Kurian
f9c25f2f32 Allow user to select asset type in marketplace item tester 2018-09-20 16:36:06 -07:00
Kerry Ivan Kurian
c1cc031bd0 Remove cruft and refactor 2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian
afa8e44e66 Refactor 2018-09-20 10:53:32 -07:00
Howard Stearns
391128ef77 Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2 2018-09-19 16:46:09 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670 Switch to localhost before replacing content 2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian
38fd9523ee Attempt to load content set 
This does not result in the user seeing the content set.
 2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Alexander Ivash
e5b7b7f12a FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint 2018-09-19 23:07:21 +03:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Kerry Ivan Kurian
cfa9d185f0 Add full resource paths to list in marketplace item tester 2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b Enable marketplace item test for avatar file 2018-09-18 13:25:01 -07:00
Kerry Ivan Kurian
645ad2bb7a Enable marketplace item test for avatar url 2018-09-18 12:36:03 -07:00
Kerry Ivan Kurian
8f5923d562 Show installed apps on start of marketplace item tester 
Also, refactor a bit.
 2018-09-18 11:23:32 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
Zach Fox
68e6142f8b Follow wallet setup referrer when autogenerating new wallet 2018-09-14 15:34:00 -07:00
Zach Fox
9c5544af39 Merge in big work from appui_notifications branch 2018-09-14 14:37:04 -07:00
Dante Ruiz
ff52639bc3 fix update 2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b fix snapshot settings 2018-09-14 12:59:28 -07:00
Zach Fox
de2548d926 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-12 09:30:00 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Seth Alves
3b3006efb0
Merge pull request #13911 from ElderOrb/FB17982_master 
Avatar App: stop reloading existing selected bookmarks on app relaunch (master)
 2018-09-11 14:04:19 -07:00
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
Brad Hefta-Gaub
299e9d0d38
Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints 
filter out left/right hands from joints list in avatarapp
 2018-09-11 09:34:48 -07:00
John Conklin II
9c546fc780
Merge pull request #13957 from ElderOrb/FB18024 
fix keyboard collapsing in VR/goto
 2018-09-10 13:09:28 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901 
Improve HMD Menu page navigation
 2018-09-10 11:34:21 -07:00
Alexander Ivash
7058b07aea FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized 2018-09-07 12:41:39 +03:00
Wayne Chen
72818f3729 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged 2018-09-06 17:37:36 -07:00
Zach Fox
0e785f9bdb Fix MS17877: Persist Connections table sort choice 2018-09-06 15:35:26 -07:00
David Rowe
ab47e16be1 Fix up titles and leading white space of some dev menu tablet dialogs 2018-09-06 14:35:08 +12:00
David Rowe
8420afd143 Fix title not not going back to "Settings" upon Save or Cancel 2018-09-06 14:00:33 +12:00
David Rowe
a7099025dc Fix up some Settings dialogs' titles 2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12 Modify look of HMD mode Settings dialogs' titles 2018-09-06 11:02:24 +12:00
David Kelly
b022697dfa volume slider on users fixed 2018-09-05 15:36:07 -07:00
David Rowe
398724de73 Make Save in HMD settings dialogs return to previous dialog 
Same as Cancel key does.
 2018-09-06 10:23:45 +12:00
David Rowe
f144308334 Make tablet menu page title navigation go back a level 2018-08-31 16:58:59 +12:00
Alexander Ivash
07739453c5 coding standards 2018-08-31 01:51:13 +03:00
Alexander Ivash
cb1855b0d7 filter out left/right hands from joints list in avatarapp 
should fix:
	FB17884 - Wearable disappears when added to some joints
	FB17885 - Changing werable joint moves the model and detaches from avatar body
 2018-08-31 01:51:13 +03:00
Alexander Ivash
daf81bbcb8 FB17982 Avatar App reloads existing selected bookmark on app relaunch 2018-08-31 00:36:52 +03:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
David Rowe
c29c9f98c1 Make Cancel in HMD settings dialogs return to Settings dialog 2018-08-28 11:15:57 +12:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588 Merge howard/wallet-locker2 into my branch 2018-08-23 14:45:16 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Alexander Ivash
cfb820762d bulk adjusting to coding guidelines 2018-08-22 00:42:01 +03:00
Alexander Ivash
9f92ff5de9 fix for duplicating wearables on saving 
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
 2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25 take 'relayParentJoints' into account during wearables comparison 2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2 explicitely specify localRotations on joint change, otherwise it will be updated by engine 2018-08-18 16:32:31 +03:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable 
Use Create Entities as Grabbable option when adding asset to world
 2018-08-16 09:22:23 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll 
Auto scroll
 2018-08-14 20:56:53 -07:00
Roxanne Skelly
50b0a458ce Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled. 2018-08-14 16:32:56 -07:00
Roxanne Skelly
5a8da4ce97 Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app 2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll 2018-08-14 15:27:22 -07:00
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208 
Improve text in Avatar app's pop-ups
 2018-08-14 08:48:04 -07:00
unknown
c622a587e3 Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-11 07:59:56 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340 
Only update gain if it really changed
 2018-08-10 16:20:24 -07:00
Zach Fox
096be16bb1 Only restart timer if feedMouseArea doesn't contain mouse 2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c PropagateComposedEvents 2018-08-10 15:30:32 -07:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
Alexander Ivash
c1ebadfdd8 adjust text in 'get wearables' popup 2018-08-11 00:43:39 +03:00
unknown
5d1cc3696a Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 12:10:57 -07:00
Alexander Ivash
9b9e30e829 add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD 2018-08-10 20:14:15 +03:00
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -07:00
Zach Fox
e39dd250cd Things will 'just work' once backend is in place 2018-08-10 10:01:09 -07:00
Zach Fox
1699d3ed6a Wording change in Availability 2018-08-10 09:35:40 -07:00
Alexander Ivash
3bfe173371 allow saving wearables right after adding new one 2018-08-10 19:15:35 +03:00
Alexander Ivash
9304d6c5c4 reset UI to default state & disable controls on removing last wearable 2018-08-10 18:42:08 +03:00
Alexander Ivash
90fb0d7be6 add possibility to add wearable from external url 2018-08-10 17:59:11 +03:00
Alexander Ivash
9234813e08 bring back 'get more' wearables button 2018-08-10 14:54:15 +03:00
Alexander Ivash
1771e4c742 better handling of 'modified' inside AdjustWearables dialog 2018-08-10 12:58:45 +03:00
Alexander Ivash
56194bba8e bind 'is soft' to backend API, always show 'Hips' for soften entity 2018-08-10 12:58:45 +03:00
Alexander Ivash
550e39ac84 add possibility to change joints using combobox 2018-08-10 12:58:45 +03:00
Alexander Ivash
f8c1ba48ad update UI accordingly to the updated mockup 2018-08-10 12:58:44 +03:00
Alexander Ivash
a85ed2a2f5 show 'edit wearables' button even if avatar doesn't have any wearables 2018-08-10 12:58:44 +03:00
David Kelly
3b7d1cb6cf Only update gain if it really changed 
and only fire UserActivity if we really do change the gain
 2018-08-09 14:55:07 -07:00
Zach Fox
c0e2b3a240 Happening Now -> Featured 2018-08-09 11:49:29 -07:00
Zach Fox
4248f342b4 Fix MS17469: Fix conditionals for needing more paginated results when ListView changes 2018-08-09 10:22:09 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
Zach Fox
af9dc8acca Turn on only for Annoucements 2018-08-07 11:51:38 -07:00
Zach Fox
4cee6b720a Implement auto-scrolling on Places cards (TODO for Connections) 2018-08-07 11:50:38 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
David Rowe
f9d9324a14 Improve text in Avatar app's pop-ups 2018-08-04 10:55:57 +12:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
Zach Fox
7905c91289
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing 
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
 2018-08-01 14:23:26 -07:00
John Conklin II
c444bb11ba
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit 
Avatarapp: base 'SquareLabel' on button from Uit
 2018-08-01 13:10:33 -07:00
John Conklin II
bda9ed7f1a
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix 
use 'light' color scheme
 2018-08-01 11:23:10 -07:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -07:00
Alexander Ivash
6e6eae2160 Avatarapp: base 'SquareLabel' on button from Uit 2018-07-31 22:03:34 +03:00
John Conklin II
09d1964f1d
Merge pull request #13670 from ElderOrb/animate_get_more_avatars 
Avatarapp: hover animation for 'get more avatars' button
 2018-07-31 09:51:58 -07:00
John Conklin II
221dd3ee88
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes 
FB16992 - Layout changes to the two lightboxes in the Avatar app
 2018-07-31 09:36:16 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -07:00
John Conklin II
9c37e30fe6
Merge pull request #13678 from ElderOrb/FB17023 
FB17023 - Make visible avatar url in the avatar app
 2018-07-27 14:57:25 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
Alexander Ivash
c9d9f7363a use 'light' color scheme 2018-07-24 23:19:11 +03:00
Alexander Ivash
c13f27e2eb FB17023 - Make visible avatar url in the avatar app 2018-07-24 22:10:18 +03:00
howard-stearns
48184c102b Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad pal refresh that remembers your place 2018-07-23 15:25:06 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings 
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
 2018-07-23 15:19:46 -07:00
Alexander Ivash
e12569c747 FB16992 - Layout changes to the two lightboxes in the Avatar app 2018-07-23 23:24:17 +03:00
Alexander Ivash
091de4a9b5 Avatarapp: hover animate 'get more avatars' 2018-07-23 22:33:47 +03:00
MuteTab
97e5d65592 Added conditional check for VR vs non-VR menu. 2018-07-19 14:30:06 -07:00
Qliemillar
566c837bba
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix 
fix 'the drop down does not shows the wearable'
 2018-07-19 12:23:48 -06:00
howard-stearns
0a47672d64 machinery for fetching next page of inifinite scroll before it really 
needed, and use in our infinite scrolls
 2018-07-18 13:00:03 -07:00
Alexander Ivash
fe96ad2389 fix 'the drop down does not shows the wearable' 2018-07-18 21:16:47 +03:00
Zach Fox
919bfce7ab Simplify 2018-07-18 09:00:01 -07:00
Zach Fox
ef4265de4b Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button 2018-07-17 16:16:43 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup 
Fix MS16562: Massive PAL speedup!
 2018-07-16 16:45:01 -07:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
John Conklin II
33fb759c0a
Merge pull request #13599 from danteruiz/fix-combobox 
fixing combo boxes
 2018-07-13 10:33:33 -07:00
Zach Fox
2da911ad84 Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup 2018-07-13 09:47:49 -07:00
Zach Fox
04f856019d Fix MS16701: Uninstall installed app before updating 2018-07-12 16:27:19 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
Dante Ruiz
1c64ebc3ca fixing combo boxes 2018-07-12 13:57:48 -07:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
howard-stearns
8b713a437f don't store undefined in a qml int. 2018-07-10 12:14:31 -07:00
howard-stearns
886df959d1 expose totalPages and totalEntries, and use the later to display 
connections count
 2018-07-10 11:26:23 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -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
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
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +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
Alexander Ivash
462d2d5d80 fix 'card moves rapidly between hover and non-hover' 2018-07-06 21:00:54 +03:00
Alexander Ivash
459a1906a5 make highlight border width 4 per request from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
bad7890c83 extract avatar name from url if empty 2018-07-06 21:00:54 +03:00
Alexander Ivash
c765730c5a use avatarUrl instead of avatarThumbnailUrl for comparison, as thumbnail url is calculated 2018-07-06 21:00:53 +03:00
Alexander Ivash
3520285079 remove debug code 2018-07-06 21:00:53 +03:00
Alexander Ivash
e740f494ce styling settings slider, adjust height of edit fields 2018-07-06 21:00:53 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
235b0e9f4d change icon for 'guy-in-circle' 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 2018-07-06 21:00:53 +03:00
Alexander Ivash
856c95b52a move avatarapp-specific images into appropriate subfolder 2018-07-06 21:00:53 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
1cc086f9c6 cleanup and bugfixing 2018-07-06 21:00:53 +03:00
Alexander Ivash
74bfea59cc reply => data 2018-07-06 21:00:53 +03:00
Alexander Ivash
bcb373618f navigation to market / my purchases from message dialog links 2018-07-06 21:00:53 +03:00
Alexander Ivash
4ce8e29d97 navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables' 2018-07-06 21:00:53 +03:00
Alexander Ivash
3baa1a588f bound 'displayName' to backend, adjust font 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark 
improve comparision of attachments/wearables
 2018-07-06 21:00:53 +03:00
Alexander Ivash
fe8bb3c8ea simplify code a bit 
explicite store attachments in model
use models for comparison instead JS Objects
 2018-07-06 21:00:53 +03:00
Alexander Ivash
47ffcf8c42 change logic for determining if current avatar is bookmarked & move to model 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
6ff397e9e0 move all messagebox-es into dedicated component 2018-07-06 21:00:53 +03:00
Alexander Ivash
d1bf80b50c update UI based on the latest zeplin mockups 2018-07-06 21:00:53 +03:00
Alexander Ivash
5ebe26887d updated text styles based on the latest zeplin specs 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
9914a1d523 AdjustWearables: implement deleting/refreshing wearables/wearable 2018-07-06 21:00:52 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
57568d120e attempt to produce thumbnail url from marketId (works only partially), move model population code to model 2018-07-06 21:00:52 +03:00
Alexander Ivash
566074c86f use slider from ui-toolkit (per request from Mukul) 2018-07-06 21:00:52 +03:00
Alexander Ivash
de81f30407 page indicators styling 2018-07-06 21:00:52 +03:00
Alexander Ivash
4fa72eab6d show real wearables from avatar in combobox 2018-07-06 21:00:52 +03:00
Alexander Ivash
245ab7a309 explicitely specify 'getMoreAvatars', otherwise QML starts complaining about not-existing property 2018-07-06 21:00:52 +03:00
Dante Ruiz
ce3015662e backend integration from Dante 
* adding some functionality to avatar bookmarks
* saving work
 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Alexander Ivash
6059ef2904 a few updates to adjust wearables & settings pages 2018-07-06 21:00:52 +03:00
Alexander Ivash
4bb517f620 reimplement 'text input with pencil' based on QQC2 TextField 2018-07-06 21:00:52 +03:00
Alexander Ivash
00b54c3f46 disable hover effect for selected avatar 2018-07-06 21:00:52 +03:00
Alexander Ivash
7723d0f306 turn all input controls to uit-based 2018-07-06 21:00:52 +03:00
Alexander Ivash
cdc9a325eb use standard radiobuttons with light color scheme 2018-07-06 21:00:52 +03:00
Alexander Ivash
d3848ea0c5 spelling issue fix 2018-07-06 21:00:52 +03:00
Alexander Ivash
34693a8562 use correct overlay for avatars in management state 2018-07-06 21:00:52 +03:00
Alexander Ivash
3acde99587 hide 'get all avatars' while in 'manage' state 2018-07-06 21:00:52 +03:00
Alexander Ivash
f8917a835a hide page indicator when only one page 2018-07-06 21:00:52 +03:00
Alexander Ivash
1916df6c81 specify border radius for 'get more avatars' 2018-07-06 21:00:52 +03:00
Alexander Ivash
8a5abb32a7 rework avatar selection logic based on changed requirements: selecte avatar always goes to the beginning of the list, selected page auto-switches to the first one 2018-07-06 21:00:52 +03:00
Alexander Ivash
bdacd1b792 left-to-right layout in favorites grid 2018-07-06 21:00:52 +03:00
Alexander Ivash
10e5f03f5e move selected avatar to the beginning of the page 2018-07-06 21:00:52 +03:00
Alexander Ivash
e0a8d90141 adjust link icon size 2018-07-06 21:00:52 +03:00
Alexander Ivash
3d4fb2d368 fix spelling error 2018-07-06 21:00:52 +03:00
Alexander Ivash
4d2a37aff2 show add to favorites on clicking star 2018-07-06 21:00:51 +03:00
Alexander Ivash
bd48ff9ee6 remove link glyph rotation 2018-07-06 21:00:51 +03:00
Alexander Ivash
c54b2c8f26 adjust avatar thumbnail image radius 2018-07-06 21:00:51 +03:00
Alexander Ivash
bd719286d8 move highlight under the green wearable indicator, use internal highlight of ShadowImage instead of extra Rectangle 2018-07-06 21:00:51 +03:00
Alexander Ivash
8a8f599583 rounded avatar images 2018-07-06 21:00:51 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00
Seth Alves
c0e1e9c23a
Merge pull request #13353 from vladest/address_dialog_focus_fix 
Remove extra textfield fro address bar input
 2018-07-06 09:00:00 -07:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
Dante Ruiz
603ab87c47 fix configuration page 2018-07-02 14:38:16 -07:00
Zach Fox
c95b359aa7 Fix MS16390: Correctly update UI when Buy endpoint fails 2018-07-02 10:23:53 -07:00
vladest
0f1312ab9b Merge branch 'master' into address_dialog_focus_fix 2018-06-29 19:41:26 +02:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve 
Fix audio device sometimes being on the wrong thread
 2018-06-28 09:59:00 -07:00
r3tk0n
f36ba49fbd
Update TabletGeneralPreferences.qml 
Fixed a typo
 2018-06-27 16:30:38 -07:00
r3tk0n
d6684e5ef7 Re-add mouse sensitivity option to tablet. 2018-06-27 16:23:40 -07:00
r3tk0n
c80ab0d237 Re-added mouse sensitivity settings to General Preferences dialog. 2018-06-27 16:10:07 -07:00
Howard Stearns
5fe7b874a4
Merge pull request #13455 from howard-stearns/test-wearables 
16089: test wearables for wear before gifting and wearing
 2018-06-25 16:44:53 -07:00
Zach Fox
3ceb9ddee9
Merge pull request #13444 from zfox23/MS16074_16076_banklinks 
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
 2018-06-25 13:47:08 -07:00
howard-stearns
43cba68cd2 test wearables for wear before gifting and wearing 2018-06-25 13:40:45 -07:00
Zach Fox
6fce6431a3 Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home 2018-06-22 16:09:49 -07:00
Zach Fox
25f22326a8 Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity 2018-06-22 15:43:16 -07:00
Atlante45
4a4c0d132e Make stereo interface async 2018-06-18 17:26:29 -07:00
Zach Fox
ad1da3e225 Fix MS16012: Correct the criteria used to determine empty txn history 2018-06-18 14:26:46 -07:00
vladest
41dad71634 Merge branch 'master' into address_dialog_focus_fix 2018-06-17 12:27:03 +02:00
howard-stearns
97fa22b69b fix concurrency drillDown 2018-06-15 16:57:21 -07:00
John Conklin II
2655dd77b6
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard 
MS15501: Fix keyboard in Create -> Model in HMD
 2018-06-15 15:34:02 -07:00
Anthony Thibault
f2d6d0ee56
Merge pull request #13351 from ctrlaltdavid/21891 
Fix Avatar > Attachments joint and spinboxes
 2018-06-14 11:31:04 -07:00
John Conklin II
7057e00583
Merge pull request #13298 from danteruiz/fix-vive-configuration-page 
Controller Confguration Page fixes
 2018-06-14 11:07:26 -07:00
Dante Ruiz
dc28e8f03f fixing error 2018-06-13 18:24:06 -07:00
Dante Ruiz
eb01b50e6f making code review changes 2018-06-13 17:58:10 -07:00
Zach Fox
6b59b5b53c MS15501: Fix keyboard in Create -> Model in HMD 2018-06-13 13:23:43 -07:00
vladest
75ce8e56df Merge branch 'master' into address_dialog_focus_fix 2018-06-13 11:47:29 +02:00
howard-stearns
05d3f92867 drillDownToPlace and iStacked based on server data. 2018-06-12 13:18:44 -07:00
vladest
11129eddde Remove extra textfield fro address ber input 2018-06-12 18:48:41 +02:00
Stephen Birarda
10e34000aa
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains 
Domain-unreachable message remaining on slow connects
 2018-06-11 10:46:55 -07:00
David Rowe
0161015746 Fix setting avatar attachment joint 2018-06-11 15:31:42 +12:00
howard-stearns
020d622302 don't depend on matching handlers with overlapping requests 2018-06-09 17:34:49 -07:00
howard-stearns
421edbfa1e PSFListModel isa ListModel instead of hasa 2018-06-09 16:03:45 -07:00
howard-stearns
d68415c47c code feedback 2018-06-08 16:47:06 -07:00
howard-stearns
f0d486a6a5 remove the unused client-side stuff from model 2018-06-08 15:48:39 -07:00
howard-stearns
d9daa3495a remove comments / dead code 2018-06-08 15:36:10 -07:00
howard-stearns
36a0adf553 strip snapshot stacking code - we'll do it on server or not at all 2018-06-08 14:24:24 -07:00
howard-stearns
3ade31bdf6 always show edition 2018-06-08 12:57:40 -07:00
Zach Fox
9f0864944c Fix Friending in Connections tab - READ FIXME 2018-06-08 11:37:02 -07:00
Dante Ruiz
5d570f030f fixing calibration 2018-06-08 11:18:52 -07:00
howard-stearns
21ed081eae proper name for updated type filter of inventory endpoint 2018-06-08 09:52:11 -07:00
howard-stearns
64e466ee7d snapshot stacks 2018-06-07 21:10:40 -07:00
howard-stearns
595a0d8733 restore lost code 2018-06-07 19:24:05 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
howard-stearns
8b08505116 using filter/sort endpoint parameters 2018-06-07 16:14:18 -07:00
Zach Fox
f9b6e3e2ac
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks 
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
 2018-06-07 15:10:00 -07:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00
David Back
ae5d056ca0
Merge pull request #13292 from dback2/fileChooser 
File Dialog Fixes
 2018-06-07 09:38:56 -07:00
howard-stearns
8185d1b5f5 cleanup and consistently don't getNextPage at beginning 2018-06-06 15:24:54 -07:00
howard-stearns
335aeaeb38 purchases cleanup, wearables, and edition numbers when multiples seen. 2018-06-05 17:06:08 -07:00
howard-stearns
6aa551b35c Don't getNextPage when at beginning (even if that is also the end). 2018-06-05 17:04:29 -07:00
howard-stearns
ce41b83bad Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-05 15:30:04 -07:00
Zach Fox
2932ce177d Fix MS15500: Ensure Connection usernames show up in PAL 2018-06-05 10:57:25 -07:00
howard-stearns
f72f8c762b goto client-side filtering (preliminary) 2018-06-04 16:52:20 -07:00
Zach Fox
c5ef5cfccb Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable 2018-06-04 16:13:18 -07:00
Dante Ruiz
f5e2a6834b fixing some issues 2018-06-04 16:09:31 -07:00
David Back
6b7d9586d1 apply fixes to other file dialogs and fix tablet dialog buttons 2018-06-04 15:56:10 -07:00
Dante Ruiz
48c0b7379a fix vive configuration page 2018-06-04 15:16:11 -07:00
howard-stearns
5a1b56d573 checkpoint with goto feeds working (but without filtering) 2018-06-04 13:11:06 -07:00
howard-stearns
e40fc20cb6 fix some bugs that had been introduced by various out-of-team prs. 2018-06-04 13:00:08 -07:00
howard-stearns
29b09d64e6 checkpoint with PAL working. 2018-06-01 13:33:45 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
howard-stearns
b0d3729d4d Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-30 17:09:57 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515 
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
 2018-05-30 10:43:58 -07:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00
howard-stearns
17be460adf checkpoint 2018-05-25 16:37:06 -07:00
howard-stearns
d30d84f1bd checkpoint that has two ways to do filtering 2018-05-25 15:30:27 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
Wayne Chen
345138f4ff Changing showHidden property to be always true 2018-05-23 10:30:08 -07:00
Wayne Chen
e3414c320e changing property to alias to reflect folderListModel 2018-05-22 11:03:31 -07:00
Wayne Chen
1774b401c8 allowing file dialogs to show hidden files/folders via showHidden property 2018-05-22 10:24:04 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
Zach Fox
bc590f556a Get first page 2018-05-16 14:43:43 -07:00
Zach Fox
97bb014734 Almost working for Purchases! 2018-05-16 13:20:23 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f It's working 2018-05-16 12:17:17 -07:00
Zach Fox
79f8232c14 Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel 2018-05-16 11:11:24 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
Zach Fox
ccab2dd641 Starting the work 2018-05-15 11:48:33 -07:00
vladest
e2a8ee2a4c Fixed About date format. Increased space between logo and build info 2018-05-15 20:02:29 +02:00
vladest
a6ef459723 Open browser within Interface 2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
vladest
58f04121b7 Correct link colors 2018-05-15 06:22:10 +02:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02:00
Zach Fox
83cae54601 Show 'invalidated' label for valid = false 2018-05-14 13:34:20 -07:00
Zach Fox
2a1c2ba7b1 PurchasedItem logic 2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb Show invalidated items in My Purchases 2018-05-14 09:35:34 -07:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
Anthony J. Thibault
0ac12fa317 Bug fix for Vive Tracker Calibration Settings 
This issue was inadvertently introduced by the name change of the Vive display plugin.
 2018-05-10 17:56:54 -07:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
Zach Fox
22c26c348d MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:37:11 -07:00
Zach Fox
540f200b99 MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:34:28 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
vladest
c7ab1f3dbf Merge branch 'master' into menu-updates 2018-05-05 20:48:40 +02:00
vladest
5a5bfcfe02 Merge branch 'master' into menu-updates 2018-05-05 07:11:39 +02:00
Zach Fox
4ebed7605c MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 16:04:05 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode 
MS14699: Prevent Wallet passcode from being sticky in certain cases
 2018-05-04 15:22:41 -07:00
Zach Fox
53fe0bc616 MS14699: Prevent Wallet passcode from being sticky in certain cases 2018-05-04 14:08:21 -07:00
Zach Fox
e48d39ec38 MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 10:10:48 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
vladest
ea66e04ab8 Removed unwanted code 2018-05-02 18:58:40 +02:00
vladest
aef62d09c7 Merge branch 'master' into menu-updates 2018-05-01 21:47:46 +02:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson 
Enable sideloading .app.json Apps from local disk
 2018-04-30 11:14:24 -07:00
vladest
be22f49c32 Merge branch 'master' into menu-updates 2018-04-28 20:22:28 +02:00
Zach Fox
dbd7d7e2b4 Small cleanup 2018-04-27 14:19:58 -07:00
Zach Fox
ea716f2a1e Enable sideloading .app.json Apps from local disk 2018-04-27 14:08:53 -07:00
Zach Fox
c0fe504713
Merge pull request #13030 from zfox23/finalize_14295_14559 
Finalize work on MS14295 and MS14559
 2018-04-27 13:49:02 -07:00
Zach Fox
684d2b08ba Finalize work on MS14295 and MS14559 2018-04-27 12:03:54 -07:00
Howard Stearns
f8ad36afd0
Merge pull request #13028 from zfox23/updateCommerceFor67 
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
 2018-04-27 11:55:40 -07:00
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -07:00
Zach Fox
c163ae63b8 Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:28:59 -07:00
Zach Fox
0f36fb113d Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub
e4f5eb9cca
Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes 
MS14295: Fix lingering Gifts UI Bugs
 2018-04-27 07:30:14 -07:00
Zach Fox
e3b14bf478 MS14295: Fix lingering Gifts UI Bugs 2018-04-26 15:57:37 -07:00
Zach Fox
fc324f67bd MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC 2018-04-26 15:09:53 -07:00
vladest
3296ae0db8 Merge branch 'master' into menu-updates 2018-04-26 22:21:40 +02:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
vladest
2b716f051c Merge branch 'master' into menu-updates 2018-04-20 19:34:15 +02:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
Gabriel Calero
f2184bf456 Handle android back button. Remove unused resources. Fix compilation errors. 2018-04-19 17:31:25 -03:00
vladest
ab1a89a6f9 Merge branch 'master' into menu-updates 2018-04-19 21:02:30 +02:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix 
Only dismiss letterbox when clicking on grey areas
 2018-04-19 11:47:10 -07:00
Gabriel Calero
c8fe45eb8f Remove debug statements and unused code. Put JNI code in a separated file. 2018-04-19 11:41:59 -03:00
vladest
60d53359bb Fix Toolbar vertical position 2018-04-19 11:39:58 +02:00
Zach Fox
e01e7cc7bc Be a bit more efficient 2018-04-18 16:34:02 -07:00
vladest
7b21b36d3c Disable menu button in Toolbar mode 2018-04-18 22:19:54 +02:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
vladest
b5071d28e8 Merge branch 'master' into menu-updates 2018-04-18 21:10:57 +02:00
vladest
cacb9359c2 Toolbar at bottom 2018-04-18 20:57:28 +02:00
vladest
c402cb2c19 Fix Desktop double windows 2018-04-17 19:51:43 +02:00
Zach Fox
93cf399fd6 Only dismiss letterbox when clicking on grey areas 2018-04-16 15:09:19 -07:00
Zach Fox
02aa8ac566 Bugfixes per QA 2018-04-16 11:53:37 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
vladest
6d53512c6c Merge 2018-04-15 15:24:16 +02:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2 
Move to qqc2
 2018-04-12 11:26:55 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage 
Bugfix for #12759 Overlays.editOverlay not applying subImage property
 2018-04-12 10:34:17 -07:00
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
Gabriel Calero
8010fd2420 New view selector behaviour. Update icons 2018-04-11 18:43:39 -03:00
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError 
Commerce: Fix Certificate Info error
 2018-04-11 09:38:43 -07:00
Zach Fox
a2f5891a0b Cleanup 'Private' HMD Preview State Machine Logic 2018-04-10 16:00:18 -07:00
Zach Fox
ffab27d442 Commerce: Fix Certificate Info error 2018-04-10 15:54:55 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
Gabriel Calero
e85f5c97dc Remove bottom bar. Apply new design for android 2018-04-09 11:41:00 -03:00
Alexander Ivash
faddc556d7 FB14015 - Go To app does not close when selecting forward and back arrows on desktop 2018-04-07 17:57:22 +03:00
Zach Fox
0c48ccefa4 Clean up failResponse to make it better 2018-04-06 11:41:17 -07:00
Zach Fox
af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError 2018-04-06 10:58:32 -07:00
Gabriel Calero
15163f5e87 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 19:25:20 -03:00