Zach Fox
371c50b2ab
Start work on Pay Out UI
2018-11-28 11:01:40 -08:00
Zach Fox
a4175b0428
Error handling in checkout
2018-11-27 14:17:28 -08:00
Zach Fox
67dfccafec
Show item name when sending item
2018-11-27 10:19:14 -08:00
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
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
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
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
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
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
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
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
