Merge branch 'master' of https://git-repos.b-rex.de/b.ReX/SPIE-Avatar

# Conflicts: # Unreal/Content/MetaHumans/SpieFrau.uasset
1 month ago · 6b28b0e4a4
40 changed files with 72 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,38 @@
+*.uasset filter=lfs diff=lfs merge=lfs -text
+*.umap filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.bmp filter=lfs diff=lfs merge=lfs -text
+*.tiff filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text
+*.mp4 filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.ogg filter=lfs diff=lfs merge=lfs -text
+*.flac filter=lfs diff=lfs merge=lfs -text
+*.mov filter=lfs diff=lfs merge=lfs -text
+*.fbx filter=lfs diff=lfs merge=lfs -text
+*.blend filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text
+*.glb filter=lfs diff=lfs merge=lfs -text
+*.tif filter=lfs diff=lfs merge=lfs -text
+*.dll filter=lfs diff=lfs merge=lfs -text
+*.exr filter=lfs diff=lfs merge=lfs -text
+*.mb filter=lfs diff=lfs merge=lfs -text
+*.usd filter=lfs diff=lfs merge=lfs -text
+*.pyd filter=lfs diff=lfs merge=lfs -text
+*.usda filter=lfs diff=lfs merge=lfs -text
+*.mdl filter=lfs diff=lfs merge=lfs -text
+*.fst filter=lfs diff=lfs merge=lfs -text
+*.ie filter=lfs diff=lfs merge=lfs -text
+*.carpa filter=lfs diff=lfs merge=lfs -text
+*.raw filter=lfs diff=lfs merge=lfs -text
+*.mat filter=lfs diff=lfs merge=lfs -text
+Project/CmdWrapper/CmdWrapper.exe filter=lfs diff=lfs merge=lfs -text
+Project/CmdWrapper/Buildtemplates[[:space:]]3.4/* filter=lfs diff=lfs merge=lfs -text
+Project/ASR/vosk/python/VoskWrapper.exe filter=lfs diff=lfs merge=lfs -text
+Project/Unreal/Plugins/NeoKinectUnreal/Binaries/Win64/NuiDatabase/* filter=lfs diff=lfs merge=lfs -text
+Project/Unreal/Plugins/NeoKinectUnreal/Binaries/Win64/NuiDatabase/Expression/* filter=lfs diff=lfs merge=lfs -text
+Project/Unreal/Plugins/NeoKinectUnreal/Binaries/Win64/NuiDatabase/HDFaceTracker/AAMModel/* filter=lfs diff=lfs merge=lfs -text
+Project/Mixed/KinectSDK-v2.0_1409-Setup.exe filter=lfs diff=lfs merge=lfs -text
--- a/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/.gitignore
+++ b/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/.gitignore
@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/modules.xml
+/contentModel.xml
+/projectSettingsUpdater.xml
+/.idea.SPIE_Avatar.iml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/encodings.xml
+++ b/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/encodings.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
--- a/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/indexLayout.xml
+++ b/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/indexLayout.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
--- a/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/vcs.xml
+++ b/SPIE_Avatar/.idea/.idea.SPIE_Avatar/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
--- a/Unreal/Content/MetaHumans/SpieFrau.uasset
+++ b/Unreal/Content/MetaHumans/SpieFrau.uasset
--- a/Unreal/Content/Project/BP/Avatars/PersonalityConfigs/DA_PersonalityConfig_Ben_BREX.uasset
+++ b/Unreal/Content/Project/BP/Avatars/PersonalityConfigs/DA_PersonalityConfig_Ben_BREX.uasset
--- a/Unreal/Content/Project/BP/BP_Project_Manager.uasset
+++ b/Unreal/Content/Project/BP/BP_Project_Manager.uasset
--- a/Unreal/Content/Project/BP/Base/BFL_GlobalHelper.uasset
+++ b/Unreal/Content/Project/BP/Base/BFL_GlobalHelper.uasset
--- a/Unreal/Content/Project/BP/Base/UEC_AzureAISearch.uasset
+++ b/Unreal/Content/Project/BP/Base/UEC_AzureAISearch.uasset
--- a/Unreal/Content/Project/BP/EnumsAndStructs/S_ConfigSettings.uasset
+++ b/Unreal/Content/Project/BP/EnumsAndStructs/S_ConfigSettings.uasset
--- a/Unreal/Content/Project/BP/Modes/DA_Mode_Base.uasset
+++ b/Unreal/Content/Project/BP/Modes/DA_Mode_Base.uasset
--- a/Unreal/Content/Project/BP/Modes/DA_Mode_SPIE.uasset
+++ b/Unreal/Content/Project/BP/Modes/DA_Mode_SPIE.uasset
--- a/Unreal/Content/Project/BP/Modes/Data/E_Mode.uasset
+++ b/Unreal/Content/Project/BP/Modes/Data/E_Mode.uasset
--- a/Unreal/Content/Project/BP/Modes/Data/PDA_Mode.uasset
+++ b/Unreal/Content/Project/BP/Modes/Data/PDA_Mode.uasset
--- a/Unreal/Content/Project/BP/Modes/Data/S_AvatarInstructions.uasset
+++ b/Unreal/Content/Project/BP/Modes/Data/S_AvatarInstructions.uasset
--- a/Unreal/Content/Project/BP/Modes/Data/S_ProjectInstructions.uasset
+++ b/Unreal/Content/Project/BP/Modes/Data/S_ProjectInstructions.uasset
--- a/Unreal/Content/Project/BP/Modes/Data/S_Prompt_Dialogue.uasset
+++ b/Unreal/Content/Project/BP/Modes/Data/S_Prompt_Dialogue.uasset
--- a/Unreal/Plugins/AvatarCore_Manager/Content/UnrealCommands/AICommandTestBigHead.uasset
+++ b/Unreal/Plugins/AvatarCore_Manager/Content/UnrealCommands/AICommandTestBigHead.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/AnimationConfigs/AnimationConfig_Base.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/Animation/AnimationConfigs/AnimationConfig_Base.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/Interface/BI_AvatarAnimBP.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/Interface/BI_AvatarAnimBP.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/Interface/BI_RetargetedAvatarAnimBP.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/Interface/BI_RetargetedAvatarAnimBP.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarBase.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarBase.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarCore_AnimInst_Body.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarCore_AnimInst_Body.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarCore_AnimInst_BodyRetarget.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarCore_AnimInst_BodyRetarget.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarCore_AnimInst_Face.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/MetaHuman/AvatarCore_AnimInst_Face.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/PersonalityConfig/PDA_PersonalityConfig.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/BP/PersonalityConfig/PDA_PersonalityConfig.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/Materials/MI_GrayTexture_Head.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/Materials/MI_GrayTexture_Head.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/Materials/M_GrayTexture_Head.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/Materials/M_GrayTexture_Head.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/Materials/Textures/T_Gray_Head_D.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/Materials/Textures/T_Gray_Head_D.uasset
--- a/Unreal/Plugins/AvatarCore_MetaHuman/Content/Meshes/m_med_nrw_withHead.uasset
+++ b/Unreal/Plugins/AvatarCore_MetaHuman/Content/Meshes/m_med_nrw_withHead.uasset
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.core.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.core.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.audio.sys.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.audio.sys.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.codec.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.codec.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.kws.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.kws.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.kws.ort.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.kws.ort.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.lu.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/AzureWrapper/libs/Runtime/Microsoft.CognitiveServices.Speech.extension.lu.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/SpeexDSP/lib/libspeexdsp-1.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/SpeexDSP/lib/libspeexdsp-1.dll
--- a/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/portaudio/lib/portaudio_x64.dll
+++ b/Unreal/Plugins/AvatarCore_STT/Source/ThirdParty/portaudio/lib/portaudio_x64.dll
--- a/Unreal/Plugins/StructToJSONPlugin/Resources/Icon128.png
+++ b/Unreal/Plugins/StructToJSONPlugin/Resources/Icon128.png