Skip to content

Commit dc91ef4

Browse files
bladecoderbladecoder
committed
Update to Blade Engine v2.1.0
1 parent cb35545 commit dc91ef4

File tree

12 files changed

+69
-65
lines changed

12 files changed

+69
-65
lines changed

‎adventure-test-project/assets/BladeEngine.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
bladeEngineVersion=2.0.6
1+
bladeEngineVersion=2.1.0
22
debug=false
33
fast_leave=true
4-
gdxVersion=1.9.7
4+
gdxVersion=1.9.8
55
inventory_pos=down
66
pie_mode.desktop=false
77
roboVMVersion=2.3.3

‎adventure-test-project/assets/model/test-story.ink.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"inkVersion":17,"root":[{"->":"init"},"done",{"init":[["^> Goto: actor=RED, target=target","\n","^> Animation: animation= GREEN.stand.left, wait=false","\n","^GREEN> Hi! This is a scene written with Ink!","\n","^GREEN> Ink is a narrative language developed by Inkle.","\n","^GREEN> Can you drive your game and story throught the Ink language?","\n",["ev",{"^->":"init.0.10.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^RED> Yes, I can do everything with Ink.",{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.10.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","\n",{"->":"init.0.g-0"},{"#f":7}]}],["ev",{"^->":"init.0.11.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^RED> I don't think so.",{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.11.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","\n",{"->":"init.0.g-0"},{"#f":7}]}],["ev",{"^->":"init.0.12.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^RED> I know nothing about Ink.",{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.12.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","\n",{"->":"init.0.g-0"},{"#f":7}]}],{"g-0":["^GREEN> Well, you did it!","\n","end",{"#f":7}]}],{"#f":3}],"#f":3}],"listDefs":{}}
1+
{"inkVersion":18,"root":[[{"->":"init"},["done",{"#f":7,"#n":"g-0"}],null],"done",{"init":[["^> Goto: actor=RED, target=target","\n","^> Animation: animation= GREEN.stand.left, wait=false","\n","^GREEN> Hi! This is a scene written with Ink!","\n","^GREEN> Ink is a narrative language developed by Inkle.","\n","^GREEN> Can you drive your game and story throught the Ink language?","\n",["ev",{"^->":"init.0.10.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.^.c-0","flg":18},{"s":["^RED> Yes, I can do everything with Ink.",{"->":"$r","var":true},null]}],["ev",{"^->":"init.0.11.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.^.c-1","flg":18},{"s":["^RED> I don't think so.",{"->":"$r","var":true},null]}],["ev",{"^->":"init.0.12.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.^.c-2","flg":18},{"s":["^RED> I know nothing about Ink.",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"init.0.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.10.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":7}],"c-1":["ev",{"^->":"init.0.c-1.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.11.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":7}],"c-2":["ev",{"^->":"init.0.c-2.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.12.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":7}],"g-0":["^GREEN> Well, you did it!","\n","end",{"#f":7}]}],{"#f":3}],"#f":3}],"listDefs":{}}

‎adventure-test-project/assets/model/test2.ink.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"inkVersion":17,"root":["done",{"d1":[["^PLAYER> Hi!","\n","^PLAYER> How are you?","\n","^GREEN> Fine, thanks!","\n","^GREEN> Are you hungry?","\n",["ev",{"^->":"d1.0.8.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","str","^.","/str","/ev",{"*":".^.c","flg":22},{"s":["^PLAYER> No",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.8.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"^, I don't.","\n","\n","^GREEN> Ok, let me know when you want some food.","\n",{"->":"d1.0.g-0"},{"#f":7}]}],["ev",{"^->":"d1.0.9.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^PLAYER> Yes.",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.9.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","\n","^GREEN> Would you like a hamburger?","\n",["ev",{"^->":"d1.0.9.c.10.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^PLAYER> Yes.",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.9.c.10.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","\n","^GREEN> Maybe you are too fat, here you have a banana.","\n",{"->":"d1.0.g-0"},{"#f":7}]}],["ev",{"^->":"d1.0.9.c.11.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^PLAYER> No.",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.9.c.11.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","\n","^GREEN> Well, here you have a banana.","\n",{"->":"d1.0.g-0"},{"#f":7}]}],{"#f":7}]}],{"g-0":["^PLAYER> Bye.","\n","end",{"#f":7}]}],{"#f":3}],"#f":3}],"listDefs":{}}
1+
{"inkVersion":18,"root":[[["done",{"#f":7,"#n":"g-0"}],null],"done",{"d1":[["^PLAYER> Hi!","\n","^PLAYER> How are you?","\n","^GREEN> Fine, thanks!","\n","^GREEN> Are you hungry?","\n",["ev",{"^->":"d1.0.8.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","str","^.","/str","/ev",{"*":"d1.0.c-0","flg":22},{"s":["^PLAYER> No",{"->":"$r","var":true},null]}],["ev",{"^->":"d1.0.9.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":"d1.0.c-1","flg":18},{"s":["^PLAYER> Yes.",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"d1.0.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":"d1.0.8.s"},[{"#n":"$r2"}],"^, I don't.","\n","^GREEN> Ok, let me know when you want some food.","\n",{"->":"d1.0.g-0"},{"#f":7}],"c-1":["ev",{"^->":"d1.0.c-1.$r2"},"/ev",{"temp=":"$r"},{"->":"d1.0.9.s"},[{"#n":"$r2"}],"\n","^GREEN> Would you like a hamburger?","\n",[["ev",{"^->":"d1.0.c-1.9.0.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.^.c-0","flg":18},{"s":["^PLAYER> Yes.",{"->":"$r","var":true},null]}],["ev",{"^->":"d1.0.c-1.9.1.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.^.c-1","flg":18},{"s":["^PLAYER> No.",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"d1.0.c-1.9.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.0.s"},[{"#n":"$r2"}],"\n","^GREEN> Maybe you are too fat, here you have a banana.","\n",{"->":"d1.0.g-0"},{"#f":7}],"c-1":["ev",{"^->":"d1.0.c-1.9.c-1.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.1.s"},[{"#n":"$r2"}],"\n","^GREEN> Well, here you have a banana.","\n",{"->":"d1.0.g-0"},{"#f":7}]}],{"#f":7}],"g-0":["^PLAYER> Bye.","\n","end",{"#f":7}]}],{"#f":3}],"#f":3}],"listDefs":{}}

‎adventure-test-project/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#Sun Oct 29 21:31:16 CET 2017
22
roboVMVersion=2.3.3
33
spinePlugin=false
4-
gdxVersion=1.9.7
4+
gdxVersion=1.9.8
55
org.gradle.daemon=true
6-
bladeEngineVersion=2.0.6
6+
bladeEngineVersion=2.1.0
77
org.gradle.jvmargs=-Xms128m -Xmx1536m
8-
bladeInkVersion=0.4.4
8+
bladeInkVersion=0.5.0
99
roboVMGradlePluginVersion=2.3.3
1010
version=19
1111
appName=adventure-test-project

‎adventure-test-spine/android/assets/BladeEngine.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
#Wed May 16 16:02:53 CEST 2018
1+
#Mon Jul 02 15:41:43 CEST 2018
22
roboVMVersion=2.3.3
33
debug=true
4-
gdxVersion=1.9.7
5-
bladeEngineVersion=2.0.6
4+
gdxVersion=1.9.8
5+
bladeEngineVersion=2.1.0
6+
resolutions=1
67
scene_screen=com.bladecoder.engine.ui.retro.RetroSceneScreen
78
version=unspecified
89
title=Spine Animation Test

‎adventure-test-spine/android/assets/model/00.chapter.json

Lines changed: 50 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
bladeEngineVersion: "0.9.7-SNAPSHOT",
2+
bladeEngineVersion: "2.1.0",
3+
sounds: {},
34
scenes: {
45
morgue: {
56
id: "morgue",
@@ -30,23 +31,23 @@ scenes: {
3031
class: "com.bladecoder.engine.model.ObstacleActor",
3132
id: "obstacle2",
3233
bbox: [ -9.2977295, 37.966125, -6.1984863, 141.11366, 615.3026, 144.21307, 708.2809, 29.4431 ],
33-
visible: true,
3434
pos: {
3535
x: 1376.0775,
3636
y: 92.97821
37-
}
37+
},
38+
visible: true
3839
},
3940
fg1: {
4041
class: "com.bladecoder.engine.model.SpriteActor",
4142
id: "fg1",
42-
bbox: [ -293, 0, -293, 784, 293, 784, 293, 0 ],
43-
visible: true,
43+
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
4444
pos: {
4545
x: 2531.217,
4646
y: 421.93298
4747
},
48+
visible: true,
4849
desc: null,
49-
sounds: null,
50+
refPoint: {},
5051
verbs: {},
5152
interaction: true,
5253
state: null,
@@ -56,6 +57,7 @@ scenes: {
5657
class: "com.bladecoder.engine.model.AtlasRenderer",
5758
fanims: {
5859
"morgue.fg": {
60+
class: "com.bladecoder.engine.anim.AtlasAnimationDesc",
5961
id: "morgue.fg",
6062
source: "morgue",
6163
duration: 1,
@@ -64,38 +66,39 @@ scenes: {
6466
preload: true
6567
}
6668
},
67-
initAnimation: "morgue.fg"
69+
initAnimation: "morgue.fg",
70+
orgAlign: 4
6871
},
6972
scale: 1,
70-
depthType: "NONE",
73+
rot: 0,
74+
tint: null,
75+
fakeDepth: false,
7176
bboxFromRenderer: true
7277
},
7378
obstacle1: {
7479
class: "com.bladecoder.engine.model.ObstacleActor",
7580
id: "obstacle1",
7681
bbox: [ -95.30267, -90.653656, 73.70465, 123.29321, 603.2153, 129.7377, 561.06506, -89.878876 ],
77-
visible: true,
7882
pos: {
7983
x: 743.82574,
8084
y: 139.46733
81-
}
85+
},
86+
visible: true
8287
},
8388
door_right: {
8489
class: "com.bladecoder.engine.model.InteractiveActor",
8590
id: "door_right",
8691
bbox: [ 30.992676, -429.24933, 24.30371, 5.56958, 270.8321, 5.432312, 263.98608, -424.169 ],
87-
visible: true,
8892
pos: {
8993
x: 1840.4836,
9094
y: 723.28284
9195
},
96+
visible: true,
9297
desc: null,
93-
sounds: null,
98+
refPoint: {},
9499
verbs: {
95100
leave: {
96101
id: "leave",
97-
target: null,
98-
state: null,
99102
actions: []
100103
}
101104
},
@@ -107,14 +110,14 @@ scenes: {
107110
litter: {
108111
class: "com.bladecoder.engine.model.SpriteActor",
109112
id: "litter",
110-
bbox: [ -294, 0, -294, 305, 294, 305, 294, 0 ],
111-
visible: true,
113+
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
112114
pos: {
113115
x: 1712.9275,
114116
y: 141.98845
115117
},
118+
visible: true,
116119
desc: "litter",
117-
sounds: null,
120+
refPoint: {},
118121
verbs: {},
119122
interaction: true,
120123
state: null,
@@ -124,6 +127,7 @@ scenes: {
124127
class: "com.bladecoder.engine.model.AtlasRenderer",
125128
fanims: {
126129
litter: {
130+
class: "com.bladecoder.engine.anim.AtlasAnimationDesc",
127131
id: "litter",
128132
source: "morgue",
129133
duration: 1,
@@ -132,23 +136,26 @@ scenes: {
132136
preload: true
133137
}
134138
},
135-
initAnimation: "litter"
139+
initAnimation: "litter",
140+
orgAlign: 4
136141
},
137142
scale: 1,
138-
depthType: "NONE",
143+
rot: 0,
144+
tint: null,
145+
fakeDepth: false,
139146
bboxFromRenderer: true
140147
},
141148
john: {
142149
class: "com.bladecoder.engine.model.CharacterActor",
143150
id: "john",
144-
bbox: [ -190.76294, -7.8964844, -190.76294, 1145.1714, 179.08897, 1145.1714, 179.08897, -7.8964844 ],
145-
visible: true,
151+
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
146152
pos: {
147153
x: 1720.7924,
148154
y: 66.586426
149155
},
156+
visible: true,
150157
desc: null,
151-
sounds: null,
158+
refPoint: {},
152159
verbs: {},
153160
interaction: false,
154161
state: null,
@@ -212,26 +219,31 @@ scenes: {
212219
preload: true
213220
}
214221
},
215-
initAnimation: "stand.front"
222+
initAnimation: "stand.front",
223+
orgAlign: 4,
224+
skin: null
216225
},
217226
scale: 0.5496068,
218-
depthType: "VECTOR",
227+
rot: 0,
228+
tint: null,
229+
fakeDepth: true,
219230
bboxFromRenderer: true,
220231
dialogs: null,
232+
textStyle: null,
221233
walkingSpeed: 1200,
222234
textColor: null
223235
},
224236
table: {
225237
class: "com.bladecoder.engine.model.SpriteActor",
226238
id: "table",
227-
bbox: [ -227.5, 0, -227.5, 410, 227.5, 410, 227.5, 0 ],
228-
visible: true,
239+
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
229240
pos: {
230241
x: 970.46027,
231242
y: 68.57152
232243
},
244+
visible: true,
233245
desc: null,
234-
sounds: null,
246+
refPoint: {},
235247
verbs: {},
236248
interaction: false,
237249
state: null,
@@ -241,6 +253,7 @@ scenes: {
241253
class: "com.bladecoder.engine.model.AtlasRenderer",
242254
fanims: {
243255
table: {
256+
class: "com.bladecoder.engine.anim.AtlasAnimationDesc",
244257
id: "table",
245258
source: "morgue",
246259
duration: 1,
@@ -249,28 +262,29 @@ scenes: {
249262
preload: true
250263
}
251264
},
252-
initAnimation: "table"
265+
initAnimation: "table",
266+
orgAlign: 4
253267
},
254268
scale: 1,
255-
depthType: "NONE",
269+
rot: 0,
270+
tint: null,
271+
fakeDepth: false,
256272
bboxFromRenderer: true
257273
},
258274
door_left: {
259275
class: "com.bladecoder.engine.model.InteractiveActor",
260276
id: "door_left",
261277
bbox: [ 23.244507, -543.9225, 0, 200, 255.78693, 167.4577, 279.0315, -413.7531 ],
262-
visible: true,
263278
pos: {
264-
x: 246.53314,
265-
y: 612.811
279+
x: 240.43439,
280+
y: 609.7616
266281
},
282+
visible: true,
267283
desc: null,
268-
sounds: null,
284+
refPoint: {},
269285
verbs: {
270286
leave: {
271287
id: "leave",
272-
target: null,
273-
state: null,
274288
actions: []
275289
}
276290
},
@@ -282,6 +296,7 @@ scenes: {
282296
},
283297
backgroundAtlas: "morgue",
284298
backgroundRegionId: "morgue",
299+
musicDesc: null,
285300
depthVector: {
286301
x: 705.31244,
287302
y: -456.8384

‎adventure-test-spine/android/assets/model/00.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
#00.chapter
2-
#Tue Jan 05 12:20:52 CET 2016

‎adventure-test-spine/android/assets/model/world.json renamed to ‎adventure-test-spine/android/assets/model/world

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ initChapter: "00",
55
verbs: {
66
dialog: {
77
id: "dialog",
8-
target: null,
9-
state: null,
108
actions: [
119
{
1210
class: "com.bladecoder.engine.actions.SetCutmodeAction",
@@ -24,8 +22,6 @@ verbs: {
2422
},
2523
use: {
2624
id: "use",
27-
target: null,
28-
state: null,
2925
actions: [
3026
{
3127
class: "com.bladecoder.engine.actions.LookAtAction",
@@ -36,8 +32,6 @@ verbs: {
3632
},
3733
lookat: {
3834
id: "lookat",
39-
target: null,
40-
state: null,
4135
actions: [
4236
{
4337
class: "com.bladecoder.engine.actions.LookAtAction",
@@ -48,8 +42,6 @@ verbs: {
4842
},
4943
pickup: {
5044
id: "pickup",
51-
target: null,
52-
state: null,
5345
actions: [
5446
{
5547
class: "com.bladecoder.engine.actions.LookAtAction",

‎adventure-test-spine/android/assets/model/world.properties

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#world.json
2-
#Sat Jan 02 11:31:11 CET 2016
31
default.lookat.0.text=I'm not interested.
42
default.pickup.0.text=For what?
53
default.use.0.text=I don't know what to do with that.
@@ -10,11 +8,11 @@ ui.help=Help
108
ui.load=Load/Save
119
ui.new=New Game
1210
ui.newSlot=Save Game
11+
ui.no=NO
1312
ui.noSavedGames=No saved games found
14-
ui.quit=Exit
15-
ui.save=Save Game
1613
ui.override=The current game progress will be lost. Are you sure you want to start a new game?
1714
ui.override_load=The current game progress will be lost. Are you sure you want to load this game?
15+
ui.quit=Exit
1816
ui.remove=Are you sure you want to remove this saved game?
17+
ui.save=Save Game
1918
ui.yes=YES
20-
ui.no=NO

‎adventure-test-spine/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Mon Aug 22 22:33:28 CEST 2016
22
roboVMVersion=2.3.3
3-
gdxVersion=1.9.7
3+
gdxVersion=1.9.8
44
org.gradle.daemon=true
5-
bladeEngineVersion=2.0.6
5+
bladeEngineVersion=2.1.0
66
org.gradle.jvmargs=-Xms128m -Xmx1500m
77
roboVMGradlePluginVersion=2.3.3
88
appName=adventure-test-spine

‎venus/assets/BladeEngine.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
INIT_SCREEN=org.bladecoder.venus.InitScreen
22
MENU_SCREEN=org.bladecoder.venus.VenusMenuScreen
3-
bladeEngineVersion=2.1.0-SNAPSHOT
3+
bladeEngineVersion=2.1.0
44
bonasera_android_url=amzn\://apps/android?asin\=B01MU6RADE
55
bonasera_desktop_url=http\://store.steampowered.com/app/536430
66
bonasera_ios_url=https\://itunes.apple.com/us/app/revenge-johnny-bonasera/id1151361813

‎venus/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ roboVMVersion=2.3.3
33
spinePlugin=false
44
gdxVersion=1.9.8
55
org.gradle.daemon=true
6-
bladeEngineVersion=2.1.0-SNAPSHOT
7-
bladeInkVersion=0.4.4
6+
bladeEngineVersion=2.1.0
7+
bladeInkVersion=0.5.0
88
org.gradle.jvmargs=-Xms128m -Xmx1536m
99
roboVMGradlePluginVersion=2.3.3
1010
version=1.2.11

0 commit comments

Comments
 (0)