Skip to content

Hotfix: social emotes revert #6529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dalkia wants to merge 6 commits into
base: main
Choose a base branch
from
+2,303 −10,090
Open

Hotfix: social emotes revert #6529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a637e3
Revert "Fixed problem with avatars rotating suddenly while sitting on…
dalkia Dec 22, 2025
ecfb46d
Revert "fix: several social-emotes fix"
dalkia Dec 22, 2025
2f1bc71
Revert "SOCIAL_EMOTE logs disabled (#6417)"
dalkia Dec 22, 2025
30563a2
Revert "Fix: Incorrect audio mapping on multiple outcomes (#6406) (#6…
dalkia Dec 22, 2025
c561003
Revert "Social Emotes shape (#6344)"
dalkia Dec 22, 2025
4fa5f9b
fix: backpack race condition on avatar recreation
davidejensen Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ MonoBehaviour:
m_GroupName: Essentials
m_GUID: 47f803e1e9c5079449bd106df98a0b7d
m_SerializeEntries:
- m_GUID: 000895e935900fa43b53faf506ee15fa
m_Address: Assets/DCL/AvatarRendering/Emotes/SocialEmotesSettings.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 00657accebbe6c348b5208e385e5ec73
m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/Avatar_Facial_Features.mat
m_ReadOnly: 0
Expand Down Expand Up @@ -145,11 +140,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 79f752bc43a65384bab431cb6a44d8bd
m_Address: Assets/DCL/AvatarRendering/Emotes/UI/SocialEmoteOutcomesContextMenuSettings.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7f09a2d0d9adc4e43b67879ab9cdf360
m_Address: LightSourcePrefab
m_ReadOnly: 0
Expand Down
5 changes: 0 additions & 5 deletions Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a0f8bf40b1a14c54384029def9ea0582
m_Address: SocialEmotePin
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a1d5d4f99234041159f0c215eef3eff3
m_Address: NewNotificationPanel
m_ReadOnly: 0
Expand Down
2 changes: 1 addition & 1 deletion Explorer/Assets/DCL/AvatarAnimation/Editor/TriggerEmotePlayableBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public override void ProcessFrame(Playable playable, FrameData info, object play
profile.IsDirty = true;

// It adds the emote intent (which will be consumed and removed by the CharacterEmoteSystem) if it was not already added
CharacterEmoteIntent emoteIntent = new (URN, triggerSource: TriggerSource.SELF, spatial: true);
CharacterEmoteIntent emoteIntent = new (){ EmoteId = URN, TriggerSource = TriggerSource.SELF, Spatial = true};
GlobalWorld.ECSWorldInstance.Add(cachedEntity, emoteIntent);
}
}
Expand Down
Loading
Loading