Merge remote-tracking branch 'origin/Settings' into UI

Browse Source

# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/layer/layers/OptionsLayer.java
#	framework/src/main/java/org/toop/framework/audio/SoundManager.java

...

This commit is contained in:

ramollia

2025-10-05 17:03:09 +02:00

parent 2362333d46 0ab0cd75ba

commit f780309572

11 changed files with 227 additions and 14 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

BIN

app/src/main/resources/assets/audio/music/gladius.mp3 Normal file

Binary file not shown.