Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6b8c14ffec
9 changed files with 8319 additions and 2 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -46,8 +46,6 @@
|
||||||
SourceArt/**/*.png
|
SourceArt/**/*.png
|
||||||
SourceArt/**/*.tga
|
SourceArt/**/*.tga
|
||||||
|
|
||||||
# Binary Files
|
|
||||||
Binaries/*
|
|
||||||
|
|
||||||
|
|
||||||
# Builds
|
# Builds
|
||||||
|
|
8312
Binaries/Win64/JamTeacherEditor.target
Normal file
8312
Binaries/Win64/JamTeacherEditor.target
Normal file
File diff suppressed because it is too large
Load diff
BIN
Binaries/Win64/UE4Editor-JamTeacher.dll
Normal file
BIN
Binaries/Win64/UE4Editor-JamTeacher.dll
Normal file
Binary file not shown.
BIN
Binaries/Win64/UE4Editor-JamTeacher.pdb
Normal file
BIN
Binaries/Win64/UE4Editor-JamTeacher.pdb
Normal file
Binary file not shown.
7
Binaries/Win64/UE4Editor.modules
Normal file
7
Binaries/Win64/UE4Editor.modules
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"BuildId": "13144385",
|
||||||
|
"Modules":
|
||||||
|
{
|
||||||
|
"JamTeacher": "UE4Editor-JamTeacher.dll"
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
BIN
Content/0_Project/UI/UMG/W_MainMenu.uasset
Normal file
BIN
Content/0_Project/UI/UMG/W_MainMenu.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue