Zach Fox
a9fd443f28
'improve' UI slightly
2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8
Bugfixes; enable purchase asset from marketplace screen raise
2018-11-26 15:48:49 -08:00
Zach Fox
8df5db4239
Allow scripts to open SendAsset screen with pre-filled info
2018-11-26 13:26:17 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
vladest
db82994b4d
Merge branch 'master' into qml_warning_fix
2018-11-18 16:10:21 +01:00
Alexander Ivash
fe43c733f8
FB19400 during shutdown -- TypeError: Cannot read property 'buttons'
2018-11-17 22:56:59 +05:30
vladest
53b7cc1376
Fix QML achoring warnings on Layouts
2018-11-17 15:06:25 +01:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
...
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
Howard Stearns
8e1785bd90
security settings post-oculus-store wording
2018-11-15 15:59:52 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697
...
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
2018-11-15 14:54:26 -08:00
Dante Ruiz
20ad05726e
entity server timout
2018-11-15 10:52:40 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859
...
Fix Goto app clicks not working
2018-11-15 09:56:56 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
...
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 14:38:34 -08:00
David Rowe
9c5d318341
Fix highlighting
2018-11-15 10:15:30 +13:00
Seth Alves
1593c1185a
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 12:29:09 -08:00
David Rowe
010f7121a3
Fix Goto app clicks not working
...
Includes better card highlighting fix.
2018-11-14 15:27:18 +13:00
Thijs Wenker
0248323bee
fix test path
2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd
Make ctrl+shift shortcuts work for create app
2018-11-14 01:05:37 +01:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836
...
Make tablet page indicators clickable to scroll tablet
2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640
...
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-11-13 09:32:24 -08:00
Alexander Ivash
b16efb2afb
set minimum shoulder width to 25 cm (based on discussion with Tony)
2018-11-13 19:06:10 +05:30
Alexander Ivash
3a62184afd
specify min/max/stepsize
2018-11-13 19:06:09 +05:30
Alexander Ivash
95c51c2ffa
unfocus spinboxes on finishing editing
2018-11-13 19:05:20 +05:30
Alexander Ivash
a9ff1f4ecd
add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog
2018-11-13 19:03:50 +05:30
Howard Stearns
3431bdbb0e
new inventory icons, and align message waiting light in items tab
2018-11-12 14:51:32 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
Wayne Chen
ea325acef9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-12 10:28:03 -08:00
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry
...
Actually fix MS19803: Replace missing imports
2018-11-09 16:38:26 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
...
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
Zach Fox
8d325d8dd9
Actually fix MS19803: Replace missing imports
2018-11-09 15:02:57 -08:00
Zach Fox
1ce6079c5a
Remove extra as
2018-11-09 11:26:18 -08:00
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2
2018-11-08 11:17:24 -08:00
Zach Fox
142dfab9ac
CR round 1
2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1
feedback changes
2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
...
Fix MS19743: Fix case where user couldn't update certain items
2018-11-07 14:57:35 -08:00
Wayne Chen
a05d70cd8b
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 14:21:13 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396
...
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
2018-11-07 13:36:41 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage"
2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505
Fix MS19743: Fix case where user couldn't update certain items
2018-11-06 15:47:47 -08:00
Wayne Chen
7c2dd973b7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-06 15:34:34 -08:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
Alexander Ivash
a3dfc873b7
rsolve rebase conflict
2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416
change imports (how could I miss this place?)
2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244
cherry-picking
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Howard Stearns
335947598f
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless
2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df
My items to my submissions
2018-11-05 15:23:25 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
Wayne Chen
2dd20de1bd
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-05 09:13:25 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -08:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Roxanne Skelly
a1eee351e9
Change "Proofs" to "My Submissions" in assets filter.
2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
David Kelly
e6c3e7e67f
initial purge of security tab from wallet
2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Wayne Chen
f62c8ae87a
overlay HMD implementation
2018-10-31 15:26:49 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Zach Fox
efcda129b7
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Roxanne Skelly
628ec8ec2b
Removed QmlCommerce.cpp, Ledger.cpp changes as requested
2018-10-31 10:09:01 -07:00
Roxanne Skelly
e5f06690b5
Strip out references to 'my purchases' vs 'my items' code
2018-10-30 17:31:31 -07:00
Roxanne Skelly
0e639f4e34
Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce
2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456
Checkpoint Proofs Filter in Inventory
2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
David Rowe
1a129335dd
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-10-30 19:57:07 +13:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
Wayne Chen
af04630642
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-26 17:53:13 -07:00
David Rowe
51d56ddf22
Make tablet page indicators clickable to scroll tablet
2018-10-26 12:17:04 +13:00
Howard Stearns
9095df4641
fix getting inventory back after showing my items
2018-10-25 12:59:49 -07:00
Howard Stearns
936c2b2cab
don't show price for free items
2018-10-25 12:46:30 -07:00
Howard Stearns
3503d79b05
missed a buy/purchase
2018-10-25 12:39:33 -07:00
Howard Stearns
e3b1e14db6
nix "buy" where possible.
2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247
nix the word "purchase" where possible
2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be
use the switch
2018-10-25 11:29:10 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Howard Stearns
993cb0cfa0
restore separation of inventory vs proofs.
2018-10-24 12:00:17 -07:00
Howard Stearns
c1cb41875a
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-24 09:56:37 -07:00
Wayne Chen
331b09c8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-24 09:16:24 -07:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -07:00
Howard Stearns
7707d92a95
connect wiring on purchases
2018-10-23 16:07:35 -07:00
Zach Fox
d1556ae4e8
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 15:51:34 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix
...
Sit State for the seated user in HMD: Squatty Potty Fix
2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
David Back
9df8ea35bb
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 13:28:35 -07:00
Zach Fox
897d21bea2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:18:08 -07:00
Howard Stearns
95b86bf5b7
initial limited commerce for oculus store prototype
2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Zach Fox
22c3321400
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 09:52:37 -07:00
amantley
3e8663f8e9
removed the dropdown from the avatar app, because it is in settings controls now
2018-10-22 22:31:26 -07:00
Wayne Chen
84001ae208
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 17:59:33 -07:00
amantley
472ab1c613
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-22 17:50:56 -07:00
amantley
cce2f295a1
fixed conflict in myskeletonmodel.cpp
2018-10-22 17:49:30 -07:00
Zach Fox
1d8994993c
Whitelist TTS scripting interface to TTS app, which is now a default script
2018-10-22 17:05:31 -07:00
David Back
e8bda1793f
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-22 15:12:45 -07:00
Zach Fox
f9cc4f5a69
Count unique source and url pairs
2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b
Only show unique resources
2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc
Tons of improvements
2018-10-22 13:59:57 -07:00
Zach Fox
55c1a88404
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
...
Better imports for controls and styles
2018-10-22 11:50:09 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix
2018-10-20 13:39:55 -07:00
Ryan Huffman
9d13902cd3
Improve paramater names in model dialog window
2018-10-20 11:26:12 -07:00
amantley
a427ddb235
removed extraneous print statements
2018-10-20 09:16:05 -07:00
amantley
55daeb11cd
moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure
2018-10-19 18:43:02 -07:00
amantley
070a517423
changed the recenterModel variables to userRecenterModel
2018-10-19 18:07:03 -07:00
Ryan Huffman
f1258e4445
Add a 'grabbable' option to the new-model dialog
2018-10-19 16:42:45 -07:00
amantley
a43985ef64
combo box for recenter model is added
2018-10-19 16:03:53 -07:00
Alexander Ivash
5fef331995
address CR comment
2018-10-19 19:35:12 +03:00
Wayne Chen
e32460ed96
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 09:25:57 -07:00
Alexander Ivash
5d8a253785
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
...
note: change also resolve a lot of other shutdown errors from QML (related to null parent)
2018-10-19 18:57:07 +03:00
amantley
0837f790eb
combo box changes
2018-10-19 07:46:16 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap
...
Fix MS18154: Don't snap to cards in My Purchases
2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
...
make room for keyboard and help in SendAsset
2018-10-18 17:53:52 -07:00
amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e
Remove cruft
2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a
Fix regression
2018-10-18 16:14:53 -07:00
Zach Fox
9f91238945
UX/UI improvements
2018-10-18 15:27:16 -07:00
Alexander Ivash
a4987e494a
update imports
2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
Kerry Ivan Kurian
89a5da80e0
Do not display incomplete metadata
2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Alexander Ivash
0ab8a0ba5f
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: TypeError: Cannot read property of null
2018-10-18 01:23:10 +03:00
David Back
50becb5c37
merge particle explorer into properties, resurrect sliders, other tidying/fixes
2018-10-16 12:39:34 -07:00
amantley
67afc86222
cleanup
2018-10-11 18:39:44 -07:00
Howard Stearns
6c6d29152f
new images for My Purchases rez tutorial
2018-10-11 12:36:43 -07:00
Howard Stearns
30971cd766
make room for keyboard and help in SendAsset
2018-10-10 15:43:20 -07:00
Wayne Chen
35eb857ea6
adding non-working login screen
2018-10-09 16:30:47 -07:00
Alexander Ivash
6e66f289fe
take 'materialData?materialName' cases into account
2018-10-09 23:08:14 +03:00
Anthony Thibault
7777f3edd0
Added OutOfRangeDataStrategy parameter to Controller Settings
...
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.
* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results. This is the default.
2018-10-09 10:51:02 -07:00
amantley
c4187f0d60
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-08 17:07:55 -07:00
Alexander Ivash
7d470cf161
FB18859 - Avatar App Bug when material entity is added as avatar entity
2018-10-09 01:59:41 +03:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery
...
Fix MS18608: Use new connections api endpoint
2018-10-03 09:04:58 -07:00
Brad Davis
ffbb144a7c
Fix avatar thumbnails
2018-10-02 16:31:24 -07:00
Dante Ruiz
182c92b951
fix mac issue
2018-10-02 11:24:09 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
...
Account-managed wallet flow improvements
2018-10-01 16:43:01 -07:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1
...
Fix some Mac rendering issues
2018-10-01 16:35:57 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061
...
use current wearable index, not joint index!
2018-10-01 16:14:33 -07:00
David Rowe
6ccd73ea47
Merge branch 'master' into M18586
2018-10-02 10:17:24 +13:00
Dante Ruiz
ad92b172cb
removing comment
2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0
merging from master
2018-10-01 09:44:54 -07:00
amantley
1a0e2c6ea1
clean up for pr
2018-10-01 08:30:51 -07:00
amantley
bdd6befef9
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-09-29 15:39:36 -07:00
Zach Fox
59eabbbb5d
Fix MS18608: Use new connections api endpoint
2018-09-28 14:28:50 -07:00
Zach Fox
5b72e17981
Fix MS18154: Don't snap to cards in My Purchases
2018-09-28 11:33:22 -07:00
Kerry Ivan Kurian
440e2062f5
Fix application uninstall in marketplace item tester
2018-09-27 22:14:02 -07:00
David Rowe
545c2591e3
Merge branch 'master' into M18586
2018-09-28 16:19:44 +12:00
David Rowe
868a3a9219
Tweak vertical spacing
2018-09-28 15:42:48 +12:00
Bradley Austin Davis
3dea4fd10a
Fix some Mac rendering issues
2018-09-27 19:21:50 -07:00
David Rowe
4813f4d042
Show/hide jumping & flying checkbox depending on movement mode
2018-09-28 13:02:27 +12:00
amantley
52355e53f1
adding the menu item to the avatar app for the sit state.
2018-09-27 16:44:55 -07:00
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
WolfGang
787127b149
move subImage recalculation to it's own method
2018-04-04 22:10:54 +01:00
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1
...
Fix 'Private' HMD preview texture enable/disable...again
2018-04-04 10:03:18 -07:00
WolfGang
f9bcd23463
make subimage update the image anchors
2018-04-04 17:28:55 +01:00
Seth Alves
2df334c50e
Merge pull request #12663 from ElderOrb/FB12870
...
Fix for not updating checkbox state on 'baking' / 'unbaking'.
2018-04-04 09:03:03 -07:00
Zach Fox
f20eddefc8
Fix 'Private' HMD preview texture enable/disable...again
2018-04-03 13:46:02 -07:00
Gabriel Calero
78c50410b3
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
2018-04-03 14:37:19 -03:00
Zach Fox
5441767442
Better cert display
2018-04-02 12:22:41 -07:00
Gabriel Calero
2ff13270ed
Go back to GoTo screen
2018-04-02 12:22:21 -03:00
Zach Fox
32e5e9986f
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
2018-03-30 10:10:43 -07:00
Alexander Ivash
814cfa4587
fix TabletAssetServer
2018-03-30 00:09:28 +03:00
Alexander Ivash
e5da59a62f
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
2018-03-29 23:01:59 +03:00
Liv Erickson
387ff680d5
support deleted scenario
2018-03-28 18:12:30 -07:00
Liv Erickson
b78f00342e
Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url
2018-03-28 17:53:42 -07:00
vladest
70ce1b2bf7
Fix invalid scrolling detection
2018-03-28 21:48:44 +02:00
Cristian Luis Duarte
f0bcaa47c8
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
2018-03-28 16:47:21 -03:00
Zach Fox
0175028a88
Ensure location is correctly updated when replacing set from Checkout page
2018-03-28 11:31:51 -07:00
vladest
001b6d23ff
Merge branch 'master' into move_to_qqc2
2018-03-28 20:16:26 +02:00
Zach Fox
ca2fba675d
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
2018-03-28 10:28:32 -07:00
John Conklin II
586fb4829c
Merge pull request #12637 from druiz17/fix-asset-server-qml
...
Fix asset server qml sorting
2018-03-28 09:35:53 -07:00
Seth Alves
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord
...
changing keyboard mapping
2018-03-27 19:00:05 -07:00
Dante Ruiz
ad9ca0da20
fix tablet version
2018-03-27 16:03:06 -07:00
John Conklin II
a258a330d3
Merge pull request #12676 from druiz17/fix-keyboard
...
fixing AddressManager keyboard when switching domains
2018-03-27 15:34:23 -07:00
vladest
096b56395e
Fix crash on startup
2018-03-27 18:22:56 +02:00
Zach Fox
db2f3451bd
Support .content.zip content sets
2018-03-26 16:20:29 -07:00
Zach Fox
bf48ecda6d
Fix cert location for content sets
2018-03-26 14:48:05 -07:00
Zach Fox
a588776b47
Fix infinite loading when authing wallet during Checkout
2018-03-26 13:19:40 -07:00
Dante Ruiz
b8796db1e5
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
2018-03-26 11:19:42 -03:00
vladest
56150f8962
Merge branch 'master' into move_to_qqc2
2018-03-24 15:34:49 +01:00
vladest
aefda9ef71
Merge branch 'master' into move_to_qqc2
2018-03-24 15:32:04 +01:00
Cristian Luis Duarte
686af4ff77
Clean code that manually checked for windows coordinates to disable radar touch
2018-03-23 20:02:51 -03:00
Cristian Luis Duarte
242b009562
Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.
2018-03-23 18:59:55 -03:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android
...
Android: Stats, disable IK, reduce impact of InputRecorder
2018-03-23 11:08:50 -07:00
Dante Ruiz
1d17658c80
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-22 16:29:16 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1
...
Commerce: Item Updates!
2018-03-22 15:40:22 -07:00
Liv Erickson
1244559618
remove spaces for clean-ness
2018-03-22 15:37:12 -07:00
Liv Erickson
0647155c30
re-add experimental image removal
2018-03-22 15:33:23 -07:00
Liv Erickson
f62e1ed54e
disable add button on model until text is entered
2018-03-22 15:29:41 -07:00
Sam Gondelman
bbded2215d
Merge pull request #12665 from gcalero/android_bottombar_resize
...
Android - Resize bottombar after window size changes (to always fill …
2018-03-22 11:15:02 -07:00
Dante Ruiz
86cd5ffa30
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-21 08:49:25 -07:00
Zach Fox
0b810c3aa8
Various fixes
2018-03-19 14:39:50 -07:00
Zach Fox
18aa95e0bb
New Checkout flow for updating specific Editions
2018-03-19 13:35:27 -07:00
Dante Ruiz
652faaa116
fixing AddressManager keyboard when switching domains
2018-03-16 16:32:37 -07:00
Dante Ruiz
1dcdcffa69
hopefully the last fix
2018-03-16 13:52:08 -07:00
Zach Fox
eb8cfcd8e9
Bugfix
2018-03-16 13:13:38 -07:00
Zach Fox
ad33e775f1
Fix bottom anchor for listView when banner is showing
2018-03-16 11:28:03 -07:00
Cristian Luis Duarte
e6a8b322b1
Android bottom bar - remove extra semicolon
2018-03-16 15:15:00 -03:00
Cristian Luis Duarte
18682d854c
Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from
2018-03-16 15:06:12 -03:00
Cristian Luis Duarte
79ff2df860
Android - Resize bottombar after window size changes (to always fill the screen horizontally)
2018-03-16 13:03:50 -03:00
SamGondelman
0fa73c73ce
stats
2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169
New notification flow for item updates
2018-03-15 16:03:49 -07:00
David Rowe
a7cd5a240a
Fix "text" overlay not clipping to right and bottom margins
2018-03-15 17:31:02 +13:00
Zach Fox
2d57c444b6
Don't auto apply 'updatable' filter
2018-03-14 16:02:33 -07:00
Zach Fox
cc4726b24b
Some bugfixes
2018-03-14 15:47:19 -07:00
Zach Fox
f3efdda6b0
Fix content set filter
2018-03-14 14:34:15 -07:00
Zach Fox
6647475f5c
Wrong sign
2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289
Final touches?
2018-03-14 10:58:18 -07:00
Zach Fox
70b3d0fe5f
Merge branch 'filterBar' into commerce_upgrades_1
2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6
Small update to dot before merging in filterBar
2018-03-14 09:45:42 -07:00
Dante Ruiz
d6b3e91de1
removing debug statement
2018-03-14 09:35:22 -07:00
Dante Ruiz
2fb1fbe027
fix sorting
2018-03-14 09:17:22 -07:00
Zach Fox
e2326a3733
Initial work for 'messages waiting' light
2018-03-13 17:05:16 -07:00
Dante Ruiz
2d85669b08
fix backedColumn width
2018-03-13 16:30:43 -07:00
Zach Fox
882e4d6b45
Parse the string that comes from the backend
2018-03-13 15:13:41 -07:00
Zach Fox
7b6b08fd26
Upgrade specific edition
2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-13 13:42:42 -07:00
Zach Fox
86115a8578
Merge branch 'master' of github.com:highfidelity/hifi into filterBar
2018-03-13 13:42:13 -07:00
Zach Fox
5563edd957
Focus fix; Switch to QQC2
2018-03-13 13:11:59 -07:00
Zach Fox
50e709c738
Add updates; drop shadow
2018-03-13 12:13:14 -07:00
vladest
d41dd1b18d
Merge branch 'master' into move_to_qqc2
2018-03-13 19:28:51 +01:00
Dante Ruiz
00fa5cfd06
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-13 10:08:00 -07:00
Dante Ruiz
f521a129b6
fixing issues
2018-03-13 10:07:34 -07:00
Zach Fox
bce7fb1ff1
Improvements
2018-03-12 16:54:10 -07:00
Zach Fox
9c7d857ecb
Fix some focus issues
2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da
It's working!
2018-03-12 15:54:11 -07:00
Zach Fox
db7eea543e
Initial progress
2018-03-12 15:11:09 -07:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
Alexia Mandeville
8c9c7248d4
Reorganize of menu action items as well as QML categories
2018-03-12 12:52:12 -07:00
vladest
fe5d7463fe
Merge branch 'master' into move_to_qqc2
2018-03-10 14:42:51 +01:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api
...
use correct scripting api for audio in Audio.qml
2018-03-09 13:41:20 -08:00
Dante Ruiz
e21c4988fb
stereo checkbox text change
2018-03-09 10:11:25 -08:00
Dante Ruiz
3a39fca268
made requested changes
2018-03-09 10:09:51 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one
...
clear wallet when picking a new one
2018-03-09 10:09:41 -08:00
John Conklin II
407dfec342
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one
...
clear wallet when picking a new one
2018-03-09 10:09:24 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain
...
Fix font loading for MacOS via completely different font loading method
2018-03-09 09:49:56 -08:00
Dante Ruiz
c49d0557fc
fixing check box issues
2018-03-09 09:29:37 -08:00
Dante Ruiz
8703e9e002
Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api
2018-03-09 08:42:50 -08:00
Atlante45
69fb830480
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-08 17:23:17 -08:00
Zach Fox
c22d79041d
Cleanup after cherry-pick
2018-03-08 14:35:56 -08:00
howard-stearns
883528488c
clear wallet when picking a new one
2018-03-08 14:35:43 -08:00
Zach Fox
747a6b07ce
Fix font loading for MacOS via different font loading method
2018-03-08 14:31:48 -08:00
howard-stearns
9d805283d1
clear wallet when picking a new one
2018-03-08 14:24:44 -08:00
Zach Fox
086431d0e7
Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain
2018-03-08 13:50:19 -08:00
Dante Ruiz
9f246ea314
Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api
2018-03-08 13:04:02 -08:00
Zach Fox
4df58f1e67
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-08 12:16:36 -08:00
Zach Fox
a479439b23
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions
...
Show Connection instructions in Send Money when 0 connections
2018-03-08 11:20:23 -08:00
Zach Fox
d0cc64f63d
Fix font loading for MacOS via different font loading method
2018-03-08 11:19:49 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android
...
Android Tip
2018-03-08 10:18:35 -08:00
Zach Fox
a0eb7e0712
Don't default unknown Marketplace item types to 'Entity'
2018-03-07 15:01:12 -08:00
Zach Fox
d71fc22ed8
Support argument to available_updates endpoint
2018-03-07 14:06:29 -08:00
Zach Fox
eded8586a5
Use correct backend terminology
2018-03-07 13:40:55 -08:00
Zach Fox
0285bf9379
purposeful incorrect indentation to prevent insane diff
2018-03-07 13:27:40 -08:00
Zach Fox
a2eb13b70b
Prevent logspam
2018-03-07 13:23:13 -08:00
Zach Fox
08b2be85d2
Don't pass isUpdating around
2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc
Take certID from backend instead of query params; Better loading; Uninstall app before updating
2018-03-07 11:10:47 -08:00
Zach Fox
91e0af9b46
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-07 10:16:10 -08:00
Zach Fox
b764a4d404
Filter out invalid purchases
2018-03-07 09:22:57 -08:00
Dante Ruiz
13767beece
Caps change
2018-03-07 08:19:36 -08:00
Cristian Luis Duarte
bde2ba9272
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
2018-03-06 22:02:23 -03:00
NissimHadar
d72f46ec3e
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-06 16:24:53 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523
...
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
2018-03-06 16:19:39 -08:00
Dante Ruiz
97d283cc5f
use correct api call for audio and correct function call to set stereo input mode
2018-03-06 16:17:27 -08:00
NissimHadar
dbf1be5de3
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-06 15:22:40 -08:00
Zach Fox
48aa862c16
Show Connection instructions in Send Money when 0 connections
2018-03-06 13:52:42 -08:00
Alexander Ivash
53e1a0cae5
forward 'maybeEnableHmdPreview' if control is not visible
2018-03-06 22:25:35 +03:00
Zach Fox
ee28983334
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-06 11:13:40 -08:00
vladest
86b9e1b873
Merge branch 'master' into move_to_qqc2
2018-03-06 13:40:51 +01:00
Zach Fox
35b23cc954
It's working!
2018-03-05 15:54:17 -08:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox
...
Adding Stereo checkbox in Audio settings
2018-03-05 12:45:01 -08:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
Zach Fox
4046c873bd
Still need to send correct thing to metaverse
2018-03-05 11:24:59 -08:00
Zach Fox
f5a8187fe2
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-05 10:01:55 -08:00
Zach Fox
f10f9aa939
Continued progress
2018-03-05 10:01:40 -08:00
vladest
148faa3a93
Merge branch 'master' into move_to_qqc2
2018-03-04 14:16:21 +01:00
NissimHadar
8536b44c61
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 16:09:06 -08:00
Zach Fox
f53aba2a32
Initial progress
2018-03-02 15:53:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading
...
Improve font loading via QRC instead of file path
2018-03-02 14:22:17 -08:00
Dante Ruiz
7ce13a3ce7
adding comment
2018-03-02 11:06:28 -08:00
Dante Ruiz
55d8cfd4c1
make sure dont make audio devices that don't use stereo use stereo
2018-03-02 10:56:44 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev
...
Android Master
2018-03-01 17:22:34 -08:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08:00
Dante Ruiz
4b572eda6b
changing Name
2018-03-01 11:05:40 -08:00
Dante Ruiz
8cae20f53d
adding stereo checkbox to audio settings
2018-03-01 11:03:18 -08:00
Zach Fox
877fa52034
Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading
2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
Dante Ruiz
95e14446dd
update qml file to show the current OpenVr headset
2018-03-01 09:03:52 -08:00
vladest
02612e0465
cleanup and fits text to buttons
2018-03-01 11:18:18 +01:00
vladest
f51025061c
Make Edit view more consistant with original one #2
2018-03-01 11:03:56 +01:00
vladest
7cbdbe9ab0
Make Edit view more consistant with original one
2018-03-01 11:02:05 +01:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
Cristian Luis Duarte
9acb83632c
Android - Make joystick move up when showing the bottom bar
2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
2018-02-28 15:55:50 -03:00
vladest
531c4dc41d
Merge branch 'master' into move_to_qqc2
2018-02-28 11:40:46 +01:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
Howard Stearns
1fb0f898b4
Merge pull request #12505 from howard-stearns/wallet-help
...
new wallet help
2018-02-27 13:18:36 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding
...
End seeding
2018-02-27 13:18:13 -08:00
howard-stearns
30896c264b
reduced text
2018-02-27 12:04:41 -08:00
howard-stearns
53b976b400
fix typo in bank href
2018-02-27 11:46:06 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 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
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
