Merge branch 'master' into master

2019-06-13 03:47:13 +03:00
parent 35ea1765e2 e9e62660fb
commit 9689def6a5
38 changed files with 534 additions and 55 deletions
--- a/src/Camera.h
+++ b/src/Camera.h
@@ -220,7 +220,7 @@ enum
 	FADE_1,	// mid fade
 	FADE_2,

-	FADE_OUT,
+	FADE_OUT = 0,
 	FADE_IN,
 };