Skip to content

Commit 8923b30

Browse files
committed
updated to 0.6.3
1 parent 35a9a98 commit 8923b30

35 files changed

+122
-77
lines changed
Binary file not shown.

adventure-test-project/android/assets/ui/ui.json

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
22
com.badlogic.gdx.graphics.g2d.BitmapFont: {
3-
default: {file: Roboto-Regular.ttf, size: 20},
4-
debug: {file: Roboto-Regular.ttf, size: 15},
5-
big-font: {file: Roboto-Black.ttf, size: 35},
6-
title-font: {file: Roboto-Black.ttf, size: 60},
7-
dialog-font: {file: ArchitectsDaughter_fix.ttf, size: 20},
8-
text-manager-font: {file: ArchitectsDaughter_fix.ttf, size: 18},
9-
desc: {file: Ubuntu-M.ttf, size: 16},
10-
credits-title: {file: Ubuntu-M.ttf, size: 20},
11-
credits: {file: Ubuntu-M.ttf, size: 30}
3+
default: {file: fonts/Roboto-Regular.ttf, size: 20},
4+
debug: {file: fonts/Roboto-Regular.ttf, size: 15},
5+
big-font: {file: fonts/PaytoneOne.ttf, size: 35},
6+
dialog-font: {file: fonts/ArchitectsDaughter_fix.ttf, size: 20},
7+
text-manager-font: {file: fonts/ArchitectsDaughter_fix.ttf, size: 18},
8+
desc: {file: fonts/Ubuntu-M.ttf, size: 16},
9+
credits-title: {file: fonts/Ubuntu-M.ttf, size: 20},
10+
credits: {file: fonts/Ubuntu-M.ttf, size: 30}
1211
},
1312
com.badlogic.gdx.graphics.Color: {
1413
green: { a: 1, b: 0, g: 1, r: 0 },
@@ -23,7 +22,9 @@ com.badlogic.gdx.graphics.Color: {
2322
indigo-light: { r: 0.50, g: 0.55, b: 0.82, a: 1 },
2423
red500: { r: 0.90, g: 0.11, b: 0.13, a: 1 },
2524
red-dark: { r: 0.71, g: 0.04, b: 0.06, a: 1 },
26-
red-light: { r: 0.99, g: 0.45, b: 0.47, a: 1 }
25+
red-light: { r: 0.99, g: 0.45, b: 0.47, a: 1 },
26+
black-trans: { r: 0.1, g: 0.1, b: 0.1, a: 0.7 },
27+
yellow: { r: 1, g: 1, b: 0.13, a: 1 }
2728
},
2829
com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
2930
black08: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.8 } },
@@ -33,37 +34,45 @@ com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
3334
red: { name: white_pixel, color: { r: 0.5, g: 0, b: 0, a: 1 }},
3435
circle: { name: circle_button, color: red-dark},
3536
circle-light: { name: circle_button, color: red500},
36-
circle-border: { name: circle_border, color: red-dark},
37-
circle-border-light: { name: circle_border, color: red500},
37+
circle-border: { name: circle_border, color: black-trans},
38+
circle-border-light: { name: circle_border, color: light-grey},
3839
border-rect-grey: { name: border_rect4, color: light-grey},
39-
border-rect-dark-grey: { name: border_rect2, color: grey},
40+
border-rect-dark-grey: { name: border_rect2, color: { a: 1, b: 0.6, g: 0.6, r: 0.6 }},
41+
border-rect-trans: { name: border_rect4, color: { a: 0.2, b: 0.6, g: 0.6, r: 0.6 }},
42+
border-rect-trans-down: { name: border_rect4, color: { a: 0.5, b: 0.6, g: 0.6, r: 0.6 }},
4043
},
4144
com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
4245
pie_lookat: {up:circle-border, down: circle-border-light, imageUp: lookat},
4346
pie_pickup: {up:circle-border, down: circle-border-light, imageUp: pickup},
4447
pie_talkto: {up:circle-border, down: circle-border-light, imageUp: talkto},
4548
inventory: {up:inventory},
46-
menu: {up:circle, down: circle-light, imageUp: menu}
47-
},
48-
com.bladecoder.engine.ui.InventoryUI$InventoryUIStyle: {
49-
default: {background: border-rect-grey, itemBackground: border-rect-dark-grey, menuButtonStyle: menu}
49+
showMenu: {up:circle, down: circle-light, imageUp: menu}
5050
},
51+
5152
com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
5253
default: { font: default, up: grey, fontColor: white , downFontColor: grey, overFontColor: light-grey, disabledFontColor: dark-grey},
53-
menu: { font: big-font, fontColor: white , downFontColor: grey, overFontColor: light-grey, disabledFontColor: dark-grey}
54+
menu: { up: border-rect-trans, down: border-rect-trans-down, font: big-font, fontColor: white , downFontColor: grey, overFontColor: yellow, disabledFontColor: dark-grey}
5455
},
5556
com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
5657
default: { font: default, fontColor: white},
57-
title: { font: title-font, fontColor: white},
58+
title: { font: big-font, fontColor: white},
5859
},
5960

61+
com.bladecoder.engine.ui.MenuScreen$MenuScreenStyle: {
62+
default: {textButtonStyle: menu, showTitle: true, titleStyle: title}
63+
},
64+
com.bladecoder.engine.ui.InventoryUI$InventoryUIStyle: {
65+
default: {background: border-rect-grey, itemBackground: border-rect-dark-grey, menuButtonStyle: showMenu}
66+
},
6067
com.bladecoder.engine.ui.DialogUI$DialogUIStyle: {
6168
default: {background: black08, font: dialog-font, fontColor: white, overFontColor: light-grey}
6269
},
6370

6471
com.bladecoder.engine.ui.TextManagerUI$TextManagerUIStyle: {
6572
default: {rectBackground: border_black_rect4, talkBackground: white, font: text-manager-font, talkBubble: bubblepointer}
6673
},
74+
75+
6776
com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
6877
default: { selection: grey, background: dark-grey, focusedBackground: dark-grey, disabledBackground: grey, font: default, fontColor: white, focusedFontColor: text-dark, disabledFontColor: text-dark, cursor: white, messageFont: default, messageFontColor: text-dark }
6978
},

adventure-test-project/android/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-19
14+
target=android-20
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file is automatically generated by Android Tools.
2+
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3+
#
4+
# This file must be checked in Version Control Systems.
5+
#
6+
# To customize properties used by the Ant build system edit
7+
# "ant.properties", and override values to adapt the script to your
8+
# project structure.
9+
#
10+
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
11+
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12+
13+
# Project target.
14+
target=android-19

adventure-test-project/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
8-
classpath 'com.android.tools.build:gradle:0.13+'
9-
classpath 'org.robovm:robovm-gradle-plugin:1.0.0-alpha-04'
7+
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
8+
classpath 'com.android.tools.build:gradle:1.0.0'
9+
classpath 'org.robovm:robovm-gradle-plugin:1.0.0-beta-01'
1010
}
1111
}
1212

@@ -21,9 +21,9 @@ allprojects {
2121

2222
ext {
2323
appName = 'adventure-test-project'
24-
bladeEngineVersion = '0.6.0'
25-
gdxVersion = '1.4.1'
26-
roboVMVersion = '1.0.0-alpha-04'
24+
bladeEngineVersion = '0.6.3'
25+
gdxVersion = '1.5.2'
26+
roboVMVersion = '1.0.0-beta-01'
2727
}
2828

2929
repositories {

0 commit comments

Comments
 (0)