preparing release

mariofv · Jan 18, 2020 · 55f620b · 55f620b
1 parent bbae087
commit 55f620b
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 46 deletions.
diff --git a/Engine/Importer/MaterialImporter.cpp b/Engine/Importer/MaterialImporter.cpp
@@ -150,7 +150,7 @@ ILubyte * MaterialImporter::LoadImageData(const std::string& file_path, int imag
 	error = ilGetError();
 	if (error == IL_COULD_NOT_OPEN_FILE)
 	{
-		APP_LOG_ERROR("Error loading texture %s. File not found", file_path);
+		APP_LOG_ERROR("Error loading texture %s. File not found", file_path.c_str());
 		return nullptr;
 	}
 

diff --git a/Game/Assets/Textures/lena.png b/Game/Assets/Textures/lena.png
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/lake1_bk.JPG b/Game/Assets/Textures/skyboxes/sor_lake1/lake1_bk.JPG
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/lake1_dn.JPG b/Game/Assets/Textures/skyboxes/sor_lake1/lake1_dn.JPG
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/lake1_ft.JPG b/Game/Assets/Textures/skyboxes/sor_lake1/lake1_ft.JPG
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/lake1_lf.JPG b/Game/Assets/Textures/skyboxes/sor_lake1/lake1_lf.JPG
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/lake1_rt.JPG b/Game/Assets/Textures/skyboxes/sor_lake1/lake1_rt.JPG
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/lake1_up.JPG b/Game/Assets/Textures/skyboxes/sor_lake1/lake1_up.JPG
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/readme.txt b/Game/Assets/Textures/skyboxes/sor_lake1/readme.txt
diff --git a/Game/Assets/Textures/skyboxes/sor_lake1/sor_lake1.shader b/Game/Assets/Textures/skyboxes/sor_lake1/sor_lake1.shader
diff --git a/Game/Assets/Textures/sprites.png b/Game/Assets/Textures/sprites.png
diff --git a/Game/Resources/Textures/grid.png b/Game/Resources/Textures/grid.png