Update master

This commit is contained in:
Shadow15510 2021-06-29 16:49:03 +02:00
commit 2a3a1267dd
28 changed files with 22 additions and 22 deletions

View File

@ -21,34 +21,34 @@ set(SOURCES
# Shared assets, fx-9860G-only assets and fx-CG-50-only assets
set(ASSETS
assets/plague.png
assets/planes.png
assets/bground.png
assets/mutations.png
assets/cursor.png
assets/title.png
assets/dna.png
assets/explosion.png
assets/mutations_table/abilities_1.txt
assets/mutations_table/abilities_2.txt
assets/mutations_table/abilities_3.txt
assets/mutations_table/symptoms_1.txt
assets/mutations_table/symptoms_2.txt
assets/mutations_table/symptoms_3.txt
assets/mutations_table/symptoms_4.txt
assets/mutations_table/transmissions_1.txt
assets/mutations_table/transmissions_2.txt
assets/mutations_table/transmissions_3.txt
)
set(ASSETS_fx
assets-fx/plague.png
assets-fx/planes.png
assets-fx/bground.png
assets-fx/mutations.png
assets-fx/cursor.png
assets-fx/title.png
assets-fx/dna.png
assets-fx/explosion.png
assets-fx/mutations_table/abilities_1.txt
assets-fx/mutations_table/abilities_2.txt
assets-fx/mutations_table/abilities_3.txt
assets-fx/mutations_table/symptoms_1.txt
assets-fx/mutations_table/symptoms_2.txt
assets-fx/mutations_table/symptoms_3.txt
assets-fx/mutations_table/symptoms_4.txt
assets-fx/mutations_table/transmissions_1.txt
assets-fx/mutations_table/transmissions_2.txt
assets-fx/mutations_table/transmissions_3.txt
)
set(ASSETS_cg
)
fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA)
fxconv_declare_converters(assets/converters.py)
fxconv_declare_converters(assets-fx/converters.py)
add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}})

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 698 B

View File

Before

Width:  |  Height:  |  Size: 808 B

After

Width:  |  Height:  |  Size: 808 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -1,6 +1,6 @@
/*
Project name ......: Plague
Version ...........: 1.3.8
Version ...........: 1.3.9
Last modification .: 8 June 2021
code and assets provided with licence :
@ -20,7 +20,7 @@
#include "mutation_engine.h"
#include "save.h"
const char *VERSION = "1.3.8";
const char *VERSION = "1.3.9";
// title_screen : display the title screen
static void title_screen(void);