Merge remote-tracking branch 'origin/185-networkingeventlistener' into UI

Browse Source

# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
#	app/src/main/java/org/toop/app/layer/layers/MainLayer.java
#	app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
#	app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
#	app/src/main/java/org/toop/local/AppSettings.java

...

This commit is contained in:

lieght

2025-10-15 21:05:01 +02:00

parent 1f64a2dfd0 1134649197

commit b30420616a

72 changed files with 2972 additions and 1838 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/fx/medium-button-click-backup.wav Normal file

Binary file not shown.

BIN

app/src/main/resources/assets/audio/music/main-game-theme-loop.mp3 Normal file

Binary file not shown.