Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Unreal/Content/SPIE/Avatars/Avatar_SpieFrau_Vest.uasset

master

Timo Hilger 13 hours ago

parent

0f05527cfc ab27f42378

commit

32c87e872d

15 changed files with 29 additions and 29 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

1. BIN
     Unreal/Content/Assets/Background/bg-final_SQUARE_LinesMask.uasset
2. BIN
     Unreal/Content/Project/Materials/2D_Environment/MM_2D_Environment_SPIE.uasset
3. BIN
     Unreal/Content/SPIE/Avatars/Avatar_SpieFrau_Vest.uasset
4. BIN
     Unreal/Content/SPIE/Avatars/PersonalityConfigs/RTG_Metahuman_MMed-To-SpieFrau.uasset
5. BIN
     Unreal/Content/SPIE/Material/MI_2D_Environment_Spie.uasset
6. BIN
     Unreal/Content/SPIE/Material/MM_2D_Environment_SPIE.uasset
7. BIN
     Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take01_Anim03_Talking_Cascadeur.uasset
8. BIN
     Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take02_Anim03_Talking_Cascadeur.uasset
9. BIN
     Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take03_Anim01_Talking_Cascadeur.uasset
10. BIN
      Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take03_Anim03_Talking_Cascadeur.uasset
11. BIN
      Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take14_Anim01_Talking_Cascadeur.uasset
12. BIN
      Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take14_Anim03_Talking_Cascadeur.uasset
13. BIN
      Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take14_Anim05_Talking_Cascadeur.uasset
14. BIN
      Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take15_Anim02_Talking_Cascadeur.uasset
15. BIN
      Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take15_Anim03_Talking_Cascadeur.uasset

BIN

Unreal/Content/Assets/Background/bg-final_SQUARE_LinesMask.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Content/Project/Materials/2D_Environment/MM_2D_Environment_SPIE.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Content/SPIE/Avatars/Avatar_SpieFrau_Vest.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Content/SPIE/Avatars/PersonalityConfigs/RTG_Metahuman_MMed-To-SpieFrau.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Content/SPIE/Material/MI_2D_Environment_Spie.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Content/SPIE/Material/MM_2D_Environment_SPIE.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take01_Anim03_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take02_Anim03_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take03_Anim01_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_01_Take03_Anim03_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take14_Anim01_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take14_Anim03_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take14_Anim05_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take15_Anim02_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/Animations/Talking/AS_MC_Tim_02_Take15_Anim03_Talking_Cascadeur.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save