Commit Graph

589 Commits

Author SHA1 Message Date
Bas Antonius de Jong
0132981d94 Merge branch 'main' into Development 2025-12-09 21:20:08 +01:00
Bas de Jong
322197494c Will fix tests etc later 2025-12-09 21:19:30 +01:00
Bas de Jong
a9c99df5d2 Better limits to generic acceptance 2025-12-09 21:07:30 +01:00
ramollia
d702f82194 Merge remote-tracking branch 'origin/Development' into Development
# Conflicts:
#	game/src/main/java/org/toop/game/reversi/ReversiAI.java
2025-12-09 12:54:12 +01:00
Stef
912d25c01f Merge bitboards into development (#285)
* added new classes for the games that use bitboards instead. also combined game with turnbasedgame

* (DOES NOT COMPILE) In-between commit

* turn updates

* smalle fixes aan turn updates

* Bitboard implemented with scuffed TicTacToe translation done by game. This should be done by the view.

* Almost done with implementing bitboards. Reversi is broken and artifical players don't work yet.

* better human/ai selector with bot selection and depth on TicTacToeAIR

* fixed getLegalMoves

* depth + thinktime back to AIs, along with a a specific TicTacToeAIRSleep

* fixed overlapping back and disconnect buttons

* Changed to debug instead of info

* changed the transitionNextCustom to be easier to use

* added getAllWidgets to WidgetContainer

* Correct back view

* added replacePrevious in ViewWidget

* added removeIndexFromPreviousChain

* fixed incorrect index counting

* Fixt wrong view order

* fixed? getLegalMoves

* Everything is broken

* Removed todo

* fixed getLegalMoves & getFlips

* Challenge popups "Fixed"

* Fixed local and online play for both games

* Popups now remove themselves

* Removed souts for debugging

* localize the ChallengePopup text

* made the game text a header instead

* made more classes deepClonable.

* fixed getAllWidgets

* Added comment

* Escape popup

* fixed redundant container

* Made all network events async again

* Escape remove popup

* Working escape menu

* Removed old AI and old files. Added a new generic random AI. game no longer deals with translation.

* Drawing of board on canvas is now done from bitboards rather than translating.

* Added a method getWinner() to game interface.Controller now tells gameThreads how to deal with drawing UI and sending a move to server.

* Added find functionality

* Added a ChatGPT generated MiniMaxAI based on the old MiniMaxAI but with alpha-beta pruning and heuristics for Reversi

* Removed System-Outs to clean up console

* Update BitGameCanvas.java

* Merge fixes

* Removed unused imports

---------

Co-authored-by: ramollia <>
Co-authored-by: michiel301b <m.brands.3@st.hanze.nl>
Co-authored-by: lieght <49651652+BAFGdeJong@users.noreply.github.com>
2025-12-08 18:23:06 +01:00
Ticho Hidding
adc7b1a8f3 fixed reversi colors being switched, causing multiple issues 2025-12-08 17:14:31 +01:00
Ticho Hidding
3a8b1c2454 shitty fix for player selector spacing issue v2 2025-12-08 16:12:42 +01:00
Ticho Hidding
846898988f shitty fix for player selector spacing issue 2025-12-08 15:59:11 +01:00
Ticho Hidding
ecd0fd26be changed "fullscreen exit key combination" from esc to F11 2025-12-08 15:11:17 +01:00
lieght
a838973e67 Code cleanup 2025-12-07 20:43:56 +01:00
lieght
a4f2a67d9c Deleted unnecessary imports 2025-12-07 20:39:29 +01:00
lieght
12bccb8854 Safety 2025-12-07 20:33:27 +01:00
lieght
80d3e47ad9 initSystems now uses latch instead of timer. Moved single threads to Executor 2025-12-07 18:59:19 +01:00
Bas Antonius de Jong
38f50cc16d Event bus now testable, improved UI (#284)
* turn updates

* smalle fixes aan turn updates

* better human/ai selector with bot selection and depth on TicTacToeAIR

* depth + thinktime back to AIs, along with a a specific TicTacToeAIRSleep

* fixed overlapping back and disconnect buttons

* Changed to debug instead of info

* changed the transitionNextCustom to be easier to use

* added getAllWidgets to WidgetContainer

* Correct back view

* added replacePrevious in ViewWidget

* added removeIndexFromPreviousChain

* fixed incorrect index counting

* Fixt wrong view order

* Removed todo

* Challenge popups "Fixed"

* Popups now remove themselves

* localize the ChallengePopup text

* made the game text a header instead

* fixed getAllWidgets

* Escape popup

* fixed redundant container

* Escape remove popup

* Working escape menu

* Added find functionality

* Tutorials moved to escape menu

* Escape can't be opened in mainview now

* Can now test the event bus, created testable interfaces

* Logging errors

* Made events and handlers more generic

* Suppress

* Managers now have changeable eventbus

* Tutorials fixed

* Removed import

* Single threaded eventbus

* Fixed wrong eventbus

* Removed get

* Removed old code

* Renaming

* Optimization

* Removed useless comment

* Removed unnecessary imports

* Rename

* Renaming, refactor and type safety

* Rename

* Removed import

---------

Co-authored-by: michiel301b <m.brands.3@st.hanze.nl>
Co-authored-by: ramollia <>
2025-12-07 17:38:34 +01:00
lieght
f60df73b66 Loading circle, better loading colors. 2025-12-03 23:55:12 +01:00
8ca2399e6a Merge branch 'Development' of https://github.com/2OOP/pism into Development 2025-12-03 21:51:14 +01:00
8c75ac1471 Making threads verbose regarding exceptions 2025-12-03 21:51:01 +01:00
lieght
f866eab8ba Best fix for white screen at start 2025-12-03 21:50:32 +01:00
Stef
8d77f51355 272 remake game framework interfaces to properly represent vmc (#278)
* Cleaned up a lot of old files and renamed/remade interfaces to better suit the framework

* Broken commit

* Fixed online play

* Better file structure and closer to MVC
2025-12-03 20:35:37 +01:00
lieght
040287ad70 Added infinite boolean, fixed loading behaviour at startup 2025-12-03 18:56:08 +01:00
lieght
740d2cf3db Fixed systems starting, before assets being loaded (I am retarded) 2025-12-03 18:13:57 +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
ramollia
f4678edf2f Merge remote-tracking branch 'origin/Development' into Development 2025-12-03 12:49:14 +01:00
Bas de Jong
bc84171029 Double loading call fix, LoadingWidget docs 2025-12-03 11:39:25 +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
michiel
4dbc4997a0 added back button sounds because SOMEONE fucked it up..... 2025-12-02 11:51:00 +01:00
ramollia
9a0bfc4fce Merge remote-tracking branch 'origin/Development' into Development 2025-12-02 11:25:42 +01:00
Stef
9f55f8e1c7 Merge new framework into development (#269)
* Created a somewhat generic TurnBasedGame thread. Temporary UI that only works for TicTacToe rn. Added a LocalPlayer with the intent to add more players

* (RANDOM COMMIT) Hope it works

* Changes by bas

* Fixed dependency issues

* Fixed major issue in game deepcopy

* Merge conflict fix

* Removed unused import

* Update GTBGT branch from dev branch (#263)

* started a basis for the tutorials, tic tac toe is almost done with some general stuff still to do.

* rest van de tutorials toegevoegd

* Removed views

* Merge conflict fix

* Removed unused import

---------

Co-authored-by: michiel301b <m.brands.3@st.hanze.nl>
Co-authored-by: ramollia <>
Co-authored-by: Bas Antonius de Jong <49651652+BAFGdeJong@users.noreply.github.com>

* Revert "Update GTBGT branch from dev branch (#263)"

This reverts commit 9134d7e343.

* Fixed frontend not using GameController because of spaghetti code.

* Removed unused imports

* GameCanvas not implements a DrawPlayerMove that can be overridden for specific implementations

* Created an event that will request the controller to refresh the UI.

* ADDED DEPENDENCY. Renamed GameControllers to GameManagers, gameThread is not game controller.

* Attempt at adding an online player. I think it doesn't work because of unsubscriben after success not working

* Multiplayer is functional through OnlineThreadBehaviour. Empty slots are currently represented by -1 in the GUI.

* Removed sout spam, added logger than I can't get to work.

* Idek what these changes are

* Te lang geen commit, sorry

* Multiplayer seems to work pretty well now, hopefully I can add the other games soon.

* Added unsubscribe to EventFlow. ListenerHandler now functional. GlobalEventbus now user listenerHandler

* getAllListeners

* Removed nulls

* Inbetween commit of adding Reversi. This is a lot of spaghetti.

* Fixed stress tests

* Fixed typo in NetworkingGameClientHandler that prevented losses from being received

* Missed 2nd typo. Fixed

* 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

* Works now with updated EventFlow(). Unsubscribing works. ReversiAIR has an issue where a forced move returns -1 and local play back button doesn't work properly. To be fixed

* Fixed ReversiR issue that caused skip turn desync

* Fixed color mismatch with server and online main player is now correct.

* Added a bunch of java doc and small changes

* Small changes

* Added a new Thread Behaviour to test framework.

* Fixed human error I made in TicTacToeR logic...

* Fixed broken event and wrong player being presented as winner.

* Idk changes

* Fixed PR conflicts

---------

Co-authored-by: michiel301b <m.brands.3@st.hanze.nl>
Co-authored-by: Bas Antonius de Jong <49651652+BAFGdeJong@users.noreply.github.com>
2025-12-02 11:25:22 +01:00
ramollia
0b750d5c0d Merge remote-tracking branch 'origin/Development' into Development
# Conflicts:
#	app/src/main/java/org/toop/app/view/views/GameView.java
2025-12-02 11:24:42 +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
c332033a06 Fixed old new EventFlow().listen() missing false as third param 2025-11-30 18:03:16 +01:00
lieght
3953762178 Removed loading widget from Server.java 2025-11-30 17:55:52 +01:00
Bas Antonius de Jong
12a20a224e Fix music display not working (#267)
* 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

* Replace deprecated with correct function
2025-11-30 17:51:52 +01:00
Bas Antonius de Jong
81740acd04 Debugs for EventBus and fixed unsubscribe all (#266)
* 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
2025-11-30 17:15:14 +01:00
Bas Antonius de Jong
25c02c7ad0 Fix eventbus problems (#265)
* 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
2025-11-30 14:22:05 +01:00
lieght
ec0ce4ea37 Added function input for enabling/disabling localization p/text 2025-11-29 12:23:17 +01:00
lieght
0ab071693f Removed views 2025-11-28 12:09:40 +01:00
Bas Antonius de Jong
1a11827ba3 Merge pull request #261 from 2OOP/Tutorials
merge tutorials to dev branch
2025-11-28 11:56:42 +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
ramollia
07f3319675 Merge remote-tracking branch 'origin/Development' into Development 2025-11-27 18:50:12 +01:00
0cb025edb9 Changed the way turns are being stored in TurnBasedGame. 2025-11-27 18:37:34 +01:00
6ea94fe658 Fixed compilation errors 2025-11-27 17:42:39 +01:00
ramollia
1dfa6a7c6e Merge remote-tracking branch 'origin/Development' into Development
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/canvas/ReversiCanvas.java
#	app/src/main/java/org/toop/app/game/ReversiGame.java
#	app/src/main/java/org/toop/app/game/TicTacToeGame.java
#	app/src/main/java/org/toop/app/view/displays/SongDisplay.java
#	app/src/main/java/org/toop/local/AppContext.java
2025-11-27 17:28:12 +01:00
tichohidding
ef5c1ce6e3 Merge pull request #241 from 2OOP/Widgets
Widgets into development
2025-11-27 17:19:30 +01:00
tichohidding
8c01c7fa7a Merge branch 'Development' into Widgets 2025-11-27 17:19:17 +01:00
144de5100e Revert "merge widgets with development"
This reverts commit 38681c5db0.
2025-11-27 16:58:54 +01:00
40ddf08e2d Revert "Merge remote-tracking branch 'origin/Development' into Development"
This reverts commit 59d46cb73c, reversing
changes made to 38681c5db0.
2025-11-27 16:58:51 +01:00
2936cc0b72 Revert "readd previous game thread code"
This reverts commit d24feef73e.
2025-11-27 16:58:47 +01:00
ramollia
d24feef73e readd previous game thread code 2025-11-27 16:53:58 +01:00
ramollia
59d46cb73c Merge remote-tracking branch 'origin/Development' into Development
# Conflicts:
#	app/src/main/java/org/toop/app/game/ReversiGame.java
#	app/src/main/java/org/toop/app/view/views/GameView.java
2025-11-27 15:58:22 +01:00