Skip to content

Commit 05aa8fb

Browse files
committed
Change the icons; RegExodus seems to have a...
... Bug with Construo/jdeps going on.
1 parent 10b2248 commit 05aa8fb

File tree

11 files changed

+20
-21
lines changed

11 files changed

+20
-21
lines changed

SquidSquad/DawnSquad/android/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434

3535
-keep public class !com.github.tommyettinger.Data { *; }
36-
-keep public class !com.github.tommyettinger.SunriseSquad { *; }
36+
-keep public class !com.github.tommyettinger.DawnSquad { *; }
3737

3838
-forceprocessing
3939
#-classobfuscationdictionary 'obfuscationClassNames.txt'

SquidSquad/DawnSquad/android/src/main/java/com/github/yellowstonegames/android/AndroidLauncher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import android.os.Bundle;
44
import com.badlogic.gdx.backends.android.AndroidApplication;
55
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
6-
import com.github.tommyettinger.SunriseSquad;
6+
import com.github.tommyettinger.DawnSquad;
77

88
/** Launches the Android application. */
99
public class AndroidLauncher extends AndroidApplication {
1010
@Override
1111
protected void onCreate(Bundle savedInstanceState) {
1212
super.onCreate(savedInstanceState);
1313
AndroidApplicationConfiguration configuration = new AndroidApplicationConfiguration();
14-
initialize(new SunriseSquad(System.currentTimeMillis()), configuration);
14+
initialize(new DawnSquad(System.currentTimeMillis()), configuration);
1515
}
1616
}

SquidSquad/DawnSquad/core/src/main/java/com/github/tommyettinger/SunriseSquad.java renamed to SquidSquad/DawnSquad/core/src/main/java/com/github/tommyettinger/DawnSquad.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import com.github.yellowstonegames.grid.*;
4444
import com.github.yellowstonegames.path.DijkstraMap;
4545
import com.github.yellowstonegames.place.DungeonProcessor;
46-
import com.github.yellowstonegames.place.DungeonTools;
4746
import com.github.yellowstonegames.smooth.AnimatedGlidingSprite;
4847
import com.github.yellowstonegames.smooth.CoordGlider;
4948
import com.github.yellowstonegames.smooth.Director;
@@ -53,7 +52,7 @@
5352
import static com.badlogic.gdx.Gdx.input;
5453
import static com.badlogic.gdx.Input.Keys.*;
5554

56-
public class SunriseSquad extends ApplicationAdapter {
55+
public class DawnSquad extends ApplicationAdapter {
5756
private static final float DURATION = 0.375f;
5857
private long startTime, lastMove;
5958

@@ -157,11 +156,11 @@ private boolean onGrid(int screenX, int screenY) {
157156

158157
private GLProfiler glProfiler;
159158

160-
public SunriseSquad() {
159+
public DawnSquad() {
161160
this(1L);
162161
}
163162

164-
public SunriseSquad(long seed) {
163+
public DawnSquad(long seed) {
165164
this.seed = seed;
166165
}
167166

SquidSquad/DawnSquad/html/src/main/java/com/github/yellowstonegames/GdxDefinition.gwt.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@
2323
<inherits name="com.github.yellowstonegames.squidgrid" />
2424
<!-- SquidSquad place map generation -->
2525
<inherits name="com.github.yellowstonegames.squidplace" />
26-
26+
<!-- SquidSquad pathfinding and basic AI -->
2727
<inherits name="com.github.yellowstonegames.squidpath" />
28+
<!-- SquidSquad procedural text generation -->
2829
<inherits name="com.github.yellowstonegames.squidtext" />
30+
<!-- SquidSquad smooth turn-based interpolation code -->
2931
<inherits name="com.github.yellowstonegames.squidsmooth" />
3032

31-
<inherits name="com.github.tommyettinger.SunriseSquad" />
33+
<inherits name="com.github.tommyettinger.DawnSquad" />
3234
<entry-point class="com.github.yellowstonegames.gwt.GwtLauncher" />
3335
<set-configuration-property name="gdx.assetpath" value="../assets" />
3436
<set-configuration-property name="xsiframe.failIfScriptTag" value="FALSE"/>

SquidSquad/DawnSquad/html/src/main/java/com/github/yellowstonegames/gwt/GwtLauncher.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.badlogic.gdx.ApplicationListener;
44
import com.badlogic.gdx.backends.gwt.GwtApplication;
55
import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration;
6-
import com.github.tommyettinger.SunriseSquad;
6+
import com.github.tommyettinger.DawnSquad;
77

8-
import static com.github.tommyettinger.SunriseSquad.*;
8+
import static com.github.tommyettinger.DawnSquad.*;
99

1010
/** Launches the GWT application. */
1111
public class GwtLauncher extends GwtApplication {
@@ -25,8 +25,8 @@ public GwtApplicationConfiguration getConfig() {
2525

2626
@Override
2727
public ApplicationListener createApplicationListener() {
28-
// return new SunriseSquad(0L);
29-
return new SunriseSquad(System.currentTimeMillis());
28+
// return new DawnSquad(0L);
29+
return new DawnSquad(System.currentTimeMillis());
3030
}
3131
//
3232
// @Override

SquidSquad/DawnSquad/lwjgl3/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
gradlePluginPortal()
44
}
55
dependencies {
6-
classpath "io.github.fourlastor:construo:1.5.1"
6+
classpath "io.github.fourlastor:construo:1.7.1"
77
if(enableGraalNative == 'true') {
88
classpath "org.graalvm.buildtools.native:org.graalvm.buildtools.native.gradle.plugin:0.9.28"
99
}
@@ -42,9 +42,6 @@ dependencies {
4242
implementation project(':core')
4343
if(enableGraalNative == 'true') {
4444
implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"
45-
implementation "io.github.berstanio:gdx-svmhelper-extension-box2d:$graalHelperVersion"
46-
implementation "io.github.berstanio:gdx-svmhelper-extension-bullet:$graalHelperVersion"
47-
implementation "io.github.berstanio:gdx-svmhelper-extension-freetype:$graalHelperVersion"
4845
}
4946

5047
}
@@ -127,10 +124,11 @@ construo {
127124
// macOS needs an identifier
128125
identifier.set("gdx.liftoff." + appName)
129126
// Optional: icon for macOS
130-
macIcon.set(project.file("icons/logo.icns"))
127+
macIcon.set(file("icons/logo.icns"))
131128
}
132129
create("winX64", Target.Windows) {
133130
architecture.set(Target.Architecture.X86_64)
131+
icon.set(file("icons/logo.png"))
134132
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip")
135133
// Uncomment the next line to show a console when the game runs, to print messages.
136134
//useConsole.set(true)
3.21 KB
Binary file not shown.
-86 KB
Binary file not shown.
-1.52 KB
Loading

0 commit comments

Comments
 (0)