Skip to content

Commit cf45a4a

Browse files
committed
Android SDK doesn't need to be installed to create or edit projects.
1 parent e58b7bd commit cf45a4a

File tree

20 files changed

+55
-363
lines changed

20 files changed

+55
-363
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [2.1.4]
6+
7+
- Now the editor works without having the Android SDK installed.
8+
- FIX: Bug when moving target actor.
9+
- FIX: Bug in 'Transition' action.
10+
- FIX:'actorTextPosition' property in 'SetActorAttr' action wasn't working.
11+
512
## [2.1.3]
613

714
- Support for several walkzones in a scene. Now walkzones are also actors.

adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Message.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,16 @@ public static void hideMsg() {
146146
}
147147

148148
public static void showMsgDialog(final Stage stage, final String title, final String msg) {
149-
new Dialog(title, skin).text(msg).button("Close", true).key(Keys.ENTER, true).key(Keys.ESCAPE, false)
150-
.show(stage);
149+
150+
Timer.post(new Task() {
151+
152+
@Override
153+
public void run() {
154+
Message.hideMsg();
155+
156+
new Dialog(title, skin).text(msg).button("Close", true).key(Keys.ENTER, true).key(Keys.ESCAPE, false)
157+
.show(stage);
158+
}
159+
});
151160
}
152161
}

adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ private String packageAdv() throws IOException {
341341
p.store(new FileOutputStream(
342342
new File(Ctx.project.getProjectDir().getAbsolutePath(), "local.properties")), null);
343343
}
344+
345+
if(!new File(Ctx.project.getProjectDir().getAbsolutePath(), "local.properties").exists() && System.getenv("ANDROID_HOME") == null) {
346+
return "You have to specify the Android SDK path or set the ANDROID_HOME environtment variable.";
347+
}
344348

345349
String task = "android:assembleFullRelease";
346350
String apk = Ctx.project.getProjectDir().getAbsolutePath()

adventure-editor/src/main/resources/projectTmpl/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ allprojects {
1616
apply plugin: 'idea'
1717
}
1818

19-
configure(subprojects - project(':android')) {
20-
apply plugin: 'java'
21-
apply plugin: 'java-library'
22-
23-
sourceCompatibility = 1.7
24-
targetCompatibility=1.7
25-
}
26-
2719
subprojects {
2820
repositories {
2921
mavenCentral()

adventure-editor/src/main/resources/projectTmpl/core/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
apply plugin: 'java'
2+
apply plugin: 'java-library'
3+
4+
sourceCompatibility = 1.7
5+
targetCompatibility=1.7
6+
17
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
28
eclipse.project.name = appName + '-core'
39

adventure-editor/src/main/resources/projectTmpl/desktop/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
apply plugin: 'java'
2+
apply plugin: 'java-library'
13
apply plugin: 'application'
4+
5+
sourceCompatibility = 1.7
6+
targetCompatibility=1.7
7+
28

39
sourceSets.main.resources.srcDirs += [ rootProject.file('assets').absolutePath ]
410
mainClassName = "%PACKAGE%.desktop.DesktopLauncher"
511
eclipse.project.name = appName + '-desktop'
6-
sourceCompatibility = 1.7
7-
targetCompatibility=1.7
812

913
dependencies {
1014
api project(":core")

adventure-editor/src/main/resources/projectTmpl/html/GdxDefinition

Lines changed: 0 additions & 9 deletions
This file was deleted.

adventure-editor/src/main/resources/projectTmpl/html/GdxDefinitionSuperdev

Lines changed: 0 additions & 13 deletions
This file was deleted.

adventure-editor/src/main/resources/projectTmpl/html/build.gradle

Lines changed: 0 additions & 70 deletions
This file was deleted.

adventure-editor/src/main/resources/projectTmpl/html/src/HtmlLauncher

Lines changed: 0 additions & 19 deletions
This file was deleted.

adventure-editor/src/main/resources/projectTmpl/html/war/WEB-INF/web.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

adventure-editor/src/main/resources/projectTmpl/html/war/index

Lines changed: 0 additions & 32 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)