Commit Graph

74 Commits

Author SHA1 Message Date
Bas Antonius de Jong
d078a70950 289 server (#308) Incremental server update, with working tournament and player input timeout
* Server update with new dev changes (#305)

* merge widgets with development

* readd previous game thread code

* Revert "readd previous game thread code"

This reverts commit d24feef73e.

* Revert "Merge remote-tracking branch 'origin/Development' into Development"

This reverts commit 59d46cb73c, reversing
changes made to 38681c5db0.

* Revert "merge widgets with development"

This reverts commit 38681c5db0.

* Merge 292 into development (#293)

Applied template method pattern to abstract player

* Added documentation to player classes and improved method names (#295)

* mcts v1

* bitboard optimization

* bitboard fix & mcts v2 & mcts v3. v3 still in progress and v4 coming soon

* main

---------

Co-authored-by: ramollia <>
Co-authored-by: Stef <stbuwalda@gmail.com>
Co-authored-by: Stef <48526421+StefBuwalda@users.noreply.github.com>

* Hotfix for stuff

* Logging and fixed user input getting stuck

* Fixed merge mistakes

* Working tournament

* GlobalEventBus is now async instead

* Shuffle now changeable, host can now switch tournament gametype

* Tournament results are now send back to the clients connected to the server

* Tournament now returns result to clients

* Refactored tournament to use interfaces and builders

* Removed unnecessary imports

* Tournament refactor for better naming and easier to understand code

* Starting a tournament now requires to be admin

* Request admin list

* Added admins to games

* Tournament is now without admins

* Added result comeback with a draw

* Async tournament runner

* Added back ability to shuffle matchmaker

* Moved scoring calculation into scoring system

* Tournament now uses propper builder pattern

* Null handling

* Removed input mistake, removed print

* Refactored Tournament to use matchExecutor and ResultBroadcaster. Added turnTime and players are now added through Tournament creation instead of on MatchMaker/ScoreSystem creation

* Added shuffle to builder

* Removed unnecessary throw

* More adaptable scoring system

* Moved async runner to virtual thread

* Timeout added

* AI player given time change

---------

Co-authored-by: Stef <stbuwalda@gmail.com>
Co-authored-by: Stef <48526421+StefBuwalda@users.noreply.github.com>
2026-01-16 13:06:09 +01:00
michiel
c14b66e892 rest van de tutorials toegevoegd 2025-11-27 11:42:38 +01: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
lieght
dc81d9c3ca Added exceptions. Added reconnect attempts and changeable address 2025-10-15 02:58: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
lieght
cdc34b432e Changed pom to be correct.
Fixed SnowflakeGenerator not making unique ids.
Changed naming for event implementation.
Automated id getter for events.
Added Error-Prone to all modules.
Added parents to all modules.
Added processors module.
2025-10-13 02:06:12 +02:00
Bas de Jong
e9dfbbd150 Renamed asset folder to resource, made resourceLoader more robust. Completed some TODO's, formatting 2025-10-07 23:54:33 +02:00
Bas de Jong
72e322675e Fixed bugs and oversights 2025-10-07 22:39:47 +02:00
Bas de Jong
16a5b1ce2f Merge remote-tracking branch '2OOP/main' into Development
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
#	app/src/main/java/org/toop/Main.java
2025-10-07 19:40:55 +02:00
ramollia
e6fa522f39 add: ai think time.
remove: georgian language pack
2025-10-06 23:25:48 +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
ramollia
043b789da1 readd: localization 2025-10-04 22:57:12 +02:00
michiel
d7d6a49b98 settings 2025-10-04 22:33:46 +02:00
ramollia
82f8d00625 started the great ui redesign 2025-10-03 20:38:50 +02:00
Ticho Hidding
be917e6a61 added German, French, Spanish, Italian and Mandarin Chinese 2025-10-02 13:43:00 +02:00
lieght
af9da93421 JDK25 2025-10-01 16:03:35 +02:00
Ticho Hidding
9134c7e3e7 Merge remote-tracking branch 'origin/UI' into UI
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/org/toop/app/menu/MainMenu.java
#	app/src/main/java/org/toop/app/menu/QuitMenu.java
2025-10-01 15:54:18 +02:00
Ticho Hidding
b12c74433a merge to UI 2025-10-01 15:31:38 +02:00
lieght
5e4db91750 Moved loads to own class for better memory management. Added ability to add text- and localizationassets. 2025-10-01 04:19:28 +02:00
lieght
d78fd1b606 Fixed unknown names, Assetmanager now has initializeloader 2025-09-30 23:17:32 +02:00
Ticho Hidding
f37d26db28 Merge remote-tracking branch 'origin/UI' into Localization
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/org/toop/Main.java
#	app/src/main/java/org/toop/app/gui/LocalServerSelector.java
#	app/src/main/java/org/toop/events/WindowEvents.java
#	app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
2025-09-30 14:25:41 +02:00
Ticho Hidding
52d41e587e merge to UI 2025-09-30 14:22:08 +02:00
Bas Antonius de Jong
d5735be2db Update git (#81)
* new ignore

* Delete .idea/misc.xml

* Delete .idea/compiler.xml

---------

Co-authored-by: Stef <stbuwalda@gmail.com>
2025-09-30 12:07:12 +02:00
Bas de Jong
57bd6ded6f HasMap to String, Asset instead of Long Asset 2025-09-30 11:53:13 +02:00
Bas de Jong
a957195514 Rudimentary audio file processing. 2025-09-29 13:48:03 +02:00
lieght
c76b7a800e Server in working state, can be merged with working branch. 2025-09-28 21:57:59 +02:00
lieght
a9e63b3fcc Initial parsing of server response 2025-09-28 21:57:59 +02:00
ramollia
27e7166ac7 refactored game 2025-09-25 15:50:10 +02:00
Ticho Hidding
2c4719f6d4 added localization options
//todo add all the strings
2025-09-25 14:38:06 +02:00
lieght
7431d1b03f Disabled error prone for now. Improved eventflow speed 2025-09-24 22:04:00 +02:00
lieght
e6e11a3604 Refactor and fixes 2025-09-24 18:37:13 +02:00
lieght
afc79f8d36 Added back import 2025-09-24 16:55:40 +02:00
lieght
05e2b27330 Fixed poms 2025-09-24 16:28:25 +02:00
lieght
80f0b9e957 Updated module names 2025-09-24 15:57:01 +02:00
lieght
aaf2e4ab80 Removed Guava 2025-09-24 15:08:32 +02:00
lieght
63b08f3010 Updated eventpublisher to also accept normal events without uuid 2025-09-22 17:07:39 +02:00
lieght
3fa0bae46a Networking moved to netty. Added a EventPublisher class for easy building of events. 2025-09-22 04:04:52 +02:00
lieght
d5b03976b7 Formatted code to follow google formatting guidelines using the Spotless formatter 2025-09-20 15:11:57 +02:00
lieght
323f401aad spotless formatter 2025-09-20 15:00:34 +02:00
lieght
c2b6aea71e MVP game client 2025-09-19 00:00:25 +02:00
Bas de Jong
8f9d6da0c9 Readded window instantiation 2025-09-18 13:39:57 +02:00
Bas de Jong
23f1b9ea71 Updated .gitignore, removed some .idea files from repository 2025-09-18 13:03:52 +02:00
Bas de Jong
0f6f8baee7 ServerManager logging 2025-09-18 11:45:39 +02:00
Bas de Jong
0cc57f558d Added the ability to tune the logger 2025-09-17 23:40:55 +02:00
Bas de Jong
26590e1939 Logging docs 2025-09-17 23:17:06 +02:00
lieght
5eb6e8ea37 Added second player to initial form 2025-09-17 20:31:50 +02:00
lieght
032d388f4f Added creating setting up a server for the user when the form is filled in 2025-09-17 20:12:36 +02:00