Commit Graph

624 Commits

Author SHA1 Message Date
Bas Antonius de Jong
fe57e53d2e Merge branch 'Development' into 289-server 2026-01-16 13:05:08 +01:00
lieght
43fb9e2faf AI player given time change 2026-01-16 13:02:53 +01:00
lieght
4dfe503584 Timeout added 2026-01-16 12:44:07 +01:00
Bas de Jong
d2e1edab5c Moved async runner to virtual thread 2026-01-12 16:15:55 +01:00
Ticho Hidding
94e3fc71b8 legal move highlight and onhover effect added back 2026-01-12 13:41:59 +01:00
Ticho Hidding
9fcbe7d298 Turn information 2026-01-12 12:56:37 +01:00
Bas de Jong
848d257b9c More adaptable scoring system 2026-01-12 12:04:29 +01:00
Bas de Jong
7ce000c795 Removed unnecessary throw 2026-01-12 08:53:00 +01:00
Bas de Jong
07a3e22dc9 Added shuffle to builder 2026-01-12 08:51:42 +01:00
Bas de Jong
a1f0d48477 Refactored Tournament to use matchExecutor and ResultBroadcaster. Added turnTime and players are now added through Tournament creation instead of on MatchMaker/ScoreSystem creation 2026-01-12 08:33:54 +01:00
lieght
5caf6900d1 Removed input mistake, removed print 2026-01-11 10:50:53 +01:00
lieght
94d85bf78d Null handling 2026-01-11 09:07:30 +01:00
lieght
c9ea8f5e5b Tournament now uses propper builder pattern 2026-01-11 09:03:49 +01:00
lieght
cc7acf9f0c Moved scoring calculation into scoring system 2026-01-11 07:45:55 +01:00
Bas de Jong
955cb6109c Added back ability to shuffle matchmaker 2026-01-11 01:54:40 +01:00
Bas de Jong
013dd90705 Async tournament runner 2026-01-11 01:42:59 +01:00
Bas de Jong
c77499c36d Added result comeback with a draw 2026-01-11 00:53:31 +01:00
Bas de Jong
28791fcc8a Tournament is now without admins 2026-01-10 22:47:53 +01:00
Bas de Jong
97657b01c9 Added admins to games 2026-01-10 22:28:41 +01:00
Bas de Jong
a5bf6ca9fb Request admin list 2026-01-10 21:22:15 +01:00
Bas de Jong
fc25c15736 Starting a tournament now requires to be admin 2026-01-10 21:19:04 +01:00
Bas de Jong
d4cad3311e Tournament refactor for better naming and easier to understand code 2026-01-10 20:38:26 +01:00
Bas de Jong
96afc9543a Removed unnecessary imports 2026-01-10 04:29:38 +01:00
Bas de Jong
0c1b106da5 Refactored tournament to use interfaces and builders 2026-01-10 04:28:12 +01:00
Bas de Jong
aca0b2dcc0 Tournament now returns result to clients 2026-01-10 02:44:04 +01:00
Bas de Jong
75963a891b Tournament results are now send back to the clients connected to the server 2026-01-10 02:14:23 +01:00
Bas de Jong
6b644ed8fa Shuffle now changeable, host can now switch tournament gametype 2026-01-10 00:06:52 +01:00
Bas de Jong
6a395cc40b GlobalEventBus is now async instead 2026-01-09 23:34:29 +01:00
Bas de Jong
5e5948d1fe Working tournament 2026-01-09 22:28:15 +01:00
Bas de Jong
35f7a4fd13 Revert "Merge remote-tracking branch 'refs/remotes/origin/main' into Development"
This reverts commit e2132b549d, reversing
changes made to 9aefcb9b7b.
2026-01-09 19:27:47 +01:00
Bas de Jong
e2132b549d Merge remote-tracking branch 'refs/remotes/origin/main' into Development
# Conflicts:
#	app/src/main/java/org/toop/Main.java
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/Server.java
#	app/src/main/java/org/toop/app/canvas/BitGameCanvas.java
#	app/src/main/java/org/toop/app/canvas/GameCanvas.java
#	app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java
#	app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java
#	app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
#	app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java
#	app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java
#	app/src/main/java/org/toop/app/widget/Primitive.java
#	app/src/main/java/org/toop/app/widget/complex/ConfirmWidget.java
#	app/src/main/java/org/toop/app/widget/complex/PlayerInfoWidget.java
#	app/src/main/java/org/toop/app/widget/complex/ViewWidget.java
#	app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java
#	app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
#	app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java
#	app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java
#	app/src/main/java/org/toop/app/widget/tutorial/ShowEnableTutorialWidget.java
#	app/src/main/java/org/toop/app/widget/view/GameView.java
#	app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
#	app/src/main/java/org/toop/app/widget/view/LocalView.java
#	app/src/main/java/org/toop/app/widget/view/MainView.java
#	app/src/main/java/org/toop/app/widget/view/OnlineView.java
#	app/src/main/java/org/toop/app/widget/view/ServerView.java
#	framework/pom.xml
#	framework/src/main/java/org/toop/framework/gameFramework/GameState.java
#	framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/player/AI.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractAI.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractPlayer.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/player/Player.java
#	framework/src/main/java/org/toop/framework/networking/NetworkingClient.java
#	framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java
#	framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java
#	framework/src/main/java/org/toop/framework/networking/NetworkingInitializationException.java
#	framework/src/main/java/org/toop/framework/networking/clients/TournamentNetworkingClient.java
#	framework/src/main/java/org/toop/framework/networking/connection/clients/TournamentNetworkingClient.java
#	framework/src/main/java/org/toop/framework/networking/connection/exceptions/NetworkingInitializationException.java
#	framework/src/main/java/org/toop/framework/networking/connection/handlers/NetworkingGameClientHandler.java
#	framework/src/main/java/org/toop/framework/networking/events/NetworkEvents.java
#	framework/src/main/java/org/toop/framework/networking/exceptions/NetworkingInitializationException.java
#	framework/src/main/java/org/toop/framework/networking/handlers/NetworkingGameClientHandler.java
#	framework/src/test/java/org/toop/framework/networking/NetworkingClientManagerTest.java
#	framework/src/test/java/org/toop/framework/networking/events/NetworkEventsTest.java
2026-01-09 19:22:14 +01:00
Bas Antonius de Jong
9aefcb9b7b 289 server demo ready (#306)
* 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

* Hotfix for stuff

* Logging and fixed user input getting stuck

* Fixed merge mistakes
2026-01-07 23:47:38 +01:00
Bas de Jong
9c01aabbe1 Fixed merge mistakes 2026-01-07 23:46:21 +01:00
Bas Antonius de Jong
0cb52b042f Merge branch 'Development' into 289-server 2026-01-07 23:44:13 +01:00
Bas de Jong
56a8d12e46 Logging and fixed user input getting stuck 2026-01-07 23:38:53 +01:00
65220d9649 Hotfix for stuff 2026-01-07 17:16:45 +01:00
Bas Antonius de Jong
c64a2e2c65 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>
2026-01-07 16:15:49 +01:00
58a9ce78fe Merge remote-tracking branch 'origin/289-server' into Development
# Conflicts:
#	app/src/main/java/org/toop/app/Server.java
#	app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
#	app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
#	framework/src/main/java/org/toop/framework/game/BitboardGame.java
#	framework/src/main/java/org/toop/framework/game/players/ArtificialPlayer.java
#	framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java
#	framework/src/main/java/org/toop/framework/game/players/OnlinePlayer.java
#	framework/src/main/java/org/toop/framework/game/players/ai/MiniMaxAI.java
#	framework/src/main/java/org/toop/framework/game/players/ai/RandomAI.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java
#	framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractPlayer.java
#	game/src/main/java/org/toop/game/players/MiniMaxAI.java
#	game/src/main/java/org/toop/game/players/RandomAI.java
#	game/src/main/java/org/toop/game/players/ai/MiniMaxAI.java
#	game/src/main/java/org/toop/game/players/ai/RandomAI.java
2026-01-07 16:13:53 +01:00
230f7480e4 Merge remote-tracking branch 'origin/289-server' into 289-server 2026-01-07 15:41:28 +01:00
ramollia
6aa0eb952a main 2026-01-07 14:44:45 +01:00
ramollia
df93b44d19 bitboard fix & mcts v2 & mcts v3. v3 still in progress and v4 coming soon 2026-01-07 14:39:38 +01:00
Bas de Jong
67f39c3f3b Code readability 2026-01-07 14:38:19 +01:00
6e6a383708 Collapsed interfaces in View section 2026-01-07 13:26:43 +01:00
b7dec7798b Collapsed interfaces in Controller section 2026-01-07 13:13:32 +01:00
2caa4fc79f Fixed runtime error I forgot to fix. 2026-01-07 12:42:54 +01:00
e72d888d84 Collapsed interfaces from model portion 2026-01-07 12:41:25 +01:00
ramollia
e149588b60 bitboard optimization 2025-12-15 10:31:22 +01:00
Bas de Jong
a7d1a964c2 Moved subscriptions to store 2025-12-15 10:01:23 +01:00
ramollia
380e219c08 mcts v1 2025-12-15 09:06:56 +01:00
lieght
dccf428bb8 TableWidget 2025-12-14 17:18:57 +01:00