Skip to content

Commit 0f6e520

Browse files
committed
- save pending callback queue
- smaller bubble size
1 parent 0958b5c commit 0f6e520

File tree

11 files changed

+22
-9
lines changed

11 files changed

+22
-9
lines changed

CHANGELOG

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
[0.6.4]
2+
- ActionCallbackQueue serialization
3+
- world defaultverbs serialization
4+
- i18n UI support
5+
6+
[0.6.3]
7+
- Updated libgdx to 1.5.2 version
8+
- Menu Screen Refactor
9+
- Transition moved to World
10+
111
[0.6.2]
212
- i18n workflow in composer working
313
- Added event handling in Spine plugin

adventure-composer/assets-raw/engine/ui-atlas/gen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
VERSION=1.3.1
2+
VERSION=1.5.2
33
LIBGDX_BASE_PATH=~/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/
44
GDX_PATH=`find $LIBGDX_BASE_PATH -name gdx-$VERSION.jar`
55
GDX_TOOLS_PATH=`find $LIBGDX_BASE_PATH -name gdx-tools-$VERSION.jar`
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

blade-engine/src/com/bladecoder/engine/actions/ActionCallbackQueue.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.List;
2020

2121
import com.badlogic.gdx.utils.Json;
22-
import com.badlogic.gdx.utils.Json.Serializable;
2322
import com.badlogic.gdx.utils.JsonValue;
2423
import com.bladecoder.engine.util.ActionCallbackSerialization;
2524

@@ -32,7 +31,7 @@
3231
* @author rgarcia
3332
*
3433
*/
35-
public class ActionCallbackQueue implements Serializable{
34+
public class ActionCallbackQueue {
3635
private static final List<ActionCallback> queue = new ArrayList<ActionCallback>();
3736
private static final List<ActionCallback> runQueue = new ArrayList<ActionCallback>();
3837

@@ -62,8 +61,7 @@ public static void clear() {
6261
queue.clear();
6362
}
6463

65-
@Override
66-
public void write(Json json) {
64+
public static void write(Json json) {
6765
ArrayList<String> q = new ArrayList<String>();
6866
for(ActionCallback cb: queue) {
6967
q.add(ActionCallbackSerialization.find(cb));
@@ -73,8 +71,7 @@ public void write(Json json) {
7371
}
7472

7573
@SuppressWarnings("unchecked")
76-
@Override
77-
public void read (Json json, JsonValue jsonData) {
74+
public static void read (Json json, JsonValue jsonData) {
7875
ArrayList<String> q = json.readValue("queue", ArrayList.class, String.class,
7976
jsonData);
8077

blade-engine/src/com/bladecoder/engine/model/World.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ public void write(Json json) {
566566
: transition.getClass());
567567

568568
json.writeValue("chapter", currentChapter);
569+
ActionCallbackQueue.write(json);
569570
}
570571

571572
@SuppressWarnings("unchecked")
@@ -604,6 +605,11 @@ public void read(Json json, JsonValue jsonData) {
604605

605606
instance.currentChapter = json.readValue("chapter", String.class,
606607
jsonData);
608+
609+
ActionCallbackQueue.read(json, jsonData);
610+
611+
607612
I18N.loadChapter(EngineAssetManager.MODEL_DIR + instance.currentChapter);
613+
608614
}
609615
}

blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void draw(Batch batch, float alpha) {
136136

137137
if (subtitle.type == Text.Type.TALK) {
138138
if (style.talkBubble != null) {
139-
float scale = DPIUtils.getTouchMinSize() / 2 / style.talkBubble.getMinHeight();
139+
float scale = DPIUtils.getTouchMinSize() / 4 / style.talkBubble.getMinHeight();
140140
float bubbleX = getX() + (getWidth() - style.talkBubble.getMinWidth() * scale)/ 2;
141141
float bubbleY = getY() - style.talkBubble.getMinHeight() * scale + 2;
142142

0 commit comments

Comments
 (0)