lieght
|
08bfb97399
|
Wip OnlineGameState
|
2025-10-05 19:55:29 +02:00 |
|
ramollia
|
062fe2e8bc
|
Merge remote-tracking branch 'origin/UI' into UI
|
2025-10-05 18:24:25 +02:00 |
|
ramollia
|
b903e9b3c4
|
setup for server thread
|
2025-10-05 18:24:15 +02:00 |
|
Ticho Hidding
|
a40d30fec7
|
Merge remote-tracking branch 'origin/UI' into UI
# Conflicts:
# app/src/main/java/org/toop/app/GameType.java
# app/src/main/java/org/toop/app/layer/layers/GameLayer.java
|
2025-10-05 18:22:10 +02:00 |
|
Ticho Hidding
|
98bff669e9
|
start van match.java. allemaal events
|
2025-10-05 18:21:28 +02:00 |
|
lieght
|
c2d320ea97
|
Merge remote-tracking branch 'origin/UI' into UI
|
2025-10-05 17:52:45 +02:00 |
|
ramollia
|
9ee6bf3067
|
Merge remote-tracking branch 'origin/UI' into UI
|
2025-10-05 17:52:40 +02:00 |
|
lieght
|
2198b8a8d9
|
Fixes gets
|
2025-10-05 17:52:32 +02:00 |
|
ramollia
|
7e3f13491d
|
fix: some things
|
2025-10-05 17:52:29 +02:00 |
|
lieght
|
d28fd90b84
|
Merge remote-tracking branch 'origin/UI' into UI
|
2025-10-05 17:38:16 +02:00 |
|
lieght
|
b8336ce3d2
|
Added throw exception
|
2025-10-05 17:38:01 +02:00 |
|
ramollia
|
b5ac747f77
|
Merge remote-tracking branch 'origin/UI' into UI
|
2025-10-05 17:28:46 +02:00 |
|
ramollia
|
369df7a0d1
|
save locale
|
2025-10-05 17:28:33 +02:00 |
|
lieght
|
06464945bd
|
Sane default for audio.
|
2025-10-05 17:23:05 +02:00 |
|
lieght
|
1bab3e12a5
|
Fixed garbage code.
|
2025-10-05 17:21:31 +02:00 |
|
ramollia
|
a50c1a8d0d
|
broken merge
|
2025-10-05 17:18:33 +02:00 |
|
ramollia
|
f780309572
|
Merge remote-tracking branch 'origin/Settings' into UI
# 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
|
2025-10-05 17:03:09 +02:00 |
|
ramollia
|
2362333d46
|
add: some more languages
|
2025-10-05 16:59:37 +02:00 |
|
lieght
|
0ab0cd75ba
|
Fixed audio not getting correct volume at settings loading. Added back background music
|
2025-10-05 01:51:29 +02:00 |
|
ramollia
|
043b789da1
|
readd: localization
|
2025-10-04 22:57:12 +02:00 |
|
michiel
|
d7d6a49b98
|
settings
|
2025-10-04 22:33:46 +02:00 |
|
ramollia
|
39fa2edb3a
|
add: credits layer
|
2025-10-04 20:25:59 +02:00 |
|
ramollia
|
e7d606f08e
|
add: options layer
|
2025-10-04 19:26:30 +02:00 |
|
ramollia
|
db6231c6d0
|
add: fullscreen option
|
2025-10-04 18:18:53 +02:00 |
|
ramollia
|
cd2f3c312e
|
start: options
|
2025-10-04 16:59:28 +02:00 |
|
ramollia
|
2eeca4e418
|
finish: multiplayer layer
|
2025-10-04 16:54:58 +02:00 |
|
ramollia
|
4daa379011
|
remove: addCanvas
|
2025-10-04 16:30:50 +02:00 |
|
ramollia
|
ba4173f029
|
add: separators
|
2025-10-04 16:24:27 +02:00 |
|
ramollia
|
af0db24b0a
|
add: sliders
change: formatting
|
2025-10-04 15:56:07 +02:00 |
|
ramollia
|
732abedba5
|
sorry michiel
|
2025-10-04 15:18:34 +02:00 |
|
ramollia
|
fe6b050702
|
Merge remote-tracking branch 'origin/UI' into UI
# Conflicts:
# app/src/main/java/org/toop/app/menu/CreditsMenu.java
# app/src/main/java/org/toop/app/menu/MainMenu.java
# app/src/main/java/org/toop/app/menu/OptionsMenu.java
|
2025-10-04 15:16:39 +02:00 |
|
ramollia
|
b3feab7cb3
|
change things
|
2025-10-04 15:16:07 +02:00 |
|
ramollia
|
87a5b301c7
|
change: layout stuff
|
2025-10-04 13:52:04 +02:00 |
|
ramollia
|
8fc7f606f9
|
change: toggles
|
2025-10-03 23:16:47 +02:00 |
|
ramollia
|
fae5b8bcda
|
added: toggle
|
2025-10-03 22:34:26 +02:00 |
|
ramollia
|
ac6de04e68
|
changed how the layer background uses css
|
2025-10-03 21:44:32 +02:00 |
|
michiel
|
d9a93f24fb
|
credits toegevoegd
|
2025-10-03 21:44:06 +02:00 |
|
ramollia
|
754c8fea2e
|
started working on the game selection layer
|
2025-10-03 21:31:42 +02:00 |
|
ramollia
|
82f8d00625
|
started the great ui redesign
|
2025-10-03 20:38:50 +02:00 |
|
lieght
|
56a1afe1cd
|
"Fixed double sound bug"
|
2025-10-03 18:34:48 +02:00 |
|
lieght
|
796c3a2bc6
|
Added forgotten sound effects
|
2025-10-03 18:31:13 +02:00 |
|
lieght
|
dd192692bd
|
Working sound effect for clicking, bug when using audio volume changer (changes some sounds to be wrong)
|
2025-10-03 17:12:50 +02:00 |
|
lieght
|
5a200a8a70
|
Working audio rocker in settings menu.
|
2025-10-03 04:42:48 +02:00 |
|
lieght
|
83130806a8
|
Changed bundled resources to use static base name instead.
Added options menu with selectable language.
Created checkbox for setting fullscreen.
Refactored code to functions
|
2025-10-03 04:15:36 +02:00 |
|
lieght
|
a5513bf87b
|
Merge remote-tracking branch 'origin/121-settings-menu' into UI
# Conflicts:
# app/src/main/java/org/toop/app/menu/OptionsMenu.java
# app/src/main/resources/assets/localization/localization_de.properties
# app/src/main/resources/assets/localization/localization_en_US.properties
# app/src/main/resources/assets/localization/localization_es.properties
# app/src/main/resources/assets/localization/localization_fr.properties
# app/src/main/resources/assets/localization/localization_it.properties
# app/src/main/resources/assets/localization/localization_nl.properties
# app/src/main/resources/assets/localization/localization_zh.properties
|
2025-10-03 03:25:20 +02:00 |
|
lieght
|
547ea55300
|
Changed bundled resources to use static base name instead.
Added options menu with selectable language
|
2025-10-03 03:19:38 +02:00 |
|
Ticho Hidding
|
3471ae54a5
|
small merge fixes
|
2025-10-03 02:46:48 +02:00 |
|
Ticho Hidding
|
c020269f6e
|
Merge remote-tracking branch 'origin/UI' into UI
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/menu/MainMenu.java
# app/src/main/java/org/toop/app/menu/game/GameMenu.java
|
2025-10-03 02:43:39 +02:00 |
|
Ticho Hidding
|
f037412e9a
|
Change language buttons added. Made UI update all text on language change
|
2025-10-03 02:37:38 +02:00 |
|
ramollia
|
5e1d53e96b
|
tiny portion of refactoring
|
2025-10-03 01:41:11 +02:00 |
|