Merge remote-tracking branch 'origin/master' into max/game2

4 files changed, 4 insertions, 1 deletions

diff --git a/src/crepe/api/Color.cpp b/src/crepe/api/Color.cpp
index 6858aa8..1374198 100644
--- a/src/crepe/api/Color.cpp
+++ b/src/crepe/api/Color.cpp
@@ -10,3 +10,4 @@ const Color Color::BLACK {0x00, 0x00, 0x00};
 const Color Color::CYAN {0x00, 0xff, 0xff};
 const Color Color::YELLOW {0xff, 0xff, 0x00};
 const Color Color::MAGENTA {0xff, 0x00, 0xff};
+const Color Color::GREY {0x80, 0x80, 0x80};
diff --git a/src/crepe/api/Color.h b/src/crepe/api/Color.h
index 84edb5c..22c0c43 100644
--- a/src/crepe/api/Color.h
+++ b/src/crepe/api/Color.h
@@ -18,6 +18,7 @@ struct Color {
 	static const Color MAGENTA;
 	static const Color YELLOW;
 	static const Color BLACK;
+	static const Color GREY;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 6b9e3ca..9c226a3 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -85,7 +85,7 @@ struct Config final {
 		 * This config option is the font size at which all fonts will be loaded initially.
 		 * 
 		 */
-		unsigned int size = 16;
+		unsigned int size = 500;
 	} font;
 	//! Configuration for click tolerance.
 	struct {
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index cd9786b..0bbe51f 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -56,6 +56,7 @@ void Engine::loop() {
 
 		try {
 			systems.frame_update();
+			this->scene_manager.load_next_scene();
 		} catch (const exception & e) {
 			Log::logf(
 				Log::Level::WARNING, "Uncaught exception in frame update function: {}\n",