Merge remote-tracking branch 'origin/test' into test

Browse Source

# Conflicts:
#	src/main/java/uno/mloluyu/desktop/CharacterSelectScreen.java
#	src/main/java/uno/mloluyu/versatile/FighterController.java

...

This commit is contained in:

mloluyu

2025-09-26 00:20:44 +08:00

parent cd3fff70fd 770f3667e3

commit 552e0cb899

44 changed files with 3320 additions and 3538 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1400

target/classes/character/alice/alice.atlas Normal file

File diff suppressed because it is too large Load Diff

BIN

target/classes/character/alice/alice.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 MiB

BIN

target/classes/character/alice/精灵1.2-0.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 MiB

1397

target/classes/character/alice/精灵1.2.atlas

File diff suppressed because it is too large Load Diff

BIN

target/classes/character/alice/精灵1.2.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.8 MiB