Wayne Chen
f4d4220e58
adding final create failure message handling, ui improvements
2019-01-16 17:05:56 -08:00
Wayne Chen
c54bce3953
fixing desktop login page crash
2019-01-16 17:05:55 -08:00
Wayne Chen
d38a657c54
filling username with oculus username, checking create error
2019-01-16 17:05:54 -08:00
Wayne Chen
671f15b63c
removing isLogIn
2019-01-16 17:05:53 -08:00
Wayne Chen
3b3b86888e
adding blur to login bg
2019-01-16 17:05:53 -08:00
Wayne Chen
fbc2dc5103
adding changes to forms
2019-01-16 17:05:52 -08:00
Wayne Chen
5c54930910
adding tablet close upon login
2019-01-16 17:05:52 -08:00
Wayne Chen
ca0916886a
adding more qml for oculus login
2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c
improving flow from Oculus API to login dialog wip
2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018
adding more staging
2019-01-16 17:05:48 -08:00
Wayne Chen
1fc51445d0
adding files for staging login
2019-01-16 17:05:47 -08:00
Wayne Chen
3b913db609
fixing typo
2019-01-15 14:21:37 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings
...
Fix Avatar apps warnings.
2019-01-15 11:03:43 -08:00
SamGondelman
68e15c6c07
fixes from 78
2019-01-14 13:36:21 -08:00
luiscuenca
824a93f900
Fix menu update on app reopened
2019-01-14 12:27:59 -07:00
luiscuenca
43d967329c
Change Avatar App design for avatar collisions
2019-01-14 10:13:12 -07:00
SamGondelman
4b67a79561
more web entity wip
2019-01-11 09:57:42 -08:00
Wayne Chen
ba8620b644
updating user activity logging
2019-01-09 13:51:40 -08:00
Anthony Thibault
5d606981de
Added HMD Avatar Alignment Type
...
Adds a new API to set this type, and an option to the Avatar App.
* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head. The new default behavior.
This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.
2019-01-08 18:35:28 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
...
Add menu checkbox to toggle collisions with other avatars
2019-01-07 08:58:09 -08:00
luiscuenca
d630fe9dbd
Add menu checkbox to toggle collisions with other avatars
2019-01-04 16:38:48 -07:00
Thijs Wenker
5d40e1e480
- CR/style fixes
...
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
2019-01-04 23:39:04 +01:00
Thijs Wenker
a3f72a7a08
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2019-01-04 21:10:35 +01:00
Ryan Huffman
6d5b9a88e4
Remove dead code in AvatarUploadStatusItem
2019-01-04 11:29:07 -08:00
Ryan Huffman
c2ceeb3d76
Apply AvatarPackager code review cleanup
2019-01-04 09:41:31 -08:00
Ryan Huffman
f27ee1767c
Fix rename not working correctly in AvatarPackager
2019-01-04 08:43:43 -08:00
Thijs Wenker
8625037285
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats
...
Fix network stats to use low-level values
2019-01-03 16:54:03 -08:00
Ryan Huffman
93f53cf43d
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2019-01-03 14:18:40 -08:00
Ryan Huffman
847496048f
Fix waiting-for-inventory sticking around on avatar uploader
2019-01-03 13:51:45 -08:00
Thijs Wenker
68521e11a7
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
...
# Conflicts:
# interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
# interface/resources/qml/hifi/avatarPackager/InfoBox.qml
2019-01-03 22:13:04 +01:00
Thijs Wenker
ecc578c2dd
- error messages
...
- style changes
2019-01-03 22:00:22 +01:00
Ryan Huffman
7953507cb8
Update avatar project rename to have audio and highlighting
2019-01-03 11:59:16 -08:00
Ryan Huffman
c13badcbc8
Fix project rename focus and create project not initializing
2019-01-03 10:20:13 -08:00
Clement
f163bbc0d5
Sample connections stats every seconds
2019-01-03 10:04:38 -08:00
Ryan Huffman
9c96f7bd01
Add RalewayButton
2019-01-03 08:21:52 -08:00
Ryan Huffman
61ac9d0050
Update various styling in Avatar Packager
2019-01-02 16:47:09 -08:00
Anthony Thibault
95c93e59a7
Make the Out of Range Strategy drop down wider
...
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
2018-12-31 09:23:33 -08:00
Thijs Wenker
cb33a91a34
- rename functionality
...
- avatar packager works in tablet now
2018-12-29 03:31:56 +01:00
Ryan Huffman
24aaeee5fd
Disable back button on avatar upload page
2018-12-27 22:55:54 -08:00
Ryan Huffman
83a60a541b
Fix styling and flow issues in avatar uploader
2018-12-27 18:53:07 -08:00
Ryan Huffman
c21d037800
Fix marketplace uploader not working with projects larger than 128MB
2018-12-27 17:51:27 -08:00
Ryan Huffman
9e7f89e2b0
Update link text for avatar project files
2018-12-27 14:38:46 -08:00
Ryan Huffman
89b03a3cdc
Add info popup box for avatar project files
2018-12-27 14:30:44 -08:00
Thijs Wenker
656d96c725
Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager
...
# Conflicts:
# interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
2018-12-27 21:52:57 +01:00
Thijs Wenker
1a38abe230
- add jointIndexes to new
...
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
2018-12-27 21:47:10 +01:00
Ryan Huffman
882975f01c
Update icons in avatar packager
2018-12-27 12:43:43 -08:00
Thijs Wenker
2f32458f72
recent projects
2018-12-27 19:52:56 +01:00
Ryan Huffman
1da179dc04
Update avatar packager styling
2018-12-27 00:13:45 -08:00
vladest
8d9cff3c58
Merge branch 'master' into avatar_app_warnings
2018-12-23 16:45:59 +01:00
Ryan Huffman
8c56e35f69
Add granular status to avatar upload
2018-12-23 00:13:01 -08:00
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
Wayne Chen
5e73fe3e41
more wip
2018-10-25 14:11:55 -07: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
Wayne Chen
75efc465b4
adding logging in qml wip
2018-10-24 17:34:42 -07:00
Wayne Chen
030b5a2745
resetting bodyLoader first source
2018-10-24 17:31:20 -07:00
Wayne Chen
951c4b2961
updating tablet implementation
2018-10-24 17:26:18 -07:00
Howard Stearns
993cb0cfa0
restore separation of inventory vs proofs.
2018-10-24 12:00:17 -07:00
David Back
b3e0d51260
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-24 11:48:56 -07:00
Wayne Chen
fad147656b
tablet implementationWIP
2018-10-24 10:47:32 -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
Gabriel Calero
28c062b842
Don't show stats in release builds
2018-10-24 11:57:59 -03:00
Wayne Chen
eb36abbff6
more wip
2018-10-23 23:10:16 -07:00
Wayne Chen
3522fe5263
some work to profile screen
2018-10-23 22:19:54 -07:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -07:00
Wayne Chen
c28f0fd232
updating qml, adding new glyphs font
2018-10-23 16:22:42 -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
Wayne Chen
d5b7fe62db
modularizing qml font in login
2018-10-23 11:00:42 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Wayne Chen
56656a9079
adding button font modularity/using cairo
2018-10-23 10:46:19 -07:00
Wayne Chen
2a0a099397
adding steam svg
2018-10-23 10:04:21 -07:00
Wayne Chen
162502923a
image for steam login button
2018-10-23 10:00:35 -07:00
Zach Fox
22c3321400
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 09:52:37 -07:00
Wayne Chen
c087b0f196
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-10-23 08:51:45 -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
137b240a47
more changes to functions
2018-10-22 20:03:12 -07:00
Wayne Chen
84001ae208
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 17:59:33 -07:00
Wayne Chen
1e418e9976
some cleanup in LinkAccountBody
2018-10-22 17:52:03 -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
Wayne Chen
736a78061d
button style change/cant access text
2018-10-22 17:44:03 -07:00
Wayne Chen
b33267a63a
more wip
2018-10-22 17:38:12 -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
Wayne Chen
3bd10716b2
wip
2018-10-19 16:06:28 -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
Wayne Chen
3488763d94
reverting login dialog stuff
2018-10-09 16:29:56 -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
Wayne Chen
83d683de7a
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-08 08:52:38 -07: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
Wayne Chen
e254324dbd
Merging more files
2018-10-01 16:47:10 -07:00
Wayne Chen
72851acd8b
adding spacer/close button pos
2018-10-01 16:44:01 -07: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
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML
2018-10-01 09:48:42 -07: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
David Rowe
b98bd741b8
Indent and reword jumping and flying checkbox
2018-09-26 18:14:02 +12: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
David Rowe
af1b4fef5d
Modify layout of rotation mode settings options
2018-09-25 18:03:57 +12: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
Howard Stearns
d3391b9273
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-24 13:50:52 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
...
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
Wayne Chen
3f9c8a266d
reszing unameField/showing flavorText
2018-09-21 14:36:13 -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
Wayne Chen
3907eaf68f
changing show password image
2018-09-20 14:40:19 -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
Wayne Chen
8770c363df
change button text to have a space
2018-09-19 17:02:05 -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
08b07e57d0
FB12459 - Keyboard shouldn't lower when move between property values in Create app in HMD mode
2018-09-20 00:42:39 +03: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
Wayne Chen
4807b5af7b
fixing display of user/pw incorrect
2018-09-18 09:57:26 -07:00
Kerry Ivan Kurian
f2a046da91
Install marketplace item tester
2018-09-18 00:08:09 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml
2018-09-17 15:17:43 -07:00
Zach Fox
23fab0985b
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-17 11:11:21 -07:00
Anthony Thibault
11fe657c05
Swaped AnimVar and StatMachine panels
2018-09-17 10:33:04 -07:00
Zach Fox
68e6142f8b
Follow wallet setup referrer when autogenerating new wallet
2018-09-14 15:34:00 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
Zach Fox
9c5544af39
Merge in big work from appui_notifications branch
2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-14 14:36:22 -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
Wayne Chen
fc007982e0
muting opt out activity if login fail/success
2018-09-12 21:25:41 -07:00
Wayne Chen
be650d5af0
changing when to log - there is broken code in bodyLoader
2018-09-12 16:00:43 -07:00
Zach Fox
de2548d926
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-12 09:30:00 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch
...
Pop up login dialog on launch
2018-09-11 17:43:29 -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
Wayne Chen
d69e536120
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 12:18:36 -07:00
Wayne Chen
ee516fd79f
adding proper checking for saved username/login
2018-09-11 09:36:46 -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
Wayne Chen
6bcf6eaae7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 09:13:41 -07:00
Wayne Chen
565bf7f6bd
adding correct implementation of show password
2018-09-11 09:08:35 -07:00
Wayne Chen
030ee13f31
removing logging from tabletlogindialog
2018-09-10 23:05:31 -07:00
Wayne Chen
69ae475787
adding user activity logging
2018-09-10 23:04:50 -07:00
Wayne Chen
5ece8d8707
using different paradigm for checking login dialog popup
2018-09-10 18:32:21 -07:00
Wayne Chen
e7616c7d34
added logging + activity logging
2018-09-10 15:06:14 -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
Wayne Chen
a8adaff6c1
Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch
2018-09-10 11:36:53 -07:00
Wayne Chen
ff86e480ba
adding debug statement to check for window close
2018-09-10 11:36:45 -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
Wayne Chen
e721844b10
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-10 10:10:16 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
...
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
Wayne Chen
695f6a8f16
Merging changes, modifying close button
2018-09-07 12:05:28 -07:00
Wayne Chen
39041f2942
fixing username field
2018-09-07 11:36:21 -07:00
Wayne Chen
44d36ec622
wallet should save username when checked
2018-09-07 11:31:36 -07:00
Wayne Chen
db96603cda
removing some unused properties
2018-09-07 11:23:58 -07:00
Wayne Chen
d9495275cc
adding cancel button and signed in checkbox
2018-09-07 11:22:31 -07:00
Wayne Chen
e1541fd7e0
Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch
2018-09-07 08:43:42 -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
Alexia Mandeville
190a335c71
Adding more margin to forgotten links
2018-09-07 00:01:00 -07:00
Alexia Mandeville
92f218ae29
Adding margins to forgotten link text
2018-09-06 22:59:19 -07:00
Alexia Mandeville
2443723a2b
Removing margins, adding width attribute
2018-09-06 21:14:04 -07:00
Anthony Thibault
6508533a15
Remove anim stats from plain ole stats.
...
There are still present in anim stats tho.
2018-09-06 17:58:40 -07:00
Wayne Chen
72818f3729
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
2018-09-06 17:36:47 -07:00
Wayne Chen
e76ebf7a0b
changing location of shortcuts
2018-09-06 17:29:16 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Alexia Mandeville
8e5f5cc796
Moving forgotten links
2018-09-06 16:16:43 -07:00
Zach Fox
0e785f9bdb
Fix MS17877: Persist Connections table sort choice
2018-09-06 15:35:26 -07:00
Alexia Mandeville
aabfda6eb5
Adding descriptive text
2018-09-06 14:16:42 -07:00
Alexia Mandeville
00e10ad684
Updating sign up text, moving forgotten info links
2018-09-06 14:05:51 -07:00
John Conklin II
152ec3d631
Merge pull request #13945 from davidkelly/dk/17915
...
volume slider on individual users in PAL remembers setting now
2018-09-06 12:55:46 -07:00
Wayne Chen
a5038850f1
right align forgot user/pw shortcuts
2018-09-06 11:37:35 -07:00
Wayne Chen
385027321b
fixing the eye open/closed pw image
2018-09-06 11:18:35 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
...
MS17463: only show InteractiveWindow on top of interface window
2018-09-06 10:15:20 -07:00
Wayne Chen
3f1eba418d
modifying location of links for user/pw
2018-09-06 00:07:23 -07:00
Wayne Chen
6d055ba136
changing sign up label
2018-09-05 23:49:49 -07:00
Wayne Chen
78fa52285f
adding show password toggle in textfield
2018-09-05 23:48:21 -07:00
Wayne Chen
7a136812bf
Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch
2018-09-05 20:05:19 -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
Anthony Thibault
3a3ffcc98c
First pass at improving anim stats.
2018-09-05 18:14:06 -07:00
Alexia Mandeville
901de120a6
Removing flavortext
2018-09-05 17:20:49 -07:00
Alexia Mandeville
1e697ad45f
Removing labels, adding flavor text, moving links
2018-09-05 16:25:18 -07: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
Alexia Mandeville
dcf2e00bd7
Adding placeholder text
2018-09-05 14:55:12 -07:00
Thijs Wenker
62d4b1805d
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-09-05 17:25:14 +02:00
David Rowe
f144308334
Make tablet menu page title navigation go back a level
2018-08-31 16:58:59 +12:00
Wayne Chen
82c7495615
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-30 19:41:06 -07:00
David Rowe
ed441d5570
Merge branch 'master' into M17901
2018-08-31 14:30:11 +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
Sam Gateau
9e2a540bab
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 12:12:24 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
...
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -07:00
Wayne Chen
3810984056
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-29 16:18:16 -07:00
Wayne Chen
6cdcae3349
switching address syntax, updating redirection domain
2018-08-29 16:11:51 -07:00
Sam Gateau
349f782697
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-29 16:07:50 -07:00
Zach Fox
67e57a9487
Merge pull request #13849 from zfox23/MS16003_backCloses
...
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
2018-08-29 14:29:12 -07:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
Thijs Wenker
c4d43b3fbc
CR fixes
2018-08-28 19:43:59 +02:00
David Rowe
c29c9f98c1
Make Cancel in HMD settings dialogs return to Settings dialog
2018-08-28 11:15:57 +12:00
Thijs Wenker
c05fe7f0b7
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-08-28 00:00:44 +02:00
Thijs Wenker
efa3fa7907
Don't always on top InteractiveWindows (Windows OS)
2018-08-27 20:42:06 +02:00
Sam Gateau
8f8bcc1901
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-24 15:23:37 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
...
workload tracks other avatars and adds/removes from physics simulation accordingly
2018-08-24 12:43:51 -07:00
SamGondelman
3d048c77ba
Merge remote-tracking branch 'upstream/master' into recurse
2018-08-24 11:39:05 -07:00
Sam Gateau
699240027e
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-23 19:29:14 -07:00
SamGondelman
b5b7167644
add to stats
2018-08-23 17:56:24 -07:00
Andrew Meadows
10d0833c19
use DynamicsWorld::numCollisionObjects instead of our own count
2018-08-23 15:57:54 -07: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
Andrew Meadows
777b90bdc0
add 'physics body count' to debug stats
2018-08-23 12:59:28 -07:00
Sam Gateau
473f8d0ca5
Working on the LOD system
2018-08-23 11:39:47 -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
Zach Fox
a378435683
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
2018-08-21 10:20:51 -07: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
Ryan Huffman
19f27ec911
Merge pull request #13810 from ctrlaltdavid/M11360
...
Don't auto-action entry in HMD file dialog when single-click
2018-08-14 12:57:28 -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
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
Alexander Ivash
5ba68cbfac
remove attachments menu item / dialogs / related components
2018-08-11 00:50:32 +03:00
David Rowe
3a356de49f
Don't auto-action entry in HMD file dialog when single-click on it
2018-08-11 09:46:11 +12: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
e900e034a3
couple Spinbox fixes:
...
- stop resetting value in 'valueFromText'. The issue with such approach is that is is not possible to understand whether value was really changed or, for example, focus did change
- instead, propagate validator to TextInput which makes not possible to type bad text (which eliminate the reason for original fix)
- specify correct inputMethodHints to guide onscreen keyboards
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
da68a8906e
show displayText if specified (to allow override combobox current value)
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
amantley
08889b627a
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-08-06 09:16:53 -07:00
John Conklin II
00a8b73814
Merge pull request #13751 from danteruiz/fix-flying
...
fix flying
2018-08-03 19:27:47 -07:00
Dante Ruiz
9bebd1e623
making changes
2018-08-03 18:11:55 -07:00
amantley
375d726535
added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file
2018-08-03 16:48:43 -07:00
David Rowe
f9d9324a14
Improve text in Avatar app's pop-ups
2018-08-04 10:55:57 +12:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a
...
Don't allow Web surfaces created by non-client scripts to access files
2018-08-03 15:25:41 -07:00
amantley
bd88d5f15b
merging with ik leg fix code in master
2018-08-02 09:48:04 -07: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
Brad Davis
4b317a84d8
Don't allow Web surfaces created by non-client scripts to access files
2018-08-01 15:12:45 -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
082a3bca89
Merge pull request #13679 from ElderOrb/FB16840
...
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
2018-08-01 11:46:59 -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
amantley
637a214165
added the anim stack print out static object for the list of motion and weights
2018-07-27 17:25:00 -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
amantley
b28ce40f09
adding the anim stack print out feature half way done
2018-07-27 08:46:40 -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
amantley
91b9865f27
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-07-24 17:14:24 -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
dfb20c4afc
FB16840 - Qml spinboxes in UI toolkit should focus the underlying field when clicked on
2018-07-24 23:02:06 +03:00
Alexander Ivash
c13f27e2eb
FB17023 - Make visible avatar url in the avatar app
2018-07-24 22:10:18 +03:00
amantley
aa92865b21
added the code to display the alphas for the motion blends
2018-07-23 17:45:24 -07: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
amantley
962f3c6c53
added a placeholder for the animation stack stats that will be added
2018-07-20 14:16:20 -07: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
Wayne Chen
37131d75e9
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537
...
MS16537: Updating "Forgot Username/Forgot Password" behavior
2018-07-18 16:32:55 -07: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
Wayne Chen
0cbcae9181
reverting onLinkActivated brackets
2018-07-18 10:44:37 -07:00
Zach Fox
919bfce7ab
Simplify
2018-07-18 09:00:01 -07:00
Wayne Chen
3b7f88a4a8
Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537
2018-07-17 17:08:43 -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
Wayne Chen
089831b6ee
Adding potential fix
2018-07-12 14:15:16 -07:00
Dante Ruiz
1c64ebc3ca
fixing combo boxes
2018-07-12 13:57:48 -07:00
Sam Gondelman
2597568a0a
Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls
...
Rollback PR 12888 by deleting alternative +android files
2018-07-12 12:06:35 -07:00
Cristian Luis Duarte
b1d39e4959
Rollback PR 12888 by deleting alternative +android files
2018-07-11 21:21:12 -03:00
Zach Fox
bf4954d667
Fix MS16615: Don't early-remove .app.json we JUST installed
2018-07-11 15:27:43 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze
...
Fix haze on Mac (bug #15515 )
2018-07-11 20:04:22 +02: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
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows
...
Create App: Native windows
2018-07-09 14:25:13 -07:00
Alexander Ivash
425209189d
reduce precision
2018-07-07 03:03:24 +03:00
Alexander Ivash
7feb9910c9
use rotation degrees instead of quaternions for comparison
...
re-query entity properties after editing it to get actual changes
2018-07-07 02:36:19 +03:00
Alexander Ivash
4716be01f6
eliminate binding loop which could lead to not updating spinbox UI
2018-07-07 02:36:19 +03:00
Alexander Ivash
536395d199
only compare properties which exist for both objects in 'numeric comparer'
...
note: this is attempt to quick-n-dirty workaround weird issue with having colors informaiton inside 'dimensions' in the latest master
example:
"blue": 0.2367398738861084,
"green": 0.08945406973361969,
"red": 0.25246158242225647,
"x": 0.25246158242225647,
"y": 0.08945406973361969,
"z": 0.2367398738861084
2018-07-07 02:36:19 +03:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android
...
Support web3d overlays in android
2018-07-06 13:02:56 -07:00
Thijs Wenker
4b2e0765db
- cleanup (parent) signals InteractiveWindow after window is closed
2018-07-06 20:24:43 +02:00
Thijs Wenker
eea95161ab
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows
2018-07-06 20:06:50 +02:00
Thijs Wenker
eed1f66e71
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
2018-07-06 20:01:48 +02:00
Alexander Ivash
67fb8af87c
update avatarapp on avatar switch
2018-07-06 21:00:56 +03:00
Alexander Ivash
e943a607b0
'Wear wearable' => 'Wear wearables' (from QA feedback)
2018-07-06 21:00:56 +03:00
Alexander Ivash
fb1a2037e3
move specifying custom properties for preferences dialog from C++ to QML (per Dante's request)
2018-07-06 21:00:55 +03:00
Alexander Ivash
68041dc93c
get rid of TextStyle1..11 per request from Dante
2018-07-06 21:00:55 +03:00
Alexander Ivash
9b5135b66b
remove debug outputs per Dante's request
2018-07-06 21:00:55 +03:00
Alexander Ivash
48fc81b082
Buy wearables from Marketplace [new line]
...
Wear wearable from My Purchases [new line]
2018-07-06 21:00:55 +03:00
Alexander Ivash
a9f10b2305
avatarisland link should direct to 11.5848,-8.10862,-2.80195
2018-07-06 21:00:55 +03:00
Alexander Ivash
12c0292595
experimental fix for Mukul's issue
2018-07-06 21:00:55 +03:00
Alexander Ivash
e4d6528ab9
fix trashcan overlay over 'guy-in-circle'
2018-07-06 21:00:55 +03:00
Alexander Ivash
41a9b22bf6
long text truncation
2018-07-06 21:00:55 +03:00
Alexander Ivash
8d921b123d
The new layout from zeplin ( https://zpl.io/aMm76Yr )
2018-07-06 21:00:55 +03:00
Alexander Ivash
46992f04ad
replace bodymart & avatarisland images
2018-07-06 21:00:55 +03:00
Alexander Ivash
939749e084
The keyboard should appear at the bottom of the screen.
2018-07-06 21:00:55 +03:00
Alexander Ivash
3f86f3d91f
present avatar model name without marketId in black
2018-07-06 21:00:55 +03:00
Alexander Ivash
0ad11c4a6e
Open 'Learn to make a custom…' in default external browser
2018-07-06 21:00:55 +03:00
Alexander Ivash
2581157794
"The button changes from Confirm to overwrite, and the button style changes from blue to red"
2018-07-06 21:00:55 +03:00
Alexander Ivash
345c294d47
invalidate avatar model on using custom avatar url
...
disable navigation if no marketId
2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a
reflect changes in grabbed wearable position/rotation in UI
2018-07-06 21:00:55 +03:00
Alexander Ivash
c7570dbf83
integrate onscreen keyboard
2018-07-06 21:00:54 +03:00
Alexander Ivash
5381dce8d8
get rid of 'isExternal' due to changes requirements
...
show avatar thumbnail if url was specified & valid, show 'guy-in-circle' otherwise
2018-07-06 21:00:54 +03:00
Alexander Ivash
9925bc2822
don't treat empty display name as an error
2018-07-06 21:00:54 +03:00
Alexander Ivash
2c07aa787f
allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request)
2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105
allow changing avatar scale without saving; revert on cancel
2018-07-06 21:00:54 +03:00
Alexander Ivash
67b2512a2a
query avatar model name for current avatar
2018-07-06 21:00:54 +03:00
Alexander Ivash
6ff2ea96f4
crop avatar thumbnails to fit aspect ratio
2018-07-06 21:00:54 +03:00
Alexander Ivash
9a4ea07614
limit avatar name to 14 characters + … at the end
2018-07-06 21:00:54 +03:00
Alexander Ivash
ee856266c7
allow updating existing avatars
2018-07-06 21:00:54 +03:00
Alexander Ivash
b4c4ab88f0
update logging
2018-07-06 21:00:54 +03:00
Alexander Ivash
fdd7644cba
use numeric animation for avatar bookmark & page indicator
2018-07-06 21:00:54 +03:00
Alexander Ivash
3c78ba0060
resolve constant switching between hover/no-hover for page indicator
2018-07-06 21:00:54 +03:00
Alexander Ivash
afc09c13b2
specify updated shadow params from Mukul
2018-07-06 21:00:54 +03:00
Alexander Ivash
99affb22f5
show spinner during avatar thumbnails loading
2018-07-06 21:00:54 +03:00
Alexander Ivash
567298b59b
shadow for wearables indicator (based on mockups)
2018-07-06 21:00:54 +03:00
Alexander Ivash
6efcea2c27
adjust settings layout according to mockups, update style9
2018-07-06 21:00:54 +03:00
Alexander Ivash
b7614684de
add check for duplicate names into 'create favorites dialog', style accordingly to mockups
2018-07-06 21:00:54 +03:00
Alexander Ivash
a26248e1d2
switch to regexp-based method of extracting marketplaceId from url
2018-07-06 21:00:54 +03:00
Alexander Ivash
1778e59142
blue version of TextStyle3 should only be used for avatar name under favorites
2018-07-06 21:00:54 +03:00
Alexander Ivash
a4a1ac5d12
The height of the “Take it off” button should be the same as “save” button
...
“m” and “deg” should align with “Position” and “Rotation” text
The step size in degrees should be 1 degree
2018-07-06 21:00:54 +03:00
Alexander Ivash
17acb5e106
when the user clicks on it should take the user to the marketplace info page of the avatar
2018-07-06 21:00:54 +03:00
Alexander Ivash
9f7fd3faa2
add slight animation on hover
2018-07-06 21:00:54 +03:00
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
a88a851f15
allow specifying fontSize for uit-controls Button, expose impliciTextWidth to allow adjust-to-content type of sizing
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
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window
...
InteractiveWindow scripting API
2018-07-06 10:58:12 -07: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
1b63dfa20a
- OSX fixes (right camera after coming from native window, disappearing content)
...
- Fix show() to show the window after it was minimized
2018-07-06 17:50:48 +02:00
Thijs Wenker
2b8372c959
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
2018-07-05 17:59:11 +02:00
Sam
58f004352a
Added per pixel GPU stats
2018-07-04 17:15:12 +02:00
Thijs Wenker
3a32472b0b
added test / more docs
2018-07-04 02:49:20 +02: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
Thijs Wenker
3f6793b462
- center default native window
...
- close button destroys window by default unless Desktop.CLOSE_BUTTON_HIDES flag is set
2018-07-03 18:42:39 +02:00
Thijs Wenker
d886bc2d9c
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window
2018-07-03 18:19:48 +02:00
Thijs Wenker
3a6ab3562f
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
2018-07-03 16:51:24 +02:00
Thijs Wenker
7390983721
introduce scriptable presentationMode instead of automatic mode switching windows
2018-07-03 16:49:49 +02:00
Dante Ruiz
603ab87c47
fix configuration page
2018-07-02 14:38:16 -07:00
Dante Ruiz
e2757e80ea
Merge pull request #13512 from wayne-chen/passwordFieldLoginFix-case-14261
...
Hitting Enter Key in Password Field To Login
2018-07-02 12:55:44 -07:00
John Conklin II
844bd3f48d
Merge pull request #13518 from zfox23/MS16390_buyFail
...
Fix MS16390: Correctly update UI when Buy endpoint fails
2018-07-02 12:36:19 -07:00
John Conklin II
58a9bdc86f
Merge pull request #13511 from r3tk0n/mouse_menu2
...
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
2018-07-02 12:33:35 -07:00
Zach Fox
c95b359aa7
Fix MS16390: Correctly update UI when Buy endpoint fails
2018-07-02 10:23:53 -07:00
Wayne Chen
99a64f31d7
Adding Enter/Return for sign up dialog in pw field
2018-06-29 16:21:03 -07:00
Wayne Chen
2c32dc1cf5
adding enter key event for logging in in pw textfield
2018-06-29 16:13:02 -07:00
r3tk0n
9b59dc5809
Changed SpinnerSliderPreference.qml to general-case UI element as originally intended,
...
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
2018-06-29 15:22:57 -07:00
vladest
27906bcdc8
Turn on focus hacks again
2018-06-29 21:16:14 +02:00
Gabriel Calero
a6d093d8c9
Merge remote-tracking branch 'upstream/master' into web_overlay_android
2018-06-29 15:09:32 -03:00
vladest
0f1312ab9b
Merge branch 'master' into address_dialog_focus_fix
2018-06-29 19:41:26 +02:00
Gabriel Calero
2112af4400
Apply desing to android web entities and overlays
2018-06-28 17:46:33 -03:00
Thijs Wenker
8ade709c1f
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
2018-06-28 19:14:46 +02:00
Thijs Wenker
7fe9365a76
create app - native windows
2018-06-28 19:12:03 +02:00
Thijs Wenker
5029767493
InteractiveWindow scripting API
2018-06-28 19:04:08 +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
Dante Ruiz
a906fbaf56
fix login links
2018-06-26 10:20:22 -07:00
Gabriel Calero
48cdd6d64c
Fix web entities for android
2018-06-26 12:30:03 -03: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
Gabriel Calero
0a70e844bf
Merge remote-tracking branch 'upstream/master' into web_overlay_android
2018-06-25 17:41:51 -03:00
howard-stearns
43cba68cd2
test wearables for wear before gifting and wearing
2018-06-25 13:40:45 -07:00
Gabriel Calero
fedc0a9e61
Support web3d overlays in android
2018-06-25 16:37:03 -03: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
Zach Fox
fa3fae09b2
Merge pull request #13416 from zfox23/MS15154_removeButtonFocusState
...
Fix MS15154: Remove focused button color
2018-06-19 13:10:11 -07:00
Zach Fox
a4d47a0248
Merge pull request #13408 from zfox23/MS16012_emptyHistoryFix
...
Fix MS16012: Correct the criteria used to determine empty txn history
2018-06-19 12:01:51 -07:00
Zach Fox
97e4d2eb46
Merge pull request #13404 from zfox23/MS15545_fixWebBackButton
...
Fix MS15545: Fix PAL/GoTo WebView's Back Button
2018-06-19 11:25:27 -07:00
Zach Fox
d056fa6c93
Fix MS15154: Remove focused button color
2018-06-19 09:56:24 -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
Zach Fox
f307f1d97a
Fix MS15545: Fix PAL/GoTo WebView's Back Button
2018-06-18 10:19:00 -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
vladest
aa23728bca
Merge branch 'master' into address_dialog_focus_fix
2018-06-14 19:26:43 +02:00
John Conklin II
b43d5287e2
Merge pull request #13286 from ElderOrb/spinbox-bugs
...
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
2018-06-14 10:21:17 -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
010309ba31
Add focus change logging. Switch off all focus hacks
2018-06-13 14:51:29 +02: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
David Rowe
537665c22a
Fix spinbox not validating the second time an invalid value is entered
2018-06-12 17:35:53 +12: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
11178d80f7
Fix avatar attachment spinbox min/max values
2018-06-11 16:24:45 +12: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
