From 6c80045c4da5094014d623e3b855e31bfa8bf301 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 26 Jul 2015 23:54:38 +0300 Subject: Add team icons. Now it simple one color rectangles. --- configure.ac | 1 + data/graphics/CMakeLists.txt | 1 + data/graphics/Makefile.am | 2 +- data/graphics/badges/CMakeLists.txt | 10 ++++++++++ data/graphics/badges/Makefile.am | 13 +++++++++++++ data/graphics/badges/team1.png | Bin 0 -> 122 bytes data/graphics/badges/team1.xml | 15 +++++++++++++++ data/graphics/badges/team2.png | Bin 0 -> 102 bytes data/graphics/badges/team2.xml | 15 +++++++++++++++ data/graphics/badges/team3.png | Bin 0 -> 102 bytes data/graphics/badges/team3.xml | 15 +++++++++++++++ packaging/windows/evol.nsi | 4 ++++ packaging/windows/setup.nsi | 4 ++++ packaging/windows/tmw.nsi | 4 ++++ src/defaults.cpp | 1 + 15 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 data/graphics/badges/CMakeLists.txt create mode 100644 data/graphics/badges/Makefile.am create mode 100644 data/graphics/badges/team1.png create mode 100644 data/graphics/badges/team1.xml create mode 100644 data/graphics/badges/team2.png create mode 100644 data/graphics/badges/team2.xml create mode 100644 data/graphics/badges/team3.png create mode 100644 data/graphics/badges/team3.xml diff --git a/configure.ac b/configure.ac index 7adae2fae..0c0dcf85c 100755 --- a/configure.ac +++ b/configure.ac @@ -399,6 +399,7 @@ data/evol/evol.desktop data/evol/Makefile data/fonts/Makefile data/graphics/Makefile +data/graphics/badges/Makefile data/graphics/flags/Makefile data/graphics/gui/Makefile data/graphics/images/Makefile diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index 1b46f9d66..e3b1697cc 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,3 +1,4 @@ +ADD_SUBDIRECTORY(badges) ADD_SUBDIRECTORY(flags) ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am index a62c42406..201acaaa7 100644 --- a/data/graphics/Makefile.am +++ b/data/graphics/Makefile.am @@ -4,4 +4,4 @@ graphicsdir = $(pkgdatadir)/data/graphics EXTRA_DIST = \ CMakeLists.txt -SUBDIRS = flags gui images shaders sprites +SUBDIRS = badges flags gui images shaders sprites diff --git a/data/graphics/badges/CMakeLists.txt b/data/graphics/badges/CMakeLists.txt new file mode 100644 index 000000000..21100add2 --- /dev/null +++ b/data/graphics/badges/CMakeLists.txt @@ -0,0 +1,10 @@ +SET(FILES + team1.png + team1.xml + team2.png + team2.xml + team3.png + team3.xml + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/badges) diff --git a/data/graphics/badges/Makefile.am b/data/graphics/badges/Makefile.am new file mode 100644 index 000000000..17c0ee997 --- /dev/null +++ b/data/graphics/badges/Makefile.am @@ -0,0 +1,13 @@ +badgesdir = $(pkgdatadir)/data/graphics/badges + +badges_DATA = \ + team1.png \ + team1.xml \ + team2.png \ + team2.xml \ + team3.png \ + team3.xml + +EXTRA_DIST = \ + $(badges_DATA) \ + CMakeLists.txt diff --git a/data/graphics/badges/team1.png b/data/graphics/badges/team1.png new file mode 100644 index 000000000..c485da9d5 Binary files /dev/null and b/data/graphics/badges/team1.png differ diff --git a/data/graphics/badges/team1.xml b/data/graphics/badges/team1.xml new file mode 100644 index 000000000..752ed0541 --- /dev/null +++ b/data/graphics/badges/team1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/data/graphics/badges/team2.png b/data/graphics/badges/team2.png new file mode 100644 index 000000000..e677e69eb Binary files /dev/null and b/data/graphics/badges/team2.png differ diff --git a/data/graphics/badges/team2.xml b/data/graphics/badges/team2.xml new file mode 100644 index 000000000..1e371ed36 --- /dev/null +++ b/data/graphics/badges/team2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/data/graphics/badges/team3.png b/data/graphics/badges/team3.png new file mode 100644 index 000000000..20a08cfcd Binary files /dev/null and b/data/graphics/badges/team3.png differ diff --git a/data/graphics/badges/team3.xml b/data/graphics/badges/team3.xml new file mode 100644 index 000000000..994ff6827 --- /dev/null +++ b/data/graphics/badges/team3.xml @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi index 8782279d1..e35c7f42d 100644 --- a/packaging/windows/evol.nsi +++ b/packaging/windows/evol.nsi @@ -225,6 +225,7 @@ Section "Core files (required)" SecCore CreateDirectory "$INSTDIR\data\icons" CreateDirectory "$INSTDIR\data\perserver" CreateDirectory "$INSTDIR\data\perserver\default" + CreateDirectory "$INSTDIR\data\graphics\badges" CreateDirectory "$INSTDIR\data\graphics\gui" CreateDirectory "$INSTDIR\data\graphics\flags" CreateDirectory "$INSTDIR\data\graphics\images" @@ -277,6 +278,9 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" + SetOutPath "$INSTDIR\data\graphics\badges" + File "${SRCDIR}\data\graphics\badges\*.png" + File "${SRCDIR}\data\graphics\badges\*.xml" SetOutPath "$INSTDIR\data\graphics\flags" File "${SRCDIR}\data\graphics\flags\*.png" SetOutPath "$INSTDIR\data\graphics\gui" diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index a6d231b59..5317fd761 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -222,6 +222,7 @@ Section "Core files (required)" SecCore CreateDirectory "$INSTDIR\data\icons" CreateDirectory "$INSTDIR\data\perserver" CreateDirectory "$INSTDIR\data\perserver\default" + CreateDirectory "$INSTDIR\data\graphics\badges" CreateDirectory "$INSTDIR\data\graphics\gui" CreateDirectory "$INSTDIR\data\graphics\flags" CreateDirectory "$INSTDIR\data\graphics\images" @@ -274,6 +275,9 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" + SetOutPath "$INSTDIR\data\graphics\badges" + File "${SRCDIR}\data\graphics\badges\*.png" + File "${SRCDIR}\data\graphics\badges\*.xml" SetOutPath "$INSTDIR\data\graphics\flags" File "${SRCDIR}\data\graphics\flags\*.png" SetOutPath "$INSTDIR\data\graphics\gui" diff --git a/packaging/windows/tmw.nsi b/packaging/windows/tmw.nsi index 63686249d..5fa039c08 100644 --- a/packaging/windows/tmw.nsi +++ b/packaging/windows/tmw.nsi @@ -225,6 +225,7 @@ Section "Core files (required)" SecCore CreateDirectory "$INSTDIR\data\icons" CreateDirectory "$INSTDIR\data\perserver" CreateDirectory "$INSTDIR\data\perserver\default" + CreateDirectory "$INSTDIR\data\graphics\badges" CreateDirectory "$INSTDIR\data\graphics\gui" CreateDirectory "$INSTDIR\data\graphics\flags" CreateDirectory "$INSTDIR\data\graphics\images" @@ -277,6 +278,9 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" + SetOutPath "$INSTDIR\data\graphics\badges" + File "${SRCDIR}\data\graphics\badges\*.png" + File "${SRCDIR}\data\graphics\badges\*.xml" SetOutPath "$INSTDIR\data\graphics\flags" File "${SRCDIR}\data\graphics\flags\*.png" SetOutPath "$INSTDIR\data\graphics\gui" diff --git a/src/defaults.cpp b/src/defaults.cpp index 6c6bf412a..1c2323956 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -496,6 +496,7 @@ DefaultsData* getPathsDefaults() AddDEF("guiIcons", "graphics/guiicons/"); AddDEF("shaders", "graphics/shaders/"); AddDEF("help", "help/"); + AddDEF("badges", "graphics/badges/"); AddDEF("simpleVertexShader", "simple_vertex.glsl"); AddDEF("simpleFragmentShader", "simple_frag.glsl"); -- cgit v1.2.3-60-g2f50