f026a4fec6
Manually fallback to the fallback locale when a ResourceBundle is missing a resource key. Fallsback to "MISSING RESOUREC" if it's not present in the fallback.
2025-10-29 13:49:50 +01:00
Bas de Jong
b84255e00e
Added replace to reduce boiler plate code
2025-10-28 15:23:36 +01:00
Bas de Jong
84c17d185b
Fixes for garbage code by Omar
2025-10-28 14:37:15 +01:00
michiel
3776167299
iets met timing verkeerd temporary fix
2025-10-28 14:23:53 +01:00
ramollia
48ed6df6b4
started working on the widget system
2025-10-28 12:59:15 +01:00
michiel
2428048bd5
updated music ma,es
2025-10-28 12:53:10 +01:00
michiel
1440190ac3
kleine ui fix
2025-10-28 12:30:48 +01:00
michiel
00b5f9dced
mainview false for sendchallengeview
2025-10-28 11:10:17 +01:00
ramollia
2cda94e4db
canvas changes
2025-10-28 09:13:09 +01:00
ramollia
d6f3bb2185
Merge remote-tracking branch 'origin/Demo3' into Demo3
2025-10-27 17:22:35 +01:00
ramollia
95d7ea5e1d
Merge branch 'OtherGames' into Demo3
2025-10-27 17:22:07 +01:00
Ticho Hidding
6fb248bec4
spam minder v2
2025-10-27 17:21:50 +01:00
ramollia
7b5c188280
Merge remote-tracking branch 'origin/OtherGames' into OtherGames
2025-10-27 17:21:32 +01:00
ramollia
1c2736ac75
fixed setgamelabels
2025-10-27 17:21:04 +01:00
Ticho Hidding
caa812217f
spam minder
2025-10-27 17:20:22 +01:00
Ticho Hidding
c115fb91af
tourney ready
2025-10-27 17:14:36 +01:00
Ticho Hidding
b506afdade
can start game from playerlist screen
2025-10-27 14:57:15 +01:00
Ticho Hidding
bd096df2c2
Merge remote-tracking branch 'origin/AudioDisplay' into OtherGames
2025-10-27 13:56:07 +01:00
Ticho Hidding
dfd3934b96
Merge branch 'Development' into OtherGames
2025-10-27 13:53:06 +01:00
ramollia
fb8acbe228
add simple flip animations and fixed(?) server somewhat
2025-10-25 17:37:50 +02:00
michiel301b
be40ee0187
Made it so that it indicates with the play/pause button if its paused or played
2025-10-24 13:28:59 +02:00
michiel301b
0c536b0f9b
Toegevoegd:
...
-Play Button + CSS + Events
-Previous Button + CSS + Events
-Changed interface for AudioResource to include a pause button which works really well with mediaplayer, however now SoundEffectAsset has an unnessescary pause
2025-10-24 13:22:42 +02:00
Ticho Hidding
c3f764f33d
connect4 with minimax AI
2025-10-19 22:01:33 +02:00
Ticho Hidding
0447f7b0fe
added method for sorting the flipped pieces by distance to Move.position
2025-10-19 02:18:11 +02:00
lieght
55989ab8ce
Merge remote-tracking branch 'origin/UI' into AudioDisplay
2025-10-17 20:13:05 +02:00
Bas de Jong
3a120803e3
Fixes for garbage code by Omar
2025-10-16 13:59:24 +02:00
michiel
6e35067c18
Skip Button
2025-10-16 13:37:01 +02:00
michiel
30f797022c
Skip Button
2025-10-16 13:35:41 +02:00
michiel301b
f44c3932dc
Basis Audio Display toegevoegd + standaard CSS toegevoegd
...
Kan nu zien hoe lang de song duurt, hoe lang ie al bezig is met draaien en de titel (-.mp3)
2025-10-16 00:45:29 +02:00
lieght
975207a6de
Nuke everything on close.
2025-10-16 00:37:20 +02:00
michiel301b
62e2b71ece
begin van audio display
2025-10-15 22:58:25 +02:00
lieght
cf9dbef882
Correct client creation and user polling
2025-10-15 21:36:46 +02:00
lieght
6ae5f1c2d2
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/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
2025-10-15 21:05:33 +02:00
lieght
b30420616a
Merge remote-tracking branch 'origin/185-networkingeventlistener' into UI
...
# 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
2025-10-15 21:05:01 +02:00
ramollia
e71369f7ff
visual update
2025-10-15 16:46:19 +02:00
ramollia
56ebe1347c
add: server chat box
2025-10-15 16:13:42 +02:00
ramollia
7f8ed029b9
add: reversi game
2025-10-15 15:22:19 +02:00
ramollia
2c8db95ba7
Merge remote-tracking branch 'origin/Reversi' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/canvas/GameCanvas.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
# app/src/main/resources/assets/localization/localization_ar.properties
# app/src/main/resources/assets/localization/localization_de.properties
# app/src/main/resources/assets/localization/localization_en.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_hi.properties
# app/src/main/resources/assets/localization/localization_it.properties
# app/src/main/resources/assets/localization/localization_ja.properties
# app/src/main/resources/assets/localization/localization_ko.properties
# app/src/main/resources/assets/localization/localization_nl.properties
# app/src/main/resources/assets/localization/localization_ru.properties
# app/src/main/resources/assets/localization/localization_zh.properties
2025-10-15 00:39:14 +02:00
ramollia
1f64a2dfd0
fixed merge conflicts
2025-10-15 00:26:27 +02:00
ramollia
0a6c2487bd
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/GameInformation.java
# app/src/main/java/org/toop/app/canvas/GameCanvas.java
# app/src/main/java/org/toop/app/canvas/TicTacToeCanvas.java
# app/src/main/java/org/toop/app/layer/Container.java
# app/src/main/java/org/toop/app/layer/Layer.java
# app/src/main/java/org/toop/app/layer/NodeBuilder.java
# app/src/main/java/org/toop/app/layer/Popup.java
# app/src/main/java/org/toop/app/layer/containers/HorizontalContainer.java
# app/src/main/java/org/toop/app/layer/containers/VerticalContainer.java
# app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
# app/src/main/java/org/toop/app/layer/layers/CreditsPopup.java
# app/src/main/java/org/toop/app/layer/layers/MainLayer.java
# app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java
# app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
# app/src/main/java/org/toop/app/layer/layers/QuitPopup.java
# app/src/main/java/org/toop/app/layer/layers/game/GameFinishedPopup.java
# app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
# app/src/main/java/org/toop/local/AppSettings.java
2025-10-15 00:17:17 +02:00
ramollia
e382cf95f2
gui refactor
2025-10-15 00:14:39 +02:00
lieght
444a81abc3
Improved API for dependency injection
2025-10-14 23:44:45 +02:00
lieght
d0676d9363
Forgot to remove
2025-10-14 23:27:52 +02:00
lieght
8f7e78efb5
Reworked NetworkingClientManager into SRP model.
2025-10-14 23:27:12 +02:00
lieght
cb7e3298fd
Added shuffling on user request
2025-10-14 19:57:07 +02:00
michiel
c09f0eb1f9
punk toegevoegd
2025-10-14 14:18:52 +02:00
Ticho Hidding
81abeef843
commit ofzo
2025-10-14 13:12:45 +02:00
Ticho Hidding
be26db953e
Merge remote-tracking branch 'origin/Development' into Reversi
...
# Conflicts:
# app/src/main/java/org/toop/app/canvas/GameCanvas.java
# app/src/main/java/org/toop/app/layer/layers/MainLayer.java
# game/src/main/java/org/toop/game/Game.java
# game/src/main/java/org/toop/game/othello/Othello.java
# game/src/main/java/org/toop/game/othello/OthelloAI.java
2025-10-14 11:25:46 +02:00
lieght
4bcf70d4dc
Removed ResourceManager from AudioManagers
2025-10-13 02:47:34 +02:00
lieght
fcc0b9d0dd
SoundEffectManager now generic
2025-10-13 02:27:04 +02:00
