Merge remote-tracking branch 'origin/develop' into develop

2020-08-06 23:58:14 +02:00 · 2020-08-06 23:58:14 +02:00 · 6b8c14ffec
commit 6b8c14ffec
parent dd6fffaa79 d87c137660
9 changed files with 8319 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,8 +46,6 @@
 SourceArt/**/*.png
 SourceArt/**/*.tga

-# Binary Files
-Binaries/*


 # Builds
--- a/Binaries/Win64/JamTeacherEditor.target
+++ b/Binaries/Win64/JamTeacherEditor.target
--- a/Binaries/Win64/UE4Editor-JamTeacher.dll
+++ b/Binaries/Win64/UE4Editor-JamTeacher.dll
--- a/Binaries/Win64/UE4Editor-JamTeacher.pdb
+++ b/Binaries/Win64/UE4Editor-JamTeacher.pdb
--- a/Binaries/Win64/UE4Editor.modules
+++ b/Binaries/Win64/UE4Editor.modules
@ -0,0 +1,7 @@
+{
+	"BuildId": "13144385",
+	"Modules": 
+	{
+		"JamTeacher": "UE4Editor-JamTeacher.dll"
+	}
+}
--- a/Content/0_Project/UI/UMG/NewWidgetBlueprint.uasset
+++ b/Content/0_Project/UI/UMG/NewWidgetBlueprint.uasset
--- a/Content/0_Project/UI/UMG/W_MainMenu.uasset
+++ b/Content/0_Project/UI/UMG/W_MainMenu.uasset
--- a/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.dll
+++ b/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.dll
--- a/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.pdb
+++ b/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.pdb