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

This commit is contained in:
Hugo 2020-08-06 23:58:14 +02:00
commit 6b8c14ffec
9 changed files with 8319 additions and 2 deletions

2
.gitignore vendored
View file

@ -46,8 +46,6 @@
SourceArt/**/*.png SourceArt/**/*.png
SourceArt/**/*.tga SourceArt/**/*.tga
# Binary Files
Binaries/*
# Builds # Builds

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

View file

@ -0,0 +1,7 @@
{
"BuildId": "13144385",
"Modules":
{
"JamTeacher": "UE4Editor-JamTeacher.dll"
}
}

Binary file not shown.