Ryan Huffman
b717188ed0
Update avatar project styling
2018-12-22 21:57:09 -08:00
Ryan Huffman
9955de6288
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 11:43:49 -08:00
Ryan Huffman
748135eef9
Fix login-required size and projectFiles warning
2018-12-21 11:43:20 -08:00
Thijs Wenker
ad2d9bc79a
- fst read/write should work
...
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
2018-12-21 19:34:54 +01:00
Thijs Wenker
1da5b3fae2
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 19:20:16 +01:00
Ryan Huffman
7602da6f92
Add AvatarProjectUpload.qml
2018-12-21 08:16:18 -08:00
Thijs Wenker
ea901aa179
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 01:59:11 +01:00
Ryan Huffman
556f516be6
Update uploader screen
2018-12-20 16:30:08 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3
...
Case 20132, Case 16928: First class Image Entities
2018-12-20 21:20:49 +00:00
Thijs Wenker
79a9c82168
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-20 18:56:33 +01:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge
...
MS20253: Only emit screenChanged once screen has changed
2018-12-20 08:58:53 -08:00
Zach Fox
b0ce3a54d5
Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash
2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff
Un-wear things when trashing them if worn
2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3
Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash
2018-12-19 15:03:36 -08:00
Ryan Huffman
202326dbac
Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager
2018-12-19 12:03:30 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3
2018-12-19 11:37:10 -08:00
Ryan Huffman
c2aca64b11
Add start of opening uploaded avatar in inventory
2018-12-19 11:30:21 -08:00
Thijs Wenker
cb74313de8
create projects / style changes
2018-12-19 19:23:24 +01:00
Zach Fox
7fee0fc1e4
Fix MS20253: Only emit screenChanged once screen has changed
2018-12-19 09:50:52 -08:00
Zach Fox
116edcc224
I have no idea how this happened
2018-12-19 09:36:05 -08:00
Jeff Clinton
a7e7a2426e
Merge pull request #14538 from ElderOrb/FB19355
...
FB19355 - When I have avatar entities as children of my avatar, the A…
2018-12-19 09:09:54 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing
2018-12-18 17:11:10 -08:00
Ryan Huffman
720cd90dc7
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7
Integrate marketplace upload API
2018-12-18 13:08:55 -08:00
Wayne Chen
302e314787
keep me logged in by default
2018-12-17 15:21:41 -08:00
vladest
63aa27475e
Merge branch 'master' into avatar_app_warnings
2018-12-15 19:08:56 +01:00
Shannon Romano
a89c53cc52
Merge pull request #14581 from zfox23/MS20308_unknownItems
...
Fix MS20308: Allow users to checkout uncertifiable items
2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b
Fix MS20308: Allow users to checkout uncertifiable items
2018-12-14 11:17:56 -08:00
Shannon Romano
131b53e4df
Merge pull request #14315 from wayne-chen/loginInitiative2
...
2nd initiative for encouraging login
2018-12-14 01:59:35 +00:00
Ryan Huffman
2269447741
Fix AvatarPackager QML size
2018-12-13 15:27:10 -08:00
Shannon Romano
3e10bea1ce
Merge pull request #14567 from davidkelly/dk/18639
...
Return more connections in pal
2018-12-13 22:48:00 +00:00
Wayne Chen
1ce7d8a31c
dev feedback
2018-12-13 13:47:07 -08:00
Ryan Huffman
78c4c2599e
Add start of marketplace uploading and project file list
2018-12-13 13:27:31 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2
2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus
...
Keyboard interaction menus
2018-12-12 17:53:59 -08:00
Wayne Chen
a2ebb67cd5
dev feedback/fixing keyboard in profile creation
2018-12-12 17:33:22 -08:00
Wayne Chen
67fe05da97
fixing spacing
2018-12-12 15:31:33 -08:00
Wayne Chen
b4e2b74f3d
adding text wrapping/fixing keep me logged in setting
2018-12-12 15:27:42 -08:00
Wayne Chen
941050d42c
fixing tablet apps/referenceerror
2018-12-12 12:43:01 -08:00
Thijs Wenker
96673bb5b9
show project page
2018-12-12 21:15:44 +01:00
Dante Ruiz
51bdf1bf78
adding keyboards settings
2018-12-12 11:55:13 -08:00
Thijs Wenker
c0bd9121fb
open avatar projects
2018-12-12 19:55:14 +01:00
Wayne Chen
941df8bc35
attempting fix on losing logged in setting
2018-12-12 10:08:50 -08:00
Wayne Chen
2f07a0eb5d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-11 20:01:19 -08:00
Zach Fox
dff7804cdc
Change username to trashbot
2018-12-11 16:26:49 -08:00
Zach Fox
d74f7eb098
Implement MS20187: Add trash can feature to Inventory
2018-12-11 15:44:42 -08:00
Wayne Chen
f63c1b3fc5
dismiss dialog only if login dialog popped up
2018-12-11 15:42:35 -08:00
David Kelly
b2645bc23b
Return more connections in pal
2018-12-11 14:47:18 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings
...
Adding menu settings to disable teleporting
2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot
...
Fix MS20161: Fix INVENTORY notification dot state
2018-12-11 13:03:26 -08:00
Dante Ruiz
deaf3e8e44
adding option to disable teleportring
2018-12-11 11:06:13 -08:00
Zach Fox
75ba1cb3c7
I forgot to clear dot immediately
2018-12-11 10:30:12 -08:00
Thijs Wenker
3943fe2861
avatar packager initial
2018-12-10 21:29:03 +01:00
Wayne Chen
e53e8435eb
more fixing of logging in
2018-12-10 11:51:34 -08:00
Wayne Chen
2a37ed21b2
more centering
2018-12-10 11:16:31 -08:00
Wayne Chen
5c354c4bc7
centering logged in text
2018-12-10 11:13:55 -08:00
Wayne Chen
c80f7c5a29
fixing typos
2018-12-10 10:55:02 -08:00
Wayne Chen
f11c60d9ff
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-12-10 10:52:14 -08:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory
...
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
2018-12-10 10:49:06 -08:00
Wayne Chen
3c4382773a
fixing code for max height/width
2018-12-09 07:56:09 -08:00
vladest
c05e3e7d09
Fix Avatar apps warnings. Added notification for HMD.active property
2018-12-08 19:12:02 +01:00
Wayne Chen
a787b39cae
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-07 17:39:51 -08:00
Wayne Chen
23d3b96446
add spinner/design updates/fix steam link
2018-12-07 15:17:33 -08:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3
2018-12-07 14:26:59 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking
...
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
2018-12-07 12:09:44 -08:00
Zach Fox
4cc5fc755f
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
2018-12-07 11:42:03 -08:00
Wayne Chen
4e6f162e01
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-07 10:12:46 -08:00
Wayne Chen
2f4805dc04
adding focus disable signal to fix focus
2018-12-06 16:38:10 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1
...
Pay-Out API Frontend, Part One
2018-12-06 15:25:54 -08:00
Wayne Chen
1a86b8d172
50% opacity/bold shortcut text
2018-12-06 14:58:39 -08:00
Wayne Chen
4f0e23ed69
changing link steam flow/height of error message
2018-12-06 11:26:33 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3
2018-12-06 11:23:50 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0
Show pre-auth'd transactions in Recent Activity before redemption
2018-12-06 11:07:26 -08:00
Wayne Chen
9f894ae977
fixing case with KB pw prop./bolding error msg
2018-12-06 10:52:10 -08:00
Wayne Chen
89a216a5ec
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-12-06 09:05:07 -08:00
Wayne Chen
ce65e557bc
cleaning up commented code
2018-12-06 09:04:57 -08:00
Wayne Chen
f8a55a9196
25% opacity from PM req/fixing error message in profile body
2018-12-05 19:42:44 -08:00
Wayne Chen
a3a575acd1
updating background img binaries
2018-12-05 19:12:21 -08:00
Wayne Chen
f7265378bd
updating background img
2018-12-05 19:11:58 -08:00
Wayne Chen
037abd9b5e
don't allow PC keyboard in HMD login/fix sign up password
2018-12-05 18:14:59 -08:00
Zach Fox
235b27a198
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308
Secret to Coupon ID
2018-12-05 16:34:53 -08:00
Alexander Ivash
090bc4fc0d
FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables
2018-12-05 23:33:34 +03:00
Wayne Chen
27e4e1c245
pitch updates login pos/fix signup errors
2018-12-05 11:24:27 -08:00
Wayne Chen
eb51a5b7b6
changing opacity to 0.5
2018-12-05 10:16:48 -08:00
Wayne Chen
3d99ffc459
outing oculus login
2018-12-05 08:25:01 -08:00
Wayne Chen
a30f4ed0b3
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-12-05 08:17:06 -08:00
Wayne Chen
4daa943510
fixing scripts param/reverting some qml
2018-12-04 17:17:58 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml
2018-12-04 17:07:03 -08:00
Wayne Chen
57b21730de
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 17:01:56 -08:00
Wayne Chen
3951203b55
adding tablet bg/no movement in login state
2018-12-04 16:50:01 -08:00
Wayne Chen
a24cd41367
getting textfield into focus
2018-12-04 14:19:09 -08:00
Wayne Chen
e7e42e3430
adding steam linking
2018-12-04 10:03:40 -08:00
Anthony Thibault
7f2e427584
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
...
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
2018-12-03 18:56:45 -08:00
Wayne Chen
dc3381d4a9
updating artwork
2018-12-03 17:28:10 -08:00
Wayne Chen
22bf4fc5c4
removing fromBody
2018-12-03 16:11:13 -08:00
Wayne Chen
5beb810604
adding more steam login flow
2018-12-03 16:09:10 -08:00
Zach Fox
ab184c5c2b
Authorized Script to Coupon
2018-12-03 15:16:06 -08:00
SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
Anthony Thibault
c0bf832e39
Head and Hand offsets for Vive Trackers now function as expected
...
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now. This gives you the ability to adjust
the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
Zach Fox
0d66d230c5
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-11-30 16:45:03 -08:00
Wayne Chen
224ad28ed7
lowering banner/adding space btwn cancel/signup
2018-11-30 13:09:54 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2
2018-11-30 13:05:17 -08:00
Wayne Chen
c8783776fe
removing mousearea, fixing continue button
2018-11-30 13:02:29 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix
...
Fix QML achoring warnings on Layouts
2018-11-30 10:50:30 -08:00
Shannon Romano
dacf43d70c
Merge pull request #14483 from danteruiz/keyboard-toggle-option
...
Keyboard menu option in general settings
2018-11-30 09:43:10 -08:00
Wayne Chen
5e82bc78b7
fixing sign up screen
2018-11-29 20:17:18 -08:00
Wayne Chen
707339dd2a
allowing clicking any mousearea back to the textfield/disable movement ctrls
2018-11-29 17:18:40 -08:00
Wayne Chen
a80017c8c3
fixing typo
2018-11-29 15:04:34 -08:00
Zach Fox
bc39dbba8b
Finish out the feature
2018-11-29 12:44:30 -08:00
Wayne Chen
295d40724a
adding difference in text shown between tablet/other mode
2018-11-28 19:24:47 -08:00
Wayne Chen
34fb7159e2
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-28 19:24:20 -08:00
Wayne Chen
b0fb7778cf
fixing some text, turning off lasers until they intersect login overlay
2018-11-28 19:17:30 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2
2018-11-28 19:10:20 -08:00
Wayne Chen
527f8a2b59
UI feedback + new overlay position update
2018-11-28 15:38:37 -08:00
Zach Fox
371c50b2ab
Start work on Pay Out UI
2018-11-28 11:01:40 -08:00
Wayne Chen
d8a1c4e956
reverting header in qml
2018-11-27 14:34:58 -08:00
Zach Fox
a4175b0428
Error handling in checkout
2018-11-27 14:17:28 -08:00
Dante Ruiz
29028386c8
Keyboard menu option in general settings
2018-11-27 11:56:07 -08:00
Zach Fox
67dfccafec
Show item name when sending item
2018-11-27 10:19:14 -08:00
Wayne Chen
94789d0170
standardizing font of text fields
2018-11-26 21:06:42 -08:00
Wayne Chen
1258676d56
fixing text height/toolbar coming back
2018-11-26 21:01:34 -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
Wayne Chen
c53febceac
adding oculus to login dialog/adding focus wip
2018-11-26 15:10:04 -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
d12655ed7b
sfx to login mousearea/hiding desktop toolbar
2018-11-21 12:21:19 -08:00
Wayne Chen
cdee10d0b8
getting dominant hand laser + sign up working
2018-11-20 16:54:16 -08:00
Wayne Chen
4d55081184
changing the keyboard password flag appropriately
2018-11-20 10:56:34 -08:00
Wayne Chen
5f658b90ff
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-20 10:44:29 -08:00
Wayne Chen
d55c9467e7
fixing keyboard offset
2018-11-20 10:37:30 -08:00
Wayne Chen
e0eba2135a
Merge branch 'master' into loginInitiative2
2018-11-19 15:23:43 -08:00
Wayne Chen
1419ec907b
adding wip
2018-11-19 13:57:55 -08:00
John Conklin II
6b25179aa9
Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue
...
Dismiss keyboard when backout of the login screen
2018-11-19 09:58:54 -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
932d1dbcd7
Fixed width binding loop warning
2018-11-17 17:20:02 +01:00
vladest
53b7cc1376
Fix QML achoring warnings on Layouts
2018-11-17 15:06:25 +01:00
Dante Ruiz
4388763c34
fixing keyboard not being dismissing when backout of the login screen
2018-11-16 16:04:40 -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
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
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
...
Bug fix for head trackers in desktop mode
2018-11-13 11:49:24 -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
1611525220
Merge pull request #14028 from ElderOrb/FB12459
...
Improve keyboard raising logic for web views
2018-11-13 09:41:04 -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
37bb3586ea
show spinbox suffix in separate control to: disallow editing it & allow to pass validator
2018-11-13 19:05:16 +05:30
Alexander Ivash
a9ff1f4ecd
add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog
2018-11-13 19:03:50 +05:30
Wayne Chen
206c1d5b53
adding background image
2018-11-12 16:23:12 -08:00
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
dd1cf1be6c
adding back deprecated UI toolkit
2018-11-07 14:25:39 -08:00
Wayne Chen
a05d70cd8b
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 14:21:13 -08:00
Wayne Chen
8e075c2a7c
fixing login qml/using HMD position for overlay
2018-11-07 14:05:06 -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
edf16b15e8
missed a file
2018-11-07 12:04:28 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Wayne Chen
fc32ba9ce3
fixing create app window on desktop
2018-11-07 09:26:34 -08:00
Wayne Chen
1ded4b6fb8
hiding previous username/hiding dev menu
2018-11-06 16:45:45 -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
Wayne Chen
0fcbc11419
forgot file
2018-11-06 14:53:38 -08:00
Wayne Chen
c8071e81b1
sending user to saved address if logged in
2018-11-06 13:32:31 -08:00
Wayne Chen
9beedf9292
changing login overlay size + add keyboard
2018-11-06 12:56:50 -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
4c6700b497
remove deprecations warnings
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
fe4e4cfbd4
return controls-uit & styles-uit folders to preserve backward-compatibility
2018-11-06 14:21:14 +05:30
Alexander Ivash
f7d9bafc7d
add FilterBar & ScrollBar to qmldir
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
Anthony Thibault
ac8869eb61
Bug fix for head trackers in desktop mode
...
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
2018-11-05 16:21:19 -08:00
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
9deeee6534
removing unused classes
2018-11-05 11:07:29 -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
Wayne Chen
c43e67e4a8
adding tabbing between textfields
2018-10-31 16:57:03 -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
Wayne Chen
6822287d67
sending to tutorial if dismiss login
2018-10-31 16:13:01 -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
b5a48d31b6
Fix code-review spacing issue
2018-10-31 10:18:04 -07:00
Roxanne Skelly
628ec8ec2b
Removed QmlCommerce.cpp, Ledger.cpp changes as requested
2018-10-31 10:09:01 -07:00
Wayne Chen
03c39eb92f
more wip
2018-10-31 07:45:55 -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
Wayne Chen
43b269b612
testing tablet implementation
2018-10-30 11:48:22 -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
Wayne Chen
955b0a580e
adding hooks for application for pause/resume
2018-10-25 17:25:44 -07:00
David Rowe
51d56ddf22
Make tablet page indicators clickable to scroll tablet
2018-10-26 12:17:04 +13:00
