Commit graph

60 commits

Author SHA1 Message Date
Heather Anderson
60b8d41c16 stripping wallet/marketplace out 2023-05-28 15:12:21 +02:00
Seth Alves
e085a00256 cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open 2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394 refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term 2019-03-27 10:12:58 -07:00
Seth Alves
e6c279ee5b unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers 2019-03-27 10:12:58 -07:00
Seth Alves
fa36f12145 lock wearables when adjust-wearables page is opened 2019-03-27 10:12:57 -07:00
Seth Alves
4fe94a4b32 when new wearables are added or removed, rerun getWearablesLocked() and update UI 2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables.
allow grabbing / adjusting others' wearables if they are unlocked.
2019-03-27 10:12:57 -07:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -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
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -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
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
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
Alexander Ivash
19c3f1516f relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables 2018-10-09 00:17:19 +03:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -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
ce6c8c72f5 ensure selection of newly-added wearable always happens after pushing updated wearables list to UI 2018-08-10 19:09:47 +03:00
Alexander Ivash
90fb0d7be6 add possibility to add wearable from external url 2018-08-10 17:59:11 +03:00
Alexander Ivash
0a28361dc8 treat ModelEntityItem-s with relayParentJoints as wearables 2018-08-10 12:58:45 +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
6db46e84ff FB17036 Avatar App causes error on cache reload (CTRL+R) 2018-07-25 01:11:26 +03:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix
FB16870: Avatar Wearables showing incorrect number
2018-07-23 15:55:11 -07:00
danteruiz
9bf6cff5cd fix indent isssues 2018-07-20 12:27:51 -07:00
danteruiz
ce3922a3c1 fix avatarEntities undefined crash 2018-07-20 11:23:02 -07:00
Alexander Ivash
f5717b7648 add check for SELF_ID 2018-07-20 19:33:16 +03:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
Alexander Ivash
437f49ac22 16683 Avatar App - Add to Favorites Button Not Working 2018-07-13 03:01:02 +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
168584169c do not close avatarapp on hiding tablet 2018-07-07 02:36:19 +03:00
Alexander Ivash
19f37246a6 capitalize avatarapp name in toolbar/tablet icons 2018-07-07 02:36:19 +03:00
Alexander Ivash
67fb8af87c update avatarapp on avatar switch 2018-07-06 21:00:56 +03:00
Alexander Ivash
8021434984 remove debug tracing 2018-07-06 21:00:56 +03:00
Alexander Ivash
58de136dfa fix MARKETPLACES_INJECT_SCRIPT_URL, apply it on opening avatar info 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
cc151d6187 Change the name of the app from “AvatarApp” to “Avatar”. 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
73ec34825b add proper application icon 2018-07-06 21:00:54 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 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