Skip to content
Snippets Groups Projects
Commit eb8f2457 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '8-remove-border-on-same-colored-adjacent-cells' into 'master'

Resolve "Remove border on same colored adjacent cells"

Closes #8

See merge request !8
parents d0d75680 2f684d13
No related branches found
No related tags found
1 merge request!8Resolve "Remove border on same colored adjacent cells"
Pipeline #4306 passed
Showing
with 4 additions and 51 deletions
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.6 app.versionName=0.0.7
app.versionCode=6 app.versionCode=7
assets/icons/skin_default.png

209 B

assets/skins/default_0.png

251 B

assets/skins/default_1.png

251 B

assets/skins/default_2.png

251 B

assets/skins/default_3.png

251 B

assets/skins/default_4.png

251 B

assets/skins/default_5.png

251 B

assets/skins/default_6.png

251 B

assets/skins/default_7.png

251 B

assets/skins/default_8.png

251 B

Fully draw board without asset images, improve cells borders
Dessine le jeu au lieu d'utiliser des images, amélioration des bordures de cellules
...@@ -32,24 +32,6 @@ AVAILABLES_GAME_SETTINGS=" ...@@ -32,24 +32,6 @@ AVAILABLES_GAME_SETTINGS="
colors:5,6,7,8 colors:5,6,7,8
" "
# Skins
AVAILABLE_SKINS="
default
"
# Images per skin
SKIN_IMAGES="
0
1
2
3
4
5
6
7
8
"
####################################################### #######################################################
# optimize svg # optimize svg
...@@ -105,19 +87,6 @@ function build_settings_icons() { ...@@ -105,19 +87,6 @@ function build_settings_icons() {
done done
} }
function build_icon_for_skin() {
SKIN_CODE="$1"
# skin main image
build_icon ${CURRENT_DIR}/skin_${SKIN_CODE}.svg ${ASSETS_DIR}/icons/skin_${SKIN_CODE}.png
# skin images
for SKIN_IMAGE in ${SKIN_IMAGES}
do
build_icon ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_IMAGE}.svg ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_IMAGE}.png
done
}
####################################################### #######################################################
# Create output folders # Create output folders
...@@ -139,9 +108,3 @@ for GAME_SETTING in ${AVAILABLES_GAME_SETTINGS} ...@@ -139,9 +108,3 @@ for GAME_SETTING in ${AVAILABLES_GAME_SETTINGS}
do do
build_settings_icons "${GAME_SETTING}" build_settings_icons "${GAME_SETTING}"
done done
# build skins images
for SKIN in ${AVAILABLE_SKINS}
do
build_icon_for_skin "${SKIN}"
done
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><rect width="100" height="100" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" stroke-width="2.6"/></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><rect width="100" height="100" fill="#E63A3F" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" stroke-width="2.6"/></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><rect width="100" height="100" fill="#708CFD" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" stroke-width="2.6"/></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><rect width="100" height="100" fill="#359C35" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" stroke-width="2.6"/></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><rect width="100" height="100" fill="#FFCE2C" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" stroke-width="2.6"/></svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 100 100" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" ry="2" fill="none"/><rect width="100" height="100" fill="#FF6F43" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".5" stroke-width="2.6"/></svg>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment