Merge branch 'master' into master

2024-12-28 04:23:42 +01:00 · 2023-07-08 16:58:41 +02:00 · 2023-07-08 16:58:41 +02:00 · a857091f74
commit a857091f74
parent 94b2187ad4 60c26b8c22
7 changed files with 1 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -12,7 +12,7 @@ find_package(Gint 2.9 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)

 #set the color mode either to 1bit or 2bits
-set(COLORMODE 2b)
+set(COLORMODE 1b)


 fxconv_declare_converters(assets/converters.py)
--- a/assets-fx/levels/tileset1b.png
+++ b/assets-fx/levels/tileset1b.png
--- a/assets-fx/levels/tileset1b_bak.png
+++ b/assets-fx/levels/tileset1b_bak.png
--- a/captures/fxlink-image-2023.07.08-13h00-1.png
+++ b/captures/fxlink-image-2023.07.08-13h00-1.png
--- a/captures/fxlink-image-2023.07.08-13h00-2.png
+++ b/captures/fxlink-image-2023.07.08-13h00-2.png
--- a/captures/fxlink-image-2023.07.08-13h01-1.png
+++ b/captures/fxlink-image-2023.07.08-13h01-1.png
--- a/captures/fxlink-image-2023.07.08-13h02-1.png
+++ b/captures/fxlink-image-2023.07.08-13h02-1.png