summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-11-09 11:35:28 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-11-09 11:35:28 +0100
commitc7e871e749e6531deb3b49311e0c5b71523aeff8 (patch)
treeb9dcd9ba57c2804347293cb445a0a3413ff83dbd
parent1ecc5abda207f70b0054415fa9abe9c5423c2206 (diff)
downloadRustAndDust-c7e871e749e6531deb3b49311e0c5b71523aeff8.zip
RustAndDust-c7e871e749e6531deb3b49311e0c5b71523aeff8.tar.gz
use freetype font
-rw-r--r--android/assets/skin/default.fnt101
-rw-r--r--android/assets/skin/uiskin.atlas198
-rw-r--r--android/assets/skin/uiskin.json64
-rw-r--r--android/assets/skin/uiskin.pngbin22779 -> 0 bytes
-rw-r--r--android/assets/skin/veteran-black.pngbin8980 -> 0 bytes
-rw-r--r--android/assets/skin/veteran-typewriter.ttfbin0 -> 52548 bytes
-rw-r--r--android/assets/skin/veteran-white.pngbin9306 -> 0 bytes
-rw-r--r--android/assets/skin/veteran.fnt100
-rw-r--r--assets/skin/default.fnt101
-rw-r--r--assets/skin/uiskin.atlas198
-rw-r--r--assets/skin/uiskin.json64
-rw-r--r--assets/skin/uiskin.pngbin22779 -> 0 bytes
-rw-r--r--assets/skin/veteran-black.pngbin8980 -> 0 bytes
-rw-r--r--assets/skin/veteran-typewriter.ttfbin0 -> 52548 bytes
-rw-r--r--assets/skin/veteran-white.pngbin9306 -> 0 bytes
-rw-r--r--assets/skin/veteran.fnt100
-rw-r--r--build.gradle7
-rw-r--r--core/src/ch/asynk/rustanddust/RustAndDust.java12
18 files changed, 16 insertions, 929 deletions
diff --git a/android/assets/skin/default.fnt b/android/assets/skin/default.fnt
deleted file mode 100644
index e0588b7..0000000
--- a/android/assets/skin/default.fnt
+++ /dev/null
@@ -1,101 +0,0 @@
-info face="Droid Sans" size=17 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1
-common lineHeight=20 base=18 scaleW=256 scaleH=128 pages=1 packed=0
-page id=0 file="uiskin.png"
-chars count=96
-char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=16 xadvance=4 page=0 chnl=0
-char id=124 x=0 y=0 width=6 height=20 xoffset=1 yoffset=3 xadvance=9 page=0 chnl=0
-char id=106 x=6 y=0 width=9 height=20 xoffset=-4 yoffset=3 xadvance=4 page=0 chnl=0
-char id=81 x=15 y=0 width=15 height=19 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=0
-char id=74 x=30 y=0 width=11 height=19 xoffset=-5 yoffset=3 xadvance=4 page=0 chnl=0
-char id=125 x=41 y=0 width=10 height=18 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=123 x=51 y=0 width=10 height=18 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=93 x=61 y=0 width=8 height=18 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=91 x=69 y=0 width=8 height=18 xoffset=-2 yoffset=3 xadvance=5 page=0 chnl=0
-char id=41 x=77 y=0 width=9 height=18 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=40 x=86 y=0 width=9 height=18 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=64 x=95 y=0 width=18 height=17 xoffset=-3 yoffset=3 xadvance=14 page=0 chnl=0
-char id=121 x=113 y=0 width=13 height=17 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=113 x=126 y=0 width=13 height=17 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=112 x=139 y=0 width=13 height=17 xoffset=-2 yoffset=6 xadvance=9 page=0 chnl=0
-char id=103 x=152 y=0 width=13 height=17 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=38 x=165 y=0 width=16 height=16 xoffset=-3 yoffset=3 xadvance=11 page=0 chnl=0
-char id=37 x=181 y=0 width=18 height=16 xoffset=-3 yoffset=3 xadvance=14 page=0 chnl=0
-char id=36 x=199 y=0 width=12 height=16 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=63 x=211 y=0 width=11 height=16 xoffset=-3 yoffset=3 xadvance=7 page=0 chnl=0
-char id=33 x=222 y=0 width=7 height=16 xoffset=-2 yoffset=3 xadvance=4 page=0 chnl=0
-char id=48 x=229 y=0 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=57 x=242 y=0 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=56 x=0 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=54 x=13 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=53 x=26 y=20 width=12 height=16 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=51 x=38 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=100 x=51 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=98 x=64 y=20 width=13 height=16 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=85 x=77 y=20 width=14 height=16 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=83 x=91 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=8 page=0 chnl=0
-char id=79 x=104 y=20 width=15 height=16 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=0
-char id=71 x=119 y=20 width=14 height=16 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=67 x=133 y=20 width=13 height=16 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=127 x=146 y=20 width=12 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=35 x=158 y=20 width=15 height=15 xoffset=-3 yoffset=3 xadvance=10 page=0 chnl=0
-char id=92 x=173 y=20 width=11 height=15 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=47 x=184 y=20 width=11 height=15 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=59 x=195 y=20 width=8 height=15 xoffset=-3 yoffset=6 xadvance=4 page=0 chnl=0
-char id=55 x=203 y=20 width=13 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=52 x=216 y=20 width=14 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=50 x=230 y=20 width=13 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=49 x=243 y=20 width=9 height=15 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=116 x=0 y=36 width=10 height=15 xoffset=-3 yoffset=4 xadvance=5 page=0 chnl=0
-char id=108 x=10 y=36 width=6 height=15 xoffset=-2 yoffset=3 xadvance=4 page=0 chnl=0
-char id=107 x=16 y=36 width=12 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=105 x=28 y=36 width=7 height=15 xoffset=-2 yoffset=3 xadvance=4 page=0 chnl=0
-char id=104 x=35 y=36 width=12 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=102 x=47 y=36 width=11 height=15 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=90 x=58 y=36 width=13 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=89 x=71 y=36 width=13 height=15 xoffset=-3 yoffset=3 xadvance=8 page=0 chnl=0
-char id=88 x=84 y=36 width=14 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=87 x=98 y=36 width=19 height=15 xoffset=-3 yoffset=3 xadvance=15 page=0 chnl=0
-char id=86 x=117 y=36 width=14 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=84 x=131 y=36 width=13 height=15 xoffset=-3 yoffset=3 xadvance=8 page=0 chnl=0
-char id=82 x=144 y=36 width=13 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=80 x=157 y=36 width=12 height=15 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=78 x=169 y=36 width=14 height=15 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=0
-char id=77 x=183 y=36 width=17 height=15 xoffset=-2 yoffset=3 xadvance=14 page=0 chnl=0
-char id=76 x=200 y=36 width=11 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=75 x=211 y=36 width=13 height=15 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=73 x=224 y=36 width=10 height=15 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=72 x=234 y=36 width=14 height=15 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=70 x=0 y=51 width=11 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=69 x=11 y=51 width=11 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=68 x=22 y=51 width=14 height=15 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=66 x=36 y=51 width=13 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=65 x=49 y=51 width=15 height=15 xoffset=-3 yoffset=3 xadvance=10 page=0 chnl=0
-char id=58 x=64 y=51 width=7 height=13 xoffset=-2 yoffset=6 xadvance=4 page=0 chnl=0
-char id=117 x=71 y=51 width=12 height=13 xoffset=-2 yoffset=6 xadvance=10 page=0 chnl=0
-char id=115 x=83 y=51 width=11 height=13 xoffset=-3 yoffset=6 xadvance=7 page=0 chnl=0
-char id=111 x=94 y=51 width=13 height=13 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=101 x=107 y=51 width=13 height=13 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=99 x=120 y=51 width=12 height=13 xoffset=-3 yoffset=6 xadvance=7 page=0 chnl=0
-char id=97 x=132 y=51 width=12 height=13 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=60 x=144 y=51 width=13 height=12 xoffset=-3 yoffset=5 xadvance=9 page=0 chnl=0
-char id=122 x=157 y=51 width=11 height=12 xoffset=-3 yoffset=6 xadvance=7 page=0 chnl=0
-char id=120 x=168 y=51 width=13 height=12 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=119 x=181 y=51 width=17 height=12 xoffset=-3 yoffset=6 xadvance=12 page=0 chnl=0
-char id=118 x=198 y=51 width=13 height=12 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=114 x=211 y=51 width=10 height=12 xoffset=-2 yoffset=6 xadvance=6 page=0 chnl=0
-char id=110 x=221 y=51 width=12 height=12 xoffset=-2 yoffset=6 xadvance=10 page=0 chnl=0
-char id=109 x=233 y=51 width=17 height=12 xoffset=-2 yoffset=6 xadvance=15 page=0 chnl=0
-char id=94 x=0 y=66 width=13 height=11 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=62 x=13 y=66 width=13 height=11 xoffset=-3 yoffset=5 xadvance=9 page=0 chnl=0
-char id=42 x=26 y=66 width=13 height=10 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=43 x=39 y=66 width=13 height=10 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=61 x=52 y=66 width=13 height=8 xoffset=-3 yoffset=7 xadvance=9 page=0 chnl=0
-char id=39 x=65 y=66 width=6 height=8 xoffset=-2 yoffset=3 xadvance=3 page=0 chnl=0
-char id=34 x=71 y=66 width=9 height=8 xoffset=-2 yoffset=3 xadvance=6 page=0 chnl=0
-char id=44 x=80 y=66 width=8 height=7 xoffset=-3 yoffset=14 xadvance=4 page=0 chnl=0
-char id=126 x=88 y=66 width=13 height=6 xoffset=-3 yoffset=8 xadvance=9 page=0 chnl=0
-char id=46 x=101 y=66 width=7 height=6 xoffset=-2 yoffset=13 xadvance=4 page=0 chnl=0
-char id=96 x=108 y=66 width=8 height=6 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=45 x=116 y=66 width=9 height=5 xoffset=-3 yoffset=10 xadvance=5 page=0 chnl=0
-char id=95 x=125 y=66 width=13 height=4 xoffset=-4 yoffset=17 xadvance=6 page=0 chnl=0
-kernings count=-1
diff --git a/android/assets/skin/uiskin.atlas b/android/assets/skin/uiskin.atlas
deleted file mode 100644
index c193581..0000000
--- a/android/assets/skin/uiskin.atlas
+++ /dev/null
@@ -1,198 +0,0 @@
-
-uiskin.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-default
- rotate: false
- xy: 1, 50
- size: 254, 77
- orig: 254, 77
- offset: 0, 0
- index: -1
-default-window
- rotate: false
- xy: 1, 20
- size: 27, 29
- split: 4, 3, 20, 3
- orig: 27, 29
- offset: 0, 0
- index: -1
-default-select
- rotate: false
- xy: 29, 29
- size: 27, 20
- split: 4, 14, 4, 4
- orig: 27, 20
- offset: 0, 0
- index: -1
-default-round-large
- rotate: false
- xy: 57, 29
- size: 20, 20
- split: 5, 5, 5, 4
- orig: 20, 20
- offset: 0, 0
- index: -1
-default-scroll
- rotate: false
- xy: 78, 29
- size: 20, 20
- split: 2, 2, 2, 2
- orig: 20, 20
- offset: 0, 0
- index: -1
-default-slider-knob
- rotate: false
- xy: 1, 1
- size: 9, 18
- orig: 9, 18
- offset: 0, 0
- index: -1
-default-round-down
- rotate: false
- xy: 99, 29
- size: 12, 20
- split: 5, 5, 5, 4
- orig: 12, 20
- offset: 0, 0
- index: -1
-default-round
- rotate: false
- xy: 112, 29
- size: 12, 20
- split: 5, 5, 5, 4
- pad: 4, 4, 1, 1
- orig: 12, 20
- offset: 0, 0
- index: -1
-check-off
- rotate: false
- xy: 11, 5
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-textfield
- rotate: false
- xy: 11, 5
- size: 14, 14
- split: 3, 3, 3, 3
- orig: 14, 14
- offset: 0, 0
- index: -1
-check-on
- rotate: false
- xy: 125, 35
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-tree-minus
- rotate: false
- xy: 140, 35
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-tree-plus
- rotate: false
- xy: 155, 35
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-default-slider
- rotate: false
- xy: 29, 20
- size: 8, 8
- split: 2, 2, 2, 2
- orig: 8, 8
- offset: 0, 0
- index: -1
-default-pane
- rotate: false
- xy: 11, 1
- size: 5, 3
- split: 1, 1, 1, 1
- orig: 5, 3
- offset: 0, 0
- index: -1
-default-rect-pad
- rotate: false
- xy: 11, 1
- size: 5, 3
- split: 1, 1, 1, 1
- orig: 5, 3
- offset: 0, 0
- index: -1
-default-splitpane
- rotate: false
- xy: 17, 1
- size: 5, 3
- split: 0, 5, 0, 0
- orig: 5, 3
- offset: 0, 0
- index: -1
-cursor
- rotate: false
- xy: 23, 1
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-splitpane-vertical
- rotate: false
- xy: 125, 29
- size: 3, 5
- split: 0, 0, 0, 5
- orig: 3, 5
- offset: 0, 0
- index: -1
-default-rect-down
- rotate: false
- xy: 170, 46
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-rect
- rotate: false
- xy: 38, 25
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-select-selection
- rotate: false
- xy: 26, 16
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-pane-noborder
- rotate: false
- xy: 129, 33
- size: 1, 1
- split: 0, 0, 0, 0
- orig: 1, 1
- offset: 0, 0
- index: -1
-selection
- rotate: false
- xy: 170, 44
- size: 1, 1
- orig: 1, 1
- offset: 0, 0
- index: -1
-white
- rotate: false
- xy: 174, 48
- size: 1, 1
- orig: 1, 1
- offset: 0, 0
- index: -1
diff --git a/android/assets/skin/uiskin.json b/android/assets/skin/uiskin.json
deleted file mode 100644
index f14c6af..0000000
--- a/android/assets/skin/uiskin.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: veteran.fnt } },
-com.badlogic.gdx.graphics.Color: {
- green: { a: 1, b: 0, g: 1, r: 0 },
- white: { a: 1, b: 1, g: 1, r: 1 },
- red: { a: 1, b: 0, g: 0, r: 1 },
- black: { a: 1, b: 0, g: 0, r: 0 }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
- dialogDim: { name: white, color: { r: 0, g: 0, b: 0, a: 0.45 } }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
- default: { down: default-round-down, up: default-round },
- toggle: { down: default-round-down, checked: default-round-down, up: default-round }
-},
-com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
- default: { down: default-round-down, up: default-round, font: default-font, fontColor: white },
- toggle: { down: default-round-down, up: default-round, checked: default-round-down, font: default-font, fontColor: white, downFontColor: red }
-},
-com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
- default: { vScroll: default-scroll, hScrollKnob: default-round-large, background: default-rect, hScroll: default-scroll, vScrollKnob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
- default: {
- font: default-font, fontColor: white, background: default-select,
- scrollStyle: default,
- listStyle: { font: default-font, selection: default-select-selection }
- }
-},
-com.badlogic.gdx.scenes.scene2d.ui.SplitPane$SplitPaneStyle: {
- default-vertical: { handle: default-splitpane-vertical },
- default-horizontal: { handle: default-splitpane }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle: {
- default: { titleFont: default-font, background: default-window, titleFontColor: white },
- dialog: { titleFont: default-font, background: default-window, titleFontColor: white, stageBackground: dialogDim }
-},
-com.badlogic.gdx.scenes.scene2d.ui.ProgressBar$ProgressBarStyle: {
- default-horizontal: { background: default-slider, knob: default-slider-knob },
- default-vertical: { background: default-slider, knob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
- default-horizontal: { background: default-slider, knob: default-slider-knob },
- default-vertical: { background: default-slider, knob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
- default: { font: default-font, fontColor: white }
-},
-com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
- default: { selection: selection, background: textfield, font: default-font, fontColor: white, cursor: cursor }
-},
-com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: {
- default: { checkboxOn: check-on, checkboxOff: check-off, font: default-font, fontColor: white }
-},
-com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
- default: { fontColorUnselected: white, selection: selection, fontColorSelected: white, font: default-font }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Touchpad$TouchpadStyle: {
- default: { background: default-pane, knob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Tree$TreeStyle: {
- default: { minus: tree-minus, plus: tree-plus, selection: default-select-selection }
-}
-}
diff --git a/android/assets/skin/uiskin.png b/android/assets/skin/uiskin.png
deleted file mode 100644
index f51c5bd..0000000
--- a/android/assets/skin/uiskin.png
+++ /dev/null
Binary files differ
diff --git a/android/assets/skin/veteran-black.png b/android/assets/skin/veteran-black.png
deleted file mode 100644
index ea5fcbe..0000000
--- a/android/assets/skin/veteran-black.png
+++ /dev/null
Binary files differ
diff --git a/android/assets/skin/veteran-typewriter.ttf b/android/assets/skin/veteran-typewriter.ttf
new file mode 100644
index 0000000..202e264
--- /dev/null
+++ b/android/assets/skin/veteran-typewriter.ttf
Binary files differ
diff --git a/android/assets/skin/veteran-white.png b/android/assets/skin/veteran-white.png
deleted file mode 100644
index daa70d9..0000000
--- a/android/assets/skin/veteran-white.png
+++ /dev/null
Binary files differ
diff --git a/android/assets/skin/veteran.fnt b/android/assets/skin/veteran.fnt
deleted file mode 100644
index b5e400f..0000000
--- a/android/assets/skin/veteran.fnt
+++ /dev/null
@@ -1,100 +0,0 @@
-info face=font size=22 bold=0 italic=0 charset= unicode= stretchH=100 smooth=1 aa=1 padding=2,2,2,2 spacing=0,0 outline=0
-common lineHeight=24 base=18 scaleW=118 scaleH=391 pages=1 packed=0
-page id=0 file="veteran-white.png"
-chars count=95
-char id=32 x=2 y=2 width=0 height=0 xoffset=0 yoffset=18 xadvance=8 page=0 chnl=15
-char id=33 x=2 y=4 width=4 height=16 xoffset=0 yoffset=2 xadvance=5 page=0 chnl=15
-char id=34 x=2 y=22 width=9 height=8 xoffset=0 yoffset=1 xadvance=10 page=0 chnl=15
-char id=35 x=8 y=2 width=15 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
-char id=36 x=2 y=32 width=10 height=18 xoffset=0 yoffset=2 xadvance=11 page=0 chnl=15
-char id=37 x=2 y=52 width=12 height=17 xoffset=0 yoffset=1 xadvance=13 page=0 chnl=15
-char id=38 x=14 y=20 width=13 height=16 xoffset=0 yoffset=2 xadvance=14 page=0 chnl=15
-char id=39 x=14 y=38 width=4 height=7 xoffset=0 yoffset=0 xadvance=5 page=0 chnl=15
-char id=40 x=2 y=71 width=5 height=18 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=15
-char id=41 x=2 y=91 width=5 height=19 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=15
-char id=42 x=25 y=2 width=7 height=7 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=15
-char id=43 x=2 y=112 width=8 height=8 xoffset=0 yoffset=6 xadvance=8 page=0 chnl=15
-char id=44 x=25 y=11 width=4 height=7 xoffset=0 yoffset=15 xadvance=5 page=0 chnl=15
-char id=45 x=14 y=47 width=8 height=2 xoffset=0 yoffset=9 xadvance=7 page=0 chnl=15
-char id=46 x=20 y=38 width=3 height=3 xoffset=0 yoffset=15 xadvance=4 page=0 chnl=15
-char id=47 x=9 y=71 width=10 height=17 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=15
-char id=48 x=16 y=51 width=11 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=49 x=9 y=90 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=50 x=2 y=122 width=11 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=51 x=2 y=140 width=10 height=15 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=52 x=2 y=157 width=11 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=53 x=2 y=174 width=10 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=54 x=14 y=140 width=10 height=15 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=55 x=15 y=108 width=9 height=16 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=15
-char id=56 x=21 y=68 width=11 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=57 x=21 y=86 width=10 height=15 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=58 x=15 y=126 width=3 height=12 xoffset=0 yoffset=7 xadvance=4 page=0 chnl=15
-char id=59 x=29 y=20 width=4 height=15 xoffset=0 yoffset=8 xadvance=6 page=0 chnl=15
-char id=60 x=24 y=43 width=8 height=5 xoffset=0 yoffset=9 xadvance=8 page=0 chnl=15
-char id=61 x=31 y=11 width=8 height=5 xoffset=0 yoffset=8 xadvance=8 page=0 chnl=15
-char id=62 x=34 y=2 width=8 height=5 xoffset=0 yoffset=9 xadvance=8 page=0 chnl=15
-char id=63 x=29 y=50 width=9 height=16 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=15
-char id=64 x=35 y=18 width=17 height=19 xoffset=0 yoffset=2 xadvance=18 page=0 chnl=15
-char id=65 x=2 y=192 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=66 x=14 y=174 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=67 x=26 y=103 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=68 x=34 y=68 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=69 x=40 y=39 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=70 x=54 y=2 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=71 x=54 y=20 width=12 height=16 xoffset=0 yoffset=2 xadvance=12 page=0 chnl=15
-char id=72 x=26 y=121 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=73 x=38 y=86 width=10 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=74 x=49 y=57 width=12 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=75 x=55 y=38 width=13 height=16 xoffset=0 yoffset=2 xadvance=13 page=0 chnl=15
-char id=76 x=26 y=139 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=77 x=68 y=2 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=78 x=68 y=20 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=79 x=2 y=210 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=80 x=2 y=228 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=81 x=2 y=246 width=11 height=20 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=82 x=15 y=210 width=13 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
-char id=83 x=17 y=192 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=84 x=29 y=157 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=85 x=40 y=139 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=86 x=41 y=104 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=87 x=50 y=75 width=13 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
-char id=88 x=63 y=56 width=13 height=16 xoffset=0 yoffset=2 xadvance=13 page=0 chnl=15
-char id=89 x=70 y=38 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=90 x=29 y=175 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=91 x=83 y=2 width=4 height=17 xoffset=0 yoffset=3 xadvance=4 page=0 chnl=15
-char id=92 x=2 y=268 width=9 height=16 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=15
-char id=93 x=2 y=286 width=4 height=19 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=15
-char id=94 x=41 y=9 width=5 height=6 xoffset=0 yoffset=3 xadvance=6 page=0 chnl=15
-char id=95 x=25 y=38 width=8 height=2 xoffset=0 yoffset=19 xadvance=8 page=0 chnl=15
-char id=96 x=35 y=39 width=3 height=4 xoffset=1 yoffset=3 xadvance=4 page=0 chnl=15
-char id=97 x=15 y=157 width=11 height=11 xoffset=0 yoffset=7 xadvance=12 page=0 chnl=15
-char id=98 x=83 y=21 width=12 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=99 x=41 y=122 width=9 height=12 xoffset=0 yoffset=6 xadvance=10 page=0 chnl=15
-char id=100 x=89 y=2 width=12 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=101 x=52 y=122 width=10 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=102 x=56 y=93 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=103 x=65 y=74 width=11 height=16 xoffset=0 yoffset=7 xadvance=12 page=0 chnl=15
-char id=104 x=29 y=193 width=13 height=15 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=105 x=42 y=157 width=9 height=16 xoffset=0 yoffset=3 xadvance=9 page=0 chnl=15
-char id=106 x=2 y=307 width=8 height=19 xoffset=0 yoffset=3 xadvance=8 page=0 chnl=15
-char id=107 x=42 y=175 width=13 height=15 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=108 x=53 y=157 width=11 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=109 x=55 y=136 width=13 height=12 xoffset=0 yoffset=6 xadvance=14 page=0 chnl=15
-char id=110 x=8 y=286 width=12 height=12 xoffset=0 yoffset=6 xadvance=12 page=0 chnl=15
-char id=111 x=13 y=268 width=10 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=112 x=15 y=246 width=12 height=16 xoffset=-1 yoffset=6 xadvance=12 page=0 chnl=15
-char id=113 x=16 y=228 width=12 height=16 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=114 x=64 y=111 width=11 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=115 x=69 y=92 width=9 height=12 xoffset=0 yoffset=7 xadvance=9 page=0 chnl=15
-char id=116 x=78 y=56 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=117 x=85 y=38 width=13 height=12 xoffset=0 yoffset=6 xadvance=13 page=0 chnl=15
-char id=118 x=97 y=20 width=12 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=119 x=103 y=2 width=13 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=120 x=78 y=74 width=13 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=121 x=90 y=52 width=12 height=15 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=122 x=100 y=34 width=10 height=12 xoffset=0 yoffset=7 xadvance=11 page=0 chnl=15
-char id=123 x=2 y=328 width=6 height=19 xoffset=0 yoffset=1 xadvance=6 page=0 chnl=15
-char id=124 x=2 y=349 width=2 height=19 xoffset=0 yoffset=1 xadvance=3 page=0 chnl=15
-char id=125 x=2 y=370 width=6 height=19 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=15
-char id=126 x=44 y=2 width=8 height=3 xoffset=1 yoffset=10 xadvance=9 page=0 chnl=15
-char id=32 x=0 y=0 width=0 height=0 xoffset=1 yoffset=10 xadvance=8 page=0 chnl=15
diff --git a/assets/skin/default.fnt b/assets/skin/default.fnt
deleted file mode 100644
index e0588b7..0000000
--- a/assets/skin/default.fnt
+++ /dev/null
@@ -1,101 +0,0 @@
-info face="Droid Sans" size=17 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1
-common lineHeight=20 base=18 scaleW=256 scaleH=128 pages=1 packed=0
-page id=0 file="uiskin.png"
-chars count=96
-char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=16 xadvance=4 page=0 chnl=0
-char id=124 x=0 y=0 width=6 height=20 xoffset=1 yoffset=3 xadvance=9 page=0 chnl=0
-char id=106 x=6 y=0 width=9 height=20 xoffset=-4 yoffset=3 xadvance=4 page=0 chnl=0
-char id=81 x=15 y=0 width=15 height=19 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=0
-char id=74 x=30 y=0 width=11 height=19 xoffset=-5 yoffset=3 xadvance=4 page=0 chnl=0
-char id=125 x=41 y=0 width=10 height=18 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=123 x=51 y=0 width=10 height=18 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=93 x=61 y=0 width=8 height=18 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=91 x=69 y=0 width=8 height=18 xoffset=-2 yoffset=3 xadvance=5 page=0 chnl=0
-char id=41 x=77 y=0 width=9 height=18 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=40 x=86 y=0 width=9 height=18 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=64 x=95 y=0 width=18 height=17 xoffset=-3 yoffset=3 xadvance=14 page=0 chnl=0
-char id=121 x=113 y=0 width=13 height=17 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=113 x=126 y=0 width=13 height=17 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=112 x=139 y=0 width=13 height=17 xoffset=-2 yoffset=6 xadvance=9 page=0 chnl=0
-char id=103 x=152 y=0 width=13 height=17 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=38 x=165 y=0 width=16 height=16 xoffset=-3 yoffset=3 xadvance=11 page=0 chnl=0
-char id=37 x=181 y=0 width=18 height=16 xoffset=-3 yoffset=3 xadvance=14 page=0 chnl=0
-char id=36 x=199 y=0 width=12 height=16 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=63 x=211 y=0 width=11 height=16 xoffset=-3 yoffset=3 xadvance=7 page=0 chnl=0
-char id=33 x=222 y=0 width=7 height=16 xoffset=-2 yoffset=3 xadvance=4 page=0 chnl=0
-char id=48 x=229 y=0 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=57 x=242 y=0 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=56 x=0 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=54 x=13 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=53 x=26 y=20 width=12 height=16 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=51 x=38 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=100 x=51 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=98 x=64 y=20 width=13 height=16 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=85 x=77 y=20 width=14 height=16 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=83 x=91 y=20 width=13 height=16 xoffset=-3 yoffset=3 xadvance=8 page=0 chnl=0
-char id=79 x=104 y=20 width=15 height=16 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=0
-char id=71 x=119 y=20 width=14 height=16 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=67 x=133 y=20 width=13 height=16 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=127 x=146 y=20 width=12 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=35 x=158 y=20 width=15 height=15 xoffset=-3 yoffset=3 xadvance=10 page=0 chnl=0
-char id=92 x=173 y=20 width=11 height=15 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=47 x=184 y=20 width=11 height=15 xoffset=-3 yoffset=3 xadvance=6 page=0 chnl=0
-char id=59 x=195 y=20 width=8 height=15 xoffset=-3 yoffset=6 xadvance=4 page=0 chnl=0
-char id=55 x=203 y=20 width=13 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=52 x=216 y=20 width=14 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=50 x=230 y=20 width=13 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=49 x=243 y=20 width=9 height=15 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=116 x=0 y=36 width=10 height=15 xoffset=-3 yoffset=4 xadvance=5 page=0 chnl=0
-char id=108 x=10 y=36 width=6 height=15 xoffset=-2 yoffset=3 xadvance=4 page=0 chnl=0
-char id=107 x=16 y=36 width=12 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=105 x=28 y=36 width=7 height=15 xoffset=-2 yoffset=3 xadvance=4 page=0 chnl=0
-char id=104 x=35 y=36 width=12 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=102 x=47 y=36 width=11 height=15 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=90 x=58 y=36 width=13 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=89 x=71 y=36 width=13 height=15 xoffset=-3 yoffset=3 xadvance=8 page=0 chnl=0
-char id=88 x=84 y=36 width=14 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=87 x=98 y=36 width=19 height=15 xoffset=-3 yoffset=3 xadvance=15 page=0 chnl=0
-char id=86 x=117 y=36 width=14 height=15 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=84 x=131 y=36 width=13 height=15 xoffset=-3 yoffset=3 xadvance=8 page=0 chnl=0
-char id=82 x=144 y=36 width=13 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=80 x=157 y=36 width=12 height=15 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=78 x=169 y=36 width=14 height=15 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=0
-char id=77 x=183 y=36 width=17 height=15 xoffset=-2 yoffset=3 xadvance=14 page=0 chnl=0
-char id=76 x=200 y=36 width=11 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=75 x=211 y=36 width=13 height=15 xoffset=-2 yoffset=3 xadvance=9 page=0 chnl=0
-char id=73 x=224 y=36 width=10 height=15 xoffset=-3 yoffset=3 xadvance=5 page=0 chnl=0
-char id=72 x=234 y=36 width=14 height=15 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=70 x=0 y=51 width=11 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=69 x=11 y=51 width=11 height=15 xoffset=-2 yoffset=3 xadvance=8 page=0 chnl=0
-char id=68 x=22 y=51 width=14 height=15 xoffset=-2 yoffset=3 xadvance=11 page=0 chnl=0
-char id=66 x=36 y=51 width=13 height=15 xoffset=-2 yoffset=3 xadvance=10 page=0 chnl=0
-char id=65 x=49 y=51 width=15 height=15 xoffset=-3 yoffset=3 xadvance=10 page=0 chnl=0
-char id=58 x=64 y=51 width=7 height=13 xoffset=-2 yoffset=6 xadvance=4 page=0 chnl=0
-char id=117 x=71 y=51 width=12 height=13 xoffset=-2 yoffset=6 xadvance=10 page=0 chnl=0
-char id=115 x=83 y=51 width=11 height=13 xoffset=-3 yoffset=6 xadvance=7 page=0 chnl=0
-char id=111 x=94 y=51 width=13 height=13 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=101 x=107 y=51 width=13 height=13 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=99 x=120 y=51 width=12 height=13 xoffset=-3 yoffset=6 xadvance=7 page=0 chnl=0
-char id=97 x=132 y=51 width=12 height=13 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=60 x=144 y=51 width=13 height=12 xoffset=-3 yoffset=5 xadvance=9 page=0 chnl=0
-char id=122 x=157 y=51 width=11 height=12 xoffset=-3 yoffset=6 xadvance=7 page=0 chnl=0
-char id=120 x=168 y=51 width=13 height=12 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=119 x=181 y=51 width=17 height=12 xoffset=-3 yoffset=6 xadvance=12 page=0 chnl=0
-char id=118 x=198 y=51 width=13 height=12 xoffset=-3 yoffset=6 xadvance=8 page=0 chnl=0
-char id=114 x=211 y=51 width=10 height=12 xoffset=-2 yoffset=6 xadvance=6 page=0 chnl=0
-char id=110 x=221 y=51 width=12 height=12 xoffset=-2 yoffset=6 xadvance=10 page=0 chnl=0
-char id=109 x=233 y=51 width=17 height=12 xoffset=-2 yoffset=6 xadvance=15 page=0 chnl=0
-char id=94 x=0 y=66 width=13 height=11 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=62 x=13 y=66 width=13 height=11 xoffset=-3 yoffset=5 xadvance=9 page=0 chnl=0
-char id=42 x=26 y=66 width=13 height=10 xoffset=-3 yoffset=3 xadvance=9 page=0 chnl=0
-char id=43 x=39 y=66 width=13 height=10 xoffset=-3 yoffset=6 xadvance=9 page=0 chnl=0
-char id=61 x=52 y=66 width=13 height=8 xoffset=-3 yoffset=7 xadvance=9 page=0 chnl=0
-char id=39 x=65 y=66 width=6 height=8 xoffset=-2 yoffset=3 xadvance=3 page=0 chnl=0
-char id=34 x=71 y=66 width=9 height=8 xoffset=-2 yoffset=3 xadvance=6 page=0 chnl=0
-char id=44 x=80 y=66 width=8 height=7 xoffset=-3 yoffset=14 xadvance=4 page=0 chnl=0
-char id=126 x=88 y=66 width=13 height=6 xoffset=-3 yoffset=8 xadvance=9 page=0 chnl=0
-char id=46 x=101 y=66 width=7 height=6 xoffset=-2 yoffset=13 xadvance=4 page=0 chnl=0
-char id=96 x=108 y=66 width=8 height=6 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=45 x=116 y=66 width=9 height=5 xoffset=-3 yoffset=10 xadvance=5 page=0 chnl=0
-char id=95 x=125 y=66 width=13 height=4 xoffset=-4 yoffset=17 xadvance=6 page=0 chnl=0
-kernings count=-1
diff --git a/assets/skin/uiskin.atlas b/assets/skin/uiskin.atlas
deleted file mode 100644
index c193581..0000000
--- a/assets/skin/uiskin.atlas
+++ /dev/null
@@ -1,198 +0,0 @@
-
-uiskin.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-default
- rotate: false
- xy: 1, 50
- size: 254, 77
- orig: 254, 77
- offset: 0, 0
- index: -1
-default-window
- rotate: false
- xy: 1, 20
- size: 27, 29
- split: 4, 3, 20, 3
- orig: 27, 29
- offset: 0, 0
- index: -1
-default-select
- rotate: false
- xy: 29, 29
- size: 27, 20
- split: 4, 14, 4, 4
- orig: 27, 20
- offset: 0, 0
- index: -1
-default-round-large
- rotate: false
- xy: 57, 29
- size: 20, 20
- split: 5, 5, 5, 4
- orig: 20, 20
- offset: 0, 0
- index: -1
-default-scroll
- rotate: false
- xy: 78, 29
- size: 20, 20
- split: 2, 2, 2, 2
- orig: 20, 20
- offset: 0, 0
- index: -1
-default-slider-knob
- rotate: false
- xy: 1, 1
- size: 9, 18
- orig: 9, 18
- offset: 0, 0
- index: -1
-default-round-down
- rotate: false
- xy: 99, 29
- size: 12, 20
- split: 5, 5, 5, 4
- orig: 12, 20
- offset: 0, 0
- index: -1
-default-round
- rotate: false
- xy: 112, 29
- size: 12, 20
- split: 5, 5, 5, 4
- pad: 4, 4, 1, 1
- orig: 12, 20
- offset: 0, 0
- index: -1
-check-off
- rotate: false
- xy: 11, 5
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-textfield
- rotate: false
- xy: 11, 5
- size: 14, 14
- split: 3, 3, 3, 3
- orig: 14, 14
- offset: 0, 0
- index: -1
-check-on
- rotate: false
- xy: 125, 35
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-tree-minus
- rotate: false
- xy: 140, 35
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-tree-plus
- rotate: false
- xy: 155, 35
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-default-slider
- rotate: false
- xy: 29, 20
- size: 8, 8
- split: 2, 2, 2, 2
- orig: 8, 8
- offset: 0, 0
- index: -1
-default-pane
- rotate: false
- xy: 11, 1
- size: 5, 3
- split: 1, 1, 1, 1
- orig: 5, 3
- offset: 0, 0
- index: -1
-default-rect-pad
- rotate: false
- xy: 11, 1
- size: 5, 3
- split: 1, 1, 1, 1
- orig: 5, 3
- offset: 0, 0
- index: -1
-default-splitpane
- rotate: false
- xy: 17, 1
- size: 5, 3
- split: 0, 5, 0, 0
- orig: 5, 3
- offset: 0, 0
- index: -1
-cursor
- rotate: false
- xy: 23, 1
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-splitpane-vertical
- rotate: false
- xy: 125, 29
- size: 3, 5
- split: 0, 0, 0, 5
- orig: 3, 5
- offset: 0, 0
- index: -1
-default-rect-down
- rotate: false
- xy: 170, 46
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-rect
- rotate: false
- xy: 38, 25
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-select-selection
- rotate: false
- xy: 26, 16
- size: 3, 3
- split: 1, 1, 1, 1
- orig: 3, 3
- offset: 0, 0
- index: -1
-default-pane-noborder
- rotate: false
- xy: 129, 33
- size: 1, 1
- split: 0, 0, 0, 0
- orig: 1, 1
- offset: 0, 0
- index: -1
-selection
- rotate: false
- xy: 170, 44
- size: 1, 1
- orig: 1, 1
- offset: 0, 0
- index: -1
-white
- rotate: false
- xy: 174, 48
- size: 1, 1
- orig: 1, 1
- offset: 0, 0
- index: -1
diff --git a/assets/skin/uiskin.json b/assets/skin/uiskin.json
deleted file mode 100644
index f14c6af..0000000
--- a/assets/skin/uiskin.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: veteran.fnt } },
-com.badlogic.gdx.graphics.Color: {
- green: { a: 1, b: 0, g: 1, r: 0 },
- white: { a: 1, b: 1, g: 1, r: 1 },
- red: { a: 1, b: 0, g: 0, r: 1 },
- black: { a: 1, b: 0, g: 0, r: 0 }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
- dialogDim: { name: white, color: { r: 0, g: 0, b: 0, a: 0.45 } }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
- default: { down: default-round-down, up: default-round },
- toggle: { down: default-round-down, checked: default-round-down, up: default-round }
-},
-com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
- default: { down: default-round-down, up: default-round, font: default-font, fontColor: white },
- toggle: { down: default-round-down, up: default-round, checked: default-round-down, font: default-font, fontColor: white, downFontColor: red }
-},
-com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
- default: { vScroll: default-scroll, hScrollKnob: default-round-large, background: default-rect, hScroll: default-scroll, vScrollKnob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
- default: {
- font: default-font, fontColor: white, background: default-select,
- scrollStyle: default,
- listStyle: { font: default-font, selection: default-select-selection }
- }
-},
-com.badlogic.gdx.scenes.scene2d.ui.SplitPane$SplitPaneStyle: {
- default-vertical: { handle: default-splitpane-vertical },
- default-horizontal: { handle: default-splitpane }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle: {
- default: { titleFont: default-font, background: default-window, titleFontColor: white },
- dialog: { titleFont: default-font, background: default-window, titleFontColor: white, stageBackground: dialogDim }
-},
-com.badlogic.gdx.scenes.scene2d.ui.ProgressBar$ProgressBarStyle: {
- default-horizontal: { background: default-slider, knob: default-slider-knob },
- default-vertical: { background: default-slider, knob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
- default-horizontal: { background: default-slider, knob: default-slider-knob },
- default-vertical: { background: default-slider, knob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
- default: { font: default-font, fontColor: white }
-},
-com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
- default: { selection: selection, background: textfield, font: default-font, fontColor: white, cursor: cursor }
-},
-com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: {
- default: { checkboxOn: check-on, checkboxOff: check-off, font: default-font, fontColor: white }
-},
-com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
- default: { fontColorUnselected: white, selection: selection, fontColorSelected: white, font: default-font }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Touchpad$TouchpadStyle: {
- default: { background: default-pane, knob: default-round-large }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Tree$TreeStyle: {
- default: { minus: tree-minus, plus: tree-plus, selection: default-select-selection }
-}
-}
diff --git a/assets/skin/uiskin.png b/assets/skin/uiskin.png
deleted file mode 100644
index f51c5bd..0000000
--- a/assets/skin/uiskin.png
+++ /dev/null
Binary files differ
diff --git a/assets/skin/veteran-black.png b/assets/skin/veteran-black.png
deleted file mode 100644
index ea5fcbe..0000000
--- a/assets/skin/veteran-black.png
+++ /dev/null
Binary files differ
diff --git a/assets/skin/veteran-typewriter.ttf b/assets/skin/veteran-typewriter.ttf
new file mode 100644
index 0000000..202e264
--- /dev/null
+++ b/assets/skin/veteran-typewriter.ttf
Binary files differ
diff --git a/assets/skin/veteran-white.png b/assets/skin/veteran-white.png
deleted file mode 100644
index daa70d9..0000000
--- a/assets/skin/veteran-white.png
+++ /dev/null
Binary files differ
diff --git a/assets/skin/veteran.fnt b/assets/skin/veteran.fnt
deleted file mode 100644
index b5e400f..0000000
--- a/assets/skin/veteran.fnt
+++ /dev/null
@@ -1,100 +0,0 @@
-info face=font size=22 bold=0 italic=0 charset= unicode= stretchH=100 smooth=1 aa=1 padding=2,2,2,2 spacing=0,0 outline=0
-common lineHeight=24 base=18 scaleW=118 scaleH=391 pages=1 packed=0
-page id=0 file="veteran-white.png"
-chars count=95
-char id=32 x=2 y=2 width=0 height=0 xoffset=0 yoffset=18 xadvance=8 page=0 chnl=15
-char id=33 x=2 y=4 width=4 height=16 xoffset=0 yoffset=2 xadvance=5 page=0 chnl=15
-char id=34 x=2 y=22 width=9 height=8 xoffset=0 yoffset=1 xadvance=10 page=0 chnl=15
-char id=35 x=8 y=2 width=15 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
-char id=36 x=2 y=32 width=10 height=18 xoffset=0 yoffset=2 xadvance=11 page=0 chnl=15
-char id=37 x=2 y=52 width=12 height=17 xoffset=0 yoffset=1 xadvance=13 page=0 chnl=15
-char id=38 x=14 y=20 width=13 height=16 xoffset=0 yoffset=2 xadvance=14 page=0 chnl=15
-char id=39 x=14 y=38 width=4 height=7 xoffset=0 yoffset=0 xadvance=5 page=0 chnl=15
-char id=40 x=2 y=71 width=5 height=18 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=15
-char id=41 x=2 y=91 width=5 height=19 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=15
-char id=42 x=25 y=2 width=7 height=7 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=15
-char id=43 x=2 y=112 width=8 height=8 xoffset=0 yoffset=6 xadvance=8 page=0 chnl=15
-char id=44 x=25 y=11 width=4 height=7 xoffset=0 yoffset=15 xadvance=5 page=0 chnl=15
-char id=45 x=14 y=47 width=8 height=2 xoffset=0 yoffset=9 xadvance=7 page=0 chnl=15
-char id=46 x=20 y=38 width=3 height=3 xoffset=0 yoffset=15 xadvance=4 page=0 chnl=15
-char id=47 x=9 y=71 width=10 height=17 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=15
-char id=48 x=16 y=51 width=11 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=49 x=9 y=90 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=50 x=2 y=122 width=11 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=51 x=2 y=140 width=10 height=15 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=52 x=2 y=157 width=11 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=53 x=2 y=174 width=10 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=54 x=14 y=140 width=10 height=15 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=55 x=15 y=108 width=9 height=16 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=15
-char id=56 x=21 y=68 width=11 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=57 x=21 y=86 width=10 height=15 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=58 x=15 y=126 width=3 height=12 xoffset=0 yoffset=7 xadvance=4 page=0 chnl=15
-char id=59 x=29 y=20 width=4 height=15 xoffset=0 yoffset=8 xadvance=6 page=0 chnl=15
-char id=60 x=24 y=43 width=8 height=5 xoffset=0 yoffset=9 xadvance=8 page=0 chnl=15
-char id=61 x=31 y=11 width=8 height=5 xoffset=0 yoffset=8 xadvance=8 page=0 chnl=15
-char id=62 x=34 y=2 width=8 height=5 xoffset=0 yoffset=9 xadvance=8 page=0 chnl=15
-char id=63 x=29 y=50 width=9 height=16 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=15
-char id=64 x=35 y=18 width=17 height=19 xoffset=0 yoffset=2 xadvance=18 page=0 chnl=15
-char id=65 x=2 y=192 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=66 x=14 y=174 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=67 x=26 y=103 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=68 x=34 y=68 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=69 x=40 y=39 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=70 x=54 y=2 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=71 x=54 y=20 width=12 height=16 xoffset=0 yoffset=2 xadvance=12 page=0 chnl=15
-char id=72 x=26 y=121 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=73 x=38 y=86 width=10 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=74 x=49 y=57 width=12 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=75 x=55 y=38 width=13 height=16 xoffset=0 yoffset=2 xadvance=13 page=0 chnl=15
-char id=76 x=26 y=139 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=77 x=68 y=2 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=78 x=68 y=20 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=79 x=2 y=210 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=80 x=2 y=228 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=81 x=2 y=246 width=11 height=20 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=82 x=15 y=210 width=13 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
-char id=83 x=17 y=192 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=84 x=29 y=157 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=85 x=40 y=139 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=86 x=41 y=104 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=87 x=50 y=75 width=13 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
-char id=88 x=63 y=56 width=13 height=16 xoffset=0 yoffset=2 xadvance=13 page=0 chnl=15
-char id=89 x=70 y=38 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=90 x=29 y=175 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=91 x=83 y=2 width=4 height=17 xoffset=0 yoffset=3 xadvance=4 page=0 chnl=15
-char id=92 x=2 y=268 width=9 height=16 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=15
-char id=93 x=2 y=286 width=4 height=19 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=15
-char id=94 x=41 y=9 width=5 height=6 xoffset=0 yoffset=3 xadvance=6 page=0 chnl=15
-char id=95 x=25 y=38 width=8 height=2 xoffset=0 yoffset=19 xadvance=8 page=0 chnl=15
-char id=96 x=35 y=39 width=3 height=4 xoffset=1 yoffset=3 xadvance=4 page=0 chnl=15
-char id=97 x=15 y=157 width=11 height=11 xoffset=0 yoffset=7 xadvance=12 page=0 chnl=15
-char id=98 x=83 y=21 width=12 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=99 x=41 y=122 width=9 height=12 xoffset=0 yoffset=6 xadvance=10 page=0 chnl=15
-char id=100 x=89 y=2 width=12 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=101 x=52 y=122 width=10 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=102 x=56 y=93 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
-char id=103 x=65 y=74 width=11 height=16 xoffset=0 yoffset=7 xadvance=12 page=0 chnl=15
-char id=104 x=29 y=193 width=13 height=15 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=105 x=42 y=157 width=9 height=16 xoffset=0 yoffset=3 xadvance=9 page=0 chnl=15
-char id=106 x=2 y=307 width=8 height=19 xoffset=0 yoffset=3 xadvance=8 page=0 chnl=15
-char id=107 x=42 y=175 width=13 height=15 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
-char id=108 x=53 y=157 width=11 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
-char id=109 x=55 y=136 width=13 height=12 xoffset=0 yoffset=6 xadvance=14 page=0 chnl=15
-char id=110 x=8 y=286 width=12 height=12 xoffset=0 yoffset=6 xadvance=12 page=0 chnl=15
-char id=111 x=13 y=268 width=10 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=112 x=15 y=246 width=12 height=16 xoffset=-1 yoffset=6 xadvance=12 page=0 chnl=15
-char id=113 x=16 y=228 width=12 height=16 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=114 x=64 y=111 width=11 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
-char id=115 x=69 y=92 width=9 height=12 xoffset=0 yoffset=7 xadvance=9 page=0 chnl=15
-char id=116 x=78 y=56 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
-char id=117 x=85 y=38 width=13 height=12 xoffset=0 yoffset=6 xadvance=13 page=0 chnl=15
-char id=118 x=97 y=20 width=12 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=119 x=103 y=2 width=13 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=120 x=78 y=74 width=13 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=121 x=90 y=52 width=12 height=15 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
-char id=122 x=100 y=34 width=10 height=12 xoffset=0 yoffset=7 xadvance=11 page=0 chnl=15
-char id=123 x=2 y=328 width=6 height=19 xoffset=0 yoffset=1 xadvance=6 page=0 chnl=15
-char id=124 x=2 y=349 width=2 height=19 xoffset=0 yoffset=1 xadvance=3 page=0 chnl=15
-char id=125 x=2 y=370 width=6 height=19 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=15
-char id=126 x=44 y=2 width=8 height=3 xoffset=1 yoffset=10 xadvance=9 page=0 chnl=15
-char id=32 x=0 y=0 width=0 height=0 xoffset=1 yoffset=10 xadvance=8 page=0 chnl=15
diff --git a/build.gradle b/build.gradle
index 150da2f..f5688a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,12 +36,12 @@ allprojects {
project(":desktop") {
apply plugin: "java"
-
dependencies {
compile project(":core")
compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
+ compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
}
}
@@ -60,6 +60,10 @@ project(":android") {
natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi"
natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86"
+ compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
}
}
@@ -105,6 +109,7 @@ project(":core") {
dependencies {
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+ compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
testCompile "junit:junit:+"
}
}
diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index 52732a3..9c91efe 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -4,9 +4,12 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
import ch.asynk.rustanddust.screens.MenuScreen;
import ch.asynk.rustanddust.screens.GameScreen;
@@ -146,8 +149,13 @@ public class RustAndDust extends Game
manager.load("data/ui.atlas", TextureAtlas.class);
manager.finishLoading();
uiAtlas = manager.get("data/ui.atlas", TextureAtlas.class);
- fontB = new BitmapFont(Gdx.files.internal("skin/veteran.fnt"), uiAtlas.findRegion("veteran-black"));
- fontW = new BitmapFont(Gdx.files.internal("skin/veteran.fnt"), uiAtlas.findRegion("veteran-white"));
+ FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("skin/veteran-typewriter.ttf"));
+ FreeTypeFontParameter parameter = new FreeTypeFontParameter();
+ parameter.size = 20;
+ parameter.color = Color.BLACK;
+ fontB = generator.generateFont(parameter);
+ parameter.color = Color.WHITE;
+ fontW = generator.generateFont(parameter);
}
private void unloadUiAssets()