Skip to content

Added a Character Expression System #323

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
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Added a Character Expression System #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2d37e8
Added a Character Expression System
amadeus737 Jan 25, 2021
9080ed3
Moved Animation Transition Code to SetMood() rather than Update(). Fi…
amadeus737 Jan 25, 2021
0b7ff96
Extended system to support multiple actors
amadeus737 Jan 26, 2021
f62578e
Added support for blendshape-based expressions
amadeus737 Jan 29, 2021
8278c2a
Added caching of textures and blend weights in edit mode, which are n…
amadeus737 Jan 30, 2021
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
2 changes: 1 addition & 1 deletion UOP1_Project/Assets/AddressableAssetsData/AddressableAssetSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: AddressableAssetSettings
m_EditorClassIdentifier:
m_DefaultGroup: a7bae5f88e2e24365bdf768f42df85c5
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
m_DisableCatalogUpdateOnStart: 0
Expand All @@ -26,7 +27,6 @@ MonoBehaviour:
m_overridePlayerVersion:
m_GroupAssets:
- {fileID: 11400000, guid: c257cd646c09b42b8b86848b31864603, type: 2}
- {fileID: 11400000, guid: 687f8568fdfe9486e90431baad275de8, type: 2}
- {fileID: 11400000, guid: 55edbf66eaced4772a00c784ee3ff29c, type: 2}
- {fileID: 11400000, guid: 93a5cdac5b0a347009a72be0430f7b1f, type: 2}
- {fileID: 11400000, guid: c1b90ebf1519148689c99ed4fd5c6f44, type: 2}
Expand Down
25 changes: 0 additions & 25 deletions UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
View file
Open in desktop

This file was deleted.

18 changes: 16 additions & 2 deletions UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-AssetTables.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,28 @@ MonoBehaviour:
m_GUID: 3fc61ad80464a43618ad3e2b887f0de6
m_SerializeEntries:
- m_GUID: 4561f7c0128574dc58b83aca6aa228e8
m_Address: Flags_en
m_Address: _en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 0ed01caa4e5a746de8077e7bb66412e0
m_Address: Flags_fr
m_Address: _fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 28b79018d4bee68439f47dd45c3103d8
m_Address: PhonemeSet_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 6718eeac2557fd74cb6726c597243f4b
m_Address: PhonemeSet_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
Expand Down
18 changes: 18 additions & 0 deletions UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,24 @@ MonoBehaviour:
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: c89dcd31aa56e05408dec38505e1571d
m_Address: Expression Dialogue Shared Data
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 5b34c1d30b339424984a3e4f37a292f0
m_Address: Phonemes Shared Data
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 99f15d4b14082d345b7ae040654c0b2a
m_Address: PhonemeSet Shared Data
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
28 changes: 28 additions & 0 deletions UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-en.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,34 @@ MonoBehaviour:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 59112c59e2bc6d24a83a2cbbb5b51bb1
m_Address: Hamlet Sad PhonemeSet
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: f089cbd98cf5f6c488c762ccd3bf3862
m_Address: Hamlet Neutral PhonemeSet
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: c22ca993de4db414d84fda02cc0ec397
m_Address: Hamlet Happy PhonemeSet
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: ae982ff6ddf20c348be8f119796bb07f
m_Address: Townsfolk_M Happy PhonemeSet
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
28 changes: 28 additions & 0 deletions UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-StringTables.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,34 @@ MonoBehaviour:
- Locale-fr
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: ed7ec3d876c1ac749bb3b7c3b31a1ef9
m_Address: Expression Dialogue_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: b79bcd9dcc7d2344bba737d4e8474d4b
m_Address: Expression Dialogue_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 9621472f258e4704f91edc8c483e4592
m_Address: Phonemes_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 215e94a491ef8c246b9ed7eff72544c4
m_Address: Phonemes_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
37 changes: 0 additions & 37 deletions ...dressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions UOP1_Project/Assets/Art/Characters/PigChef/Animation/Character Expressions.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading