Commit Graph

79 Commits

Author SHA1 Message Date
lieght
040287ad70 Added infinite boolean, fixed loading behaviour at startup 2025-12-03 18:56:08 +01:00
Bas Antonius de Jong
628e4f30b5 Main menu loader (#277)
* LoadingWidget main menu

* fixed garbage code

* Fixed garbage code 2

* LoadWidget fix, added loading to starting the game. Removed unnecessary console output

---------

Co-authored-by: ramollia <>
2025-12-03 14:49:59 +01:00
Bas Antonius de Jong
3c9b010dd3 231 connecting to server feedback (#275)
* Added unsubscribe to EventFlow. ListenerHandler now functional. GlobalEventbus now user listenerHandler

* getAllListeners

* Removed nulls

* Fixed stress tests

* Added docs, no more list creation when adding events to the bus.

* Fixed unsubscribe not working.

* Moved away from deprecated functions

* moved from wildcard to typed

* Moved away from deprecated function

* Added debugging to GlobalEventBus

* Fixed cleaning flow

* Fixed unsubscribe all

* Fixed unsubscribe all

* Removed unused import

* Added LoadingWidget.java for server feedback

* Imports

* fixed loadingwidget

* Workable LoadingWidget and trying to connect to server

* Removed output

* Small bug temp fix

---------

Co-authored-by: ramollia <>
2025-12-02 20:59:46 +01:00
Bas Antonius de Jong
d9437c1b8a Tutorials to Dev (#264)
* Fixed garbage code

* added a pop button

* Tutorial images now use ImageAsset.java

* Added button to continue and start game. Refactors

* Refactored nextScreen runnable

* Removed unused imports

* Refactored switch statement

* Added documentation

* Removed space

* Added translations

* Added function input for enabling/disabling localization p/text

---------

Co-authored-by: ramollia <>
2025-12-02 10:57:46 +01:00
ramollia
a2d651cd7d Merge remote-tracking branch 'refs/remotes/origin/Development' into Tutorials
# Conflicts:
#	app/src/main/java/org/toop/app/game/Connect4Game.java
2025-11-28 11:51:46 +01:00
tichohidding
8c01c7fa7a Merge branch 'Development' into Widgets 2025-11-27 17:19:17 +01:00
michiel
c14b66e892 rest van de tutorials toegevoegd 2025-11-27 11:42:38 +01:00
michiel301b
8c69453506 started a basis for the tutorials, tic tac toe is almost done with some general stuff still to do. 2025-11-26 22:03:06 +01:00
ramollia
1c9af58264 half done with the widget system 2025-10-31 17:33:19 +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
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
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
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
michiel301b
62e2b71ece begin van audio display 2025-10-15 22:58:25 +02:00
ramollia
e71369f7ff visual update 2025-10-15 16:46: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
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
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
lieght
b101734fd7 Reworked to now use better defined generics and easier to use API. Added AudioResource to be used in changing volume 2025-10-11 06:09:13 +02:00
michiel
a302f0d24d added a song 2025-10-07 12:35:54 +02:00
ramollia
3d9914c927 add: missing localization 2025-10-07 12:08:01 +02:00
Stef
3af182b986 Add a music volume slider (#135) 2025-10-07 11:47:57 +02:00
ramollia
172b26ed51 ... 2025-10-07 04:46:45 +02:00
ramollia
78aef47bc0 fix: effects volume translation 2025-10-06 23:36:25 +02:00
ramollia
ea8de7881f Merge remote-tracking branch 'origin/UI' into UI
# Conflicts:
#	app/src/main/resources/assets/localization/localization_ka.properties
2025-10-06 23:26:07 +02:00
ramollia
e6fa522f39 add: ai think time.
remove: georgian language pack
2025-10-06 23:25:48 +02:00
Bas de Jong
95c4a2fc8e finished fx audio volume 2025-10-06 22:27:14 +02:00
ramollia
f525fc7ffc add: missing localization 2025-10-06 21:49:35 +02:00
ramollia
1bf3f00322 add: win screen 2025-10-06 21:46:38 +02:00
ramollia
525adfdd04 translated: connection type 2025-10-06 21:15:43 +02:00
ramollia
acc9972c80 redesign. add: themes and text size 2025-10-06 21:08:36 +02:00
ramollia
cfde1f8d7f update: style 2025-10-06 11:43:09 +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
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
cd2f3c312e start: options 2025-10-04 16:59:28 +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
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