Skip to content

Commit

Permalink
Updated to Blade Engine v3.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bladecoder committed Jul 10, 2019
1 parent 732a474 commit c046298
Show file tree
Hide file tree
Showing 15 changed files with 65 additions and 68 deletions.
4 changes: 2 additions & 2 deletions adventure-test-project/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
bladeEngineVersion=3.1.1
bladeEngineVersion=3.1.2
debug=false
fast_leave=true
gdxVersion=1.9.9
inventory_pos=down
pie_mode.desktop=false
resolutions=1
roboVMVersion=2.3.5
roboVMVersion=2.3.7
title=Blade Engine Adventure
ui_mode=PIE
version=19
77 changes: 42 additions & 35 deletions adventure-test-project/assets/ui/1/ui.atlas
Original file line number Diff line number Diff line change
@@ -1,168 +1,175 @@

ui.png
size: 300,1029
size: 365,1031
format: RGBA8888
filter: Linear,Linear
repeat: none
back
rotate: false
xy: 207, 133
size: 90, 88
xy: 151, 610
size: 120, 120
orig: 120, 120
offset: 15, 16
offset: 0, 0
index: -1
border_rect
rotate: false
xy: 76, 45
xy: 184, 288
size: 29, 29
split: 5, 5, 5, 5
orig: 29, 29
offset: 0, 0
index: -1
bubblepointer
rotate: false
xy: 222, 342
xy: 258, 168
size: 60, 39
orig: 60, 39
offset: 0, 0
index: -1
credits
rotate: false
xy: 1, 880
xy: 1, 882
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
debug
rotate: false
xy: 1, 730
xy: 1, 732
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
delete
rotate: false
xy: 108, 316
xy: 151, 496
size: 112, 112
orig: 112, 112
offset: 0, 0
index: -1
dialog_down
rotate: false
xy: 1, 1
size: 73, 73
xy: 258, 304
size: 93, 93
orig: 93, 93
offset: 10, 9
offset: 0, 0
index: -1
dialog_up
rotate: false
xy: 205, 58
size: 73, 73
xy: 258, 209
size: 93, 93
orig: 93, 93
offset: 10, 11
offset: 0, 0
index: -1
help
rotate: false
xy: 151, 880
xy: 1, 582
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
hotspot
rotate: false
xy: 108, 217
xy: 1, 6
size: 97, 97
orig: 97, 97
offset: 0, 0
index: -1
hotspotpointer
rotate: false
xy: 1, 580
xy: 1, 432
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
index: 1
hotspotpointer
rotate: false
xy: 1, 282
size: 148, 148
orig: 148, 148
offset: 0, 0
index: 2
inv_down
rotate: false
xy: 1, 253
xy: 1, 105
size: 105, 175
orig: 105, 175
offset: 0, 0
index: -1
inv_up
rotate: false
xy: 1, 76
xy: 151, 319
size: 105, 175
orig: 105, 175
offset: 0, 0
index: -1
inventory
rotate: false
xy: 151, 468
size: 128, 110
xy: 108, 1
size: 129, 129
orig: 129, 129
offset: 0, 11
offset: 0, 0
index: -1
leave
rotate: false
xy: 108, 28
xy: 265, 518
size: 94, 90
orig: 94, 90
offset: 0, 0
index: -1
lookat
rotate: false
xy: 151, 730
xy: 108, 132
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
menu
rotate: false
xy: 222, 383
size: 63, 83
xy: 239, 7
size: 123, 123
orig: 123, 123
offset: 30, 19
offset: 0, 0
index: -1
pickup
rotate: false
xy: 1, 430
xy: 151, 882
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
plus
rotate: false
xy: 207, 223
xy: 273, 639
size: 91, 91
orig: 91, 91
offset: 0, 0
index: -1
pointer
rotate: false
xy: 108, 120
xy: 258, 399
size: 95, 95
orig: 95, 95
offset: 0, 0
index: -1
rect
rotate: false
xy: 151, 435
xy: 151, 286
size: 31, 31
split: 5, 5, 5, 4
orig: 31, 31
offset: 0, 0
index: -1
talkto
rotate: false
xy: 151, 580
xy: 151, 732
size: 148, 148
orig: 148, 148
offset: 0, 0
index: -1
white_pixel
rotate: false
xy: 151, 430
xy: 1, 1
size: 3, 3
orig: 3, 3
offset: 0, 0
Expand Down
Binary file modified adventure-test-project/assets/ui/1/ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion adventure-test-project/assets/ui/ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ com.badlogic.gdx.graphics.g2d.BitmapFont: {
credits: {file: fonts/Ubuntu-M.ttf, size: 30}
},


com.badlogic.gdx.graphics.Color: {
white: { a: 1, b: 1, g: 1, r: 1 },
black: { a: 1, b: 0, g: 0, r: 0 },
Expand All @@ -25,6 +24,10 @@ com.badlogic.gdx.graphics.Color: {
yellow: { r: 1, g: 1, b: 0.13, a: 1 }
},

AnimationDrawable: {
hotspotpointer: {name:hotspotpointer, duration: 0.3},
},

com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
black: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 1.0 } },
black08: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.8 } },
Expand Down
6 changes: 3 additions & 3 deletions adventure-test-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
android.injected.testOnly=false
androidGradlePluginVersion=3.2.1
appName=adventure-test-project
bladeEngineVersion=3.1.1
bladeEngineVersion=3.1.2
bladeInkVersion=0.5.1
gdxVersion=1.9.9
org.gradle.configureondemand=false
org.gradle.daemon=true
org.gradle.jvmargs=-Xms128m -Xmx1536m
roboVMGradlePluginVersion=2.3.5
roboVMVersion=2.3.5
roboVMGradlePluginVersion=2.3.7
roboVMVersion=2.3.7
spinePlugin=false
version=19
Binary file added adventure-test-project/raw/ui/dialog_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added adventure-test-project/raw/ui/dialog_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added adventure-test-project/raw/ui/inv_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added adventure-test-project/raw/ui/inv_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions adventure-test-spine/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
bladeEngineVersion=3.1.1
bladeEngineVersion=3.1.2
debug=true
gdxVersion=1.9.9
inventory_pos=down
pie_mode.desktop=false
resolutions=1
roboVMVersion=2.3.5
roboVMVersion=2.3.7
scene_screen=com.bladecoder.engine.ui.retro.RetroSceneScreen
title=Spine Animation Test
version=unspecified
17 changes: 8 additions & 9 deletions adventure-test-spine/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#Mon Aug 22 22:33:28 CEST 2016
roboVMVersion=2.3.5
android.injected.testOnly=false
androidGradlePluginVersion=3.2.1
appName=adventure-test-spine
bladeEngineVersion=3.1.2
bladeInkVersion=0.5.1
gdxVersion=1.9.9
org.gradle.configureondemand=false
org.gradle.daemon=true
bladeEngineVersion=3.1.1
org.gradle.jvmargs=-Xms128m -Xmx1500m
roboVMGradlePluginVersion=2.3.5
appName=adventure-test-spine
org.gradle.configureondemand=false
androidGradlePluginVersion=3.2.1
bladeInkVersion=0.5.1
android.injected.testOnly=false
roboVMGradlePluginVersion=2.3.7
roboVMVersion=2.3.7
spinePlugin=true
12 changes: 0 additions & 12 deletions updateSkin.sh

This file was deleted.

8 changes: 4 additions & 4 deletions venus/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
android.injected.testOnly=false
androidGradlePluginVersion=3.2.1
appName=venus
bladeEngineVersion=3.1.1
bladeEngineVersion=3.1.2
bladeInkVersion=0.5.1
gdxVersion=1.9.9
org.gradle.configureondemand=false
org.gradle.daemon=true
org.gradle.jvmargs=-Xms1024m -Xmx2048m
roboVMGradlePluginVersion=2.3.5
roboVMVersion=2.3.5
roboVMGradlePluginVersion=2.3.7
roboVMVersion=2.3.7
spinePlugin=false
version=1.2.10
android.injected.testOnly=false

0 comments on commit c046298

Please sign in to comment.