Merge branch 'FIX-InfiniteLoop' into develop

Fix InfiniteLoop
Merge remote-tracking branch 'origin/develop' into develop
2020-08-09 09:56:18 +02:00 · 2020-08-09 09:56:13 +02:00 · 2020-08-09 09:41:50 +02:00 · 2020-08-08 11:51:17 +02:00 · 2020-08-07 16:54:44 +02:00
23 changed files with 0 additions and 0 deletions
--- 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/Content/0_Project/Characters/BaseInteract.uasset
+++ b/Content/0_Project/Characters/BaseInteract.uasset
--- a/Content/0_Project/Core/Engine/SPAIController.uasset
+++ b/Content/0_Project/Core/Engine/SPAIController.uasset
--- a/Content/0_Project/Core/SPFunctionLibrary.uasset
+++ b/Content/0_Project/Core/SPFunctionLibrary.uasset
--- a/Content/0_Project/Core/Tiles/BP_BaseTile.uasset
+++ b/Content/0_Project/Core/Tiles/BP_BaseTile.uasset
--- a/Content/0_Project/Core/Tiles/Corner/Tile_Corner_A.uasset
+++ b/Content/0_Project/Core/Tiles/Corner/Tile_Corner_A.uasset
--- a/Content/0_Project/Core/Tiles/FirstTile.uasset
+++ b/Content/0_Project/Core/Tiles/FirstTile.uasset
--- a/Content/0_Project/Core/Tiles/Straight/Tile_Straight_A.uasset
+++ b/Content/0_Project/Core/Tiles/Straight/Tile_Straight_A.uasset
--- a/Content/0_Project/Core/Tiles/Tile_Coast.uasset
+++ b/Content/0_Project/Core/Tiles/Tile_Coast.uasset
--- a/Content/0_Project/Core/Tiles/Tile_Corner_base.uasset
+++ b/Content/0_Project/Core/Tiles/Tile_Corner_base.uasset
--- a/Content/0_Project/Core/Tiles/Tile_StraightBase.uasset
+++ b/Content/0_Project/Core/Tiles/Tile_StraightBase.uasset
--- a/Content/0_Project/Core/Tiles/Tile_bridge.uasset
+++ b/Content/0_Project/Core/Tiles/Tile_bridge.uasset
--- a/Content/0_Project/Maps/MainMap.umap
+++ b/Content/0_Project/Maps/MainMap.umap
--- a/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset
--- a/Plugins/FMODStudio/Content/AnimNotify_FMODPlayEvent.uasset
+++ b/Plugins/FMODStudio/Content/AnimNotify_FMODPlayEvent.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
Author	SHA1	Message	Date
LUCASTUCIOUS@Playwing	9fd80edade	Merge branch 'FIX-InfiniteLoop' into develop	2020-08-09 09:56:18 +02:00
LUCASTUCIOUS@Playwing	b2de7f6358	Fix InfiniteLoop	2020-08-09 09:56:13 +02:00
LUCASTUCIOUS@Playwing	33002e7624	Merge remote-tracking branch 'origin/develop' into develop	2020-08-09 09:41:50 +02:00
LUCASTUCIOUS@Playwing	408d1d5926	Merge branch 'FIX-InfiniteLoop' into develop	2020-08-08 11:51:17 +02:00
LUCASTUCIOUS@Playwing	6b677d6175	Update tile generatrion	2020-08-07 16:54:44 +02:00