Skip to content

Commit

Permalink
Added game name at logger's tag for logcat filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
@Matsukari
Matsukari committed Jan 22, 2024
1 parent 92fa1d6 commit 0c8ec82
Show file tree
Hide file tree
Showing 18 changed files with 114 additions and 23 deletions.
88 changes: 87 additions & 1 deletion app/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,84 @@ android {

}
packagingOptions {
exclude 'META-INF/robovm/ios/robovm.xml'
// exclude 'META-INF/robovm/ios/robovm.xml'
// exclude 'META-INF/macos/x64/org/lwjgl/glfw/libglfw.dylib.sha1'
// exclude 'META-INF/macos/x64/org/lwjgl/glfw/libglfw_async.dylib.sha1'
// exclude 'META-INF/macos/x64/org/lwjgl/stb/liblwjgl_stb.dylib.sha1'
// exclude 'META-INF/macos/x64/org/lwjgl/openal/libopenal.dylib.sha1'
// exclude 'META-INF/macos/x64/org/lwjgl/opengl/liblwjgl_opengl.dylib.sha1'
// exclude 'META-INF/macos/x64/org/lwjgl/jemalloc/libjemalloc.dylib.sha1'
// exclude 'META-INF/macos/arm64/org/lwjgl/glfw/libglfw.dylib.sha1'
// exclude 'META-INF/macos/arm64/org/lwjgl/jemalloc/libjemalloc.dylib.sha1'
exclude 'META-INF/macos/arm32/org/lwjgl/glfw/libglfw.dylib.sha1'
exclude 'META-INF/macos/arm32/org/lwjgl/jemalloc/libjemalloc.dylib.sha1'
exclude 'META-INF/macos/arm32/org/lwjgl/stb/liblwjgl_stb.dylib.sha1'
exclude 'META-INF/macos/arm32/org/lwjgl/liblwjgl.dylib.sha1'
exclude 'META-INF/macos/arm32/org/lwjgl/opengl/liblwjgl_opengl.dylib.sha1'
exclude 'META-INF/macos/arm32/org/lwjgl/openal/libopenal.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/glfw/libglfw.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/jemalloc/libjemalloc.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/stb/liblwjgl_stb.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/liblwjgl.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/opengl/liblwjgl_opengl.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/openal/libopenal.dylib.sha1'
exclude 'META-INF/macos/arm64/org/lwjgl/glfw/libglfw_async.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/glfw/libglfw.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/jemalloc/libjemalloc.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/stb/liblwjgl_stb.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/liblwjgl.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/opengl/liblwjgl_opengl.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/openal/libopenal.dylib.sha1'
exclude 'META-INF/macos/x64/org/lwjgl/glfw/libglfw_async.dylib.sha1'

exclude 'META-INF/linux/arm32/org/lwjgl/glfw/libglfw.so.sha1'
exclude 'META-INF/linux/arm32/org/lwjgl/jemalloc/libjemalloc.so.sha1'
exclude 'META-INF/linux/arm32/org/lwjgl/stb/liblwjgl_stb.so.sha1'
exclude 'META-INF/linux/arm32/org/lwjgl/liblwjgl.so.sha1'
exclude 'META-INF/linux/arm32/org/lwjgl/opengl/liblwjgl_opengl.so.sha1'
exclude 'META-INF/linux/arm32/org/lwjgl/openal/libopenal.so.sha1'
exclude 'META-INF/linux/arm64/org/lwjgl/glfw/libglfw.so.sha1'
exclude 'META-INF/linux/arm64/org/lwjgl/jemalloc/libjemalloc.so.sha1'
exclude 'META-INF/linux/arm64/org/lwjgl/stb/liblwjgl_stb.so.sha1'
exclude 'META-INF/linux/arm64/org/lwjgl/liblwjgl.so.sha1'
exclude 'META-INF/linux/arm64/org/lwjgl/opengl/liblwjgl_opengl.so.sha1'
exclude 'META-INF/linux/arm64/org/lwjgl/openal/libopenal.so.sha1'
exclude 'META-INF/linux/x64/org/lwjgl/glfw/libglfw.so.sha1'
exclude 'META-INF/linux/x64/org/lwjgl/jemalloc/libjemalloc.so.sha1'
exclude 'META-INF/linux/x64/org/lwjgl/stb/liblwjgl_stb.so.sha1'
exclude 'META-INF/linux/x64/org/lwjgl/liblwjgl.so.sha1'
exclude 'META-INF/linux/x64/org/lwjgl/opengl/liblwjgl_opengl.so.sha1'
exclude 'META-INF/linux/x64/org/lwjgl/openal/libopenal.so.sha1'

// exclude 'META-INF/windows/x64/org/lwjgl/jemalloc/jemalloc.dll.sha1'
// exclude 'META-INF/windows/x64/org/lwjgl/stb/lwjgl_stb.dll.sha1'
// exclude 'META-INF/windows/x86/org/lwjgl/stb/lwjgl_stb.dll.sha1'
// exclude 'META-INF/windows/x86/org/lwjgl/lwjgl.dll.sha1'
exclude 'META-INF/windows/arm32/org/lwjgl/glfw/glfw.dll.sha1'
exclude 'META-INF/windows/arm32/org/lwjgl/jemalloc/jemalloc.dll.sha1'
exclude 'META-INF/windows/arm32/org/lwjgl/stb/lwjgl_stb.dll.sha1'
exclude 'META-INF/windows/arm32/org/lwjgl/lwjgl.dll.sha1'
exclude 'META-INF/windows/arm32/org/lwjgl/opengl/lwjgl_opengl.dll.sha1'
exclude 'META-INF/windows/arm32/org/lwjgl/openal/openal.dll.sha1'
exclude 'META-INF/windows/arm64/org/lwjgl/glfw/glfw.dll.sha1'
exclude 'META-INF/windows/arm64/org/lwjgl/jemalloc/jemalloc.dll.sha1'
exclude 'META-INF/windows/arm64/org/lwjgl/stb/lwjgl_stb.dll.sha1'
exclude 'META-INF/windows/arm64/org/lwjgl/lwjgl.dll.sha1'
exclude 'META-INF/windows/arm64/org/lwjgl/opengl/lwjgl_opengl.dll.sha1'
exclude 'META-INF/windows/arm64/org/lwjgl/openal/openal.dll.sha1'
exclude 'META-INF/windows/x64/org/lwjgl/glfw/glfw.dll.sha1'
exclude 'META-INF/windows/x64/org/lwjgl/jemalloc/jemalloc.dll.sha1'
exclude 'META-INF/windows/x64/org/lwjgl/stb/lwjgl_stb.dll.sha1'
exclude 'META-INF/windows/x64/org/lwjgl/lwjgl.dll.sha1'
exclude 'META-INF/windows/x64/org/lwjgl/opengl/lwjgl_opengl.dll.sha1'
exclude 'META-INF/windows/x64/org/lwjgl/openal/OpenAL.dll.sha1'
exclude 'META-INF/windows/x86/org/lwjgl/glfw/glfw.dll.sha1'
exclude 'META-INF/windows/x86/org/lwjgl/jemalloc/jemalloc.dll.sha1'
exclude 'META-INF/windows/x86/org/lwjgl/stb/lwjgl_stb.dll.sha1'
exclude 'META-INF/windows/x86/org/lwjgl/lwjgl.dll.sha1'
exclude 'META-INF/windows/x86/org/lwjgl/opengl/lwjgl_opengl.dll.sha1'
exclude 'META-INF/windows/x86/org/lwjgl/openal/OpenAL.dll.sha1'
exclude 'META-INF/INDEX.LIST'
}
defaultConfig {
applicationId "com.leisure.duncraw"
Expand All @@ -24,8 +101,17 @@ android {
versionCode 1
versionName "1.0"
}
signingConfigs {
release {
storeFile file("../../signed.jks")
storePassword "*963.*963."
keyAlias "key"
keyPassword "*963.*963."
}
}
buildTypes {
release {
signingConfig signingConfigs.release
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
Expand Down
4 changes: 3 additions & 1 deletion app/android/src/com/leisure/duncraw/AndroidLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import com.leisure.duncraw.GameApplication;
import com.leisure.duncraw.input.*;

public class AndroidLauncher extends AndroidApplication {
@Override
protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
initialize(new GameApplication(), config);
GameApplication game = new GameApplication(()->new SplashScreenInput());
initialize(game, config);
}
}
Binary file modified app/core/build/libs/core-1.0.jar
View file
Binary file not shown.
Binary file modified app/core/build/tmp/compileJava/previous-compilation-data.bin
View file
Binary file not shown.
1 change: 0 additions & 1 deletion app/core/src/com/leisure/duncraw/debug/editor/FloorEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public FloorEditor(FloorManager manager) {
generator.roomsBuilder = roomsBuilder;
font = Graphics.getFont(Graphics.fontSources.def);
lights.addAll(manager.lighting.getEnv().lightSources);
manager.lighting.getEnv().lightSources.clear();
}
@Override
public void tool() {
Expand Down
2 changes: 1 addition & 1 deletion ...om/leisure/duncraw/EndingScreenInput.java → ...sure/duncraw/input/EndingScreenInput.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.leisure.duncraw;
package com.leisure.duncraw.input;

import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputMultiplexer;
Expand Down
2 changes: 1 addition & 1 deletion .../com/leisure/duncraw/GameScreenInput.java → ...eisure/duncraw/input/GameScreenInput.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.leisure.duncraw;
package com.leisure.duncraw.input;

import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputMultiplexer;
Expand Down
2 changes: 1 addition & 1 deletion ...top/src/com/leisure/duncraw/HudInput.java → ...c/com/leisure/duncraw/input/HudInput.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.leisure.duncraw;
package com.leisure.duncraw.input;

import javax.swing.plaf.DesktopIconUI;

Expand Down
2 changes: 1 addition & 1 deletion .../com/leisure/duncraw/MenuScreenInput.java → ...eisure/duncraw/input/MenuScreenInput.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.leisure.duncraw;
package com.leisure.duncraw.input;

import com.badlogic.gdx.scenes.scene2d.ui.Label;

Expand Down
2 changes: 1 addition & 1 deletion ...om/leisure/duncraw/SplashScreenInput.java → ...sure/duncraw/input/SplashScreenInput.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.leisure.duncraw;
package com.leisure.duncraw.input;

import java.sql.BatchUpdateException;

Expand Down
1 change: 1 addition & 0 deletions app/core/src/com/leisure/duncraw/logging/Logger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ private static String format(String tag, String msg) {
return String.format("[%s] %s", tag, msg);
}
public static void log(String tag, String msg) {
tag = "Duncrawl." + tag;
if (hidden.contains(tag)) return;
if (group && !logList.isEmpty() && format(tag, msg).equals(logList.get(logList.size()-1))) streak++;
else if (group && streak >= 3) {
Expand Down
5 changes: 0 additions & 5 deletions app/core/src/com/leisure/duncraw/manager/CharaManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ public void kill(Chara chara) {
}
public void updateAll(float dt) {
for (Chara chara : charas.data) {
// for (Chara other : charas.data) {
// if (other != chara && chara.bounds.overlaps(other.bounds)) chara.movement.paused = true;
// // else if (!(chara instanceof Player) || !(chara.state instanceof AttackState)) chara.movement.paused = false;
// else chara.movement.paused = false;
// }
chara.update(dt);
if (chara.status.health <= 0 || chara.status.dead) {
deadCharas.add(chara);
Expand Down
2 changes: 1 addition & 1 deletion app/core/src/com/leisure/duncraw/manager/FloorManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import lib.time.Timer;

public class FloorManager {
public boolean showLighting = false;
public boolean showLighting = true;
public final FloorsData sources;
public final SpriteBatch batch;
public Tileset tileset;
Expand Down
6 changes: 3 additions & 3 deletions app/desktop/bin/main/save/dungeon_crawler.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"progression": {
"level": {
"floor": 4,
"floor": 1,
"scene": 7
}
},
Expand Down Expand Up @@ -37,8 +37,8 @@
}
},
"status": {
"health": 60,
"stamina": 93,
"health": 100,
"stamina": 100,
"maxHealth": 100,
"maxStamina": 100,
"hpRecovery": 2,
Expand Down
Binary file modified app/desktop/build/tmp/compileJava/previous-compilation-data.bin
View file
Binary file not shown.
1 change: 1 addition & 0 deletions app/desktop/src/com/leisure/duncraw/DesktopLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.leisure.duncraw.input.*;

// Please note that on macOS your application needs to be started with the -XstartOnFirstThread JVM argument
public class DesktopLauncher {
Expand Down
12 changes: 9 additions & 3 deletions assets/floors/random/1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"level": 1,
"envColor": {
"r": 0.136,
"g": 0.091,
"b": 0.136,
"a": 0.2
"g": 0.101,
"b": 0.156,
"a": 1
},
"customHeight": {},
"prefabRooms": {},
Expand Down Expand Up @@ -1666,6 +1666,12 @@
"y": 2112,
"width": 1936,
"height": 128
},
{
"x": 2656,
"y": 1248,
"width": 576,
"height": 384
}
]
}
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xmx128m -XX:MaxMetaspaceSize=256m
org.gradle.jvmargs=-Xmx526m -XX:MaxMetaspaceSize=526m
org.gradle.configureondemand=false
org.gradle.offline=true
org.gradle.daemon.maxmemory=128
org.gradle.daemon.maxmemory=526
org.gradle.parallel=false
org.gradle.java.compile.options.fork=true
org.gradle.java.compile.options.forkOptions.memoryMaximumSize=128m
org.gradle.java.compile.options.forkOptions.memoryMaximumSize=526m
android.useAndroidX=true

0 comments on commit 0c8ec82

Please sign in to comment.