Commit graph

37 commits

Author SHA1 Message Date
Mark
9d81ace243 Fixed MS21059: Avatar App Keyboard Raise in Desktop 2019-02-12 09:45:51 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp
Change Avatar App design for avatar collisions
2019-01-17 16:06:17 -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
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
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
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
vladest
c05e3e7d09 Fix Avatar apps warnings. Added notification for HMD.active property 2018-12-08 19:12:02 +01:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Alexander Ivash
c6764c6244 cherry-picking 2018-11-06 14:21:14 +05:30
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
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -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
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
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
amantley
a43985ef64 combo box for recenter model is added 2018-10-19 16:03:53 -07:00
amantley
0837f790eb combo box changes 2018-10-19 07:46:16 -07:00
amantley
b9a2f19d30 made all the suggested corrections except the dropdown qml. 2018-10-18 16:39:50 -07:00
Alexander Ivash
a4987e494a update imports 2018-10-18 21:05:20 +03:00
amantley
67afc86222 cleanup 2018-10-11 18:39:44 -07:00
amantley
1a0e2c6ea1 clean up for pr 2018-10-01 08:30:51 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
Alexander Ivash
cfb820762d bulk adjusting to coding guidelines 2018-08-22 00:42:01 +03: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
Alexander Ivash
68041dc93c get rid of TextStyle1..11 per request from Dante 2018-07-06 21:00:55 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 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
e740f494ce styling settings slider, adjust height of edit fields 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
566074c86f use slider from ui-toolkit (per request from Mukul) 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
cdc9a325eb use standard radiobuttons with light color scheme 2018-07-06 21:00:52 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00