Commit Graph

547 Commits

Author SHA1 Message Date
lieght
ad7831b0e1 Tutorials fixed 2025-12-06 21:22:45 +01:00
lieght
4ef0d53d3c Managers now have changeable eventbus 2025-12-06 21:14:58 +01:00
lieght
ea82ccae45 Suppress 2025-12-06 20:47:17 +01:00
lieght
990cf1675c Made events and handlers more generic 2025-12-06 20:22:04 +01:00
lieght
d91e3a7457 Logging errors 2025-12-06 17:50:19 +01:00
lieght
fd357fd27d Can now test the event bus, created testable interfaces 2025-12-06 17:26:00 +01:00
lieght
816a0b953e Escape can't be opened in mainview now 2025-12-06 15:11:23 +01:00
lieght
b0c7c74346 Tutorials moved to escape menu 2025-12-06 15:04:07 +01:00
lieght
ea179eb0e2 Added find functionality 2025-12-05 12:28:06 +01:00
lieght
61f03fab26 Working escape menu 2025-12-04 22:42:39 +01:00
lieght
2fbda6f14d Escape remove popup 2025-12-04 22:14:58 +01:00
ramollia
0d564283fb fixed redundant container 2025-12-04 21:52:22 +01:00
lieght
f24ca88246 Escape popup 2025-12-04 21:47:51 +01:00
ramollia
c8e2c3747e fixed getAllWidgets 2025-12-04 21:26:03 +01:00
ramollia
8849515af6 made the game text a header instead 2025-12-04 21:09:36 +01:00
ramollia
1b2733c0be localize the ChallengePopup text 2025-12-04 21:07:49 +01:00
lieght
f205669b41 Popups now remove themselves 2025-12-04 20:54:28 +01:00
lieght
4608135ee5 Challenge popups "Fixed" 2025-12-04 20:46:59 +01:00
lieght
27a35c8117 Removed todo 2025-12-04 20:10:24 +01:00
lieght
b1224ba6af Fixt wrong view order 2025-12-04 19:26:01 +01:00
ramollia
a7b9484aa4 fixed incorrect index counting 2025-12-04 18:28:25 +01:00
ramollia
75c4e55da6 added removeIndexFromPreviousChain 2025-12-04 18:10:25 +01:00
ramollia
d5223c6cd1 added replacePrevious in ViewWidget 2025-12-04 17:49:23 +01:00
lieght
730bd5c3dc Merge remote-tracking branch 'origin/UI-Updates' into UI-Updates 2025-12-04 17:16:16 +01:00
lieght
296641b82e Correct back view 2025-12-04 17:16:00 +01:00
ramollia
8dccabe37b added getAllWidgets to WidgetContainer 2025-12-04 17:15:59 +01:00
ramollia
dd73d1810a Merge remote-tracking branch 'origin/UI-Updates' into UI-Updates 2025-12-04 17:02:33 +01:00
ramollia
e2be973c9a changed the transitionNextCustom to be easier to use 2025-12-04 17:02:12 +01:00
lieght
75af655b49 Changed to debug instead of info 2025-12-04 16:51:32 +01:00
lieght
c6d95479af Merge remote-tracking branch 'origin/Development' into UI-Updates 2025-12-04 16:49:11 +01:00
ramollia
72d5989d24 fixed overlapping back and disconnect buttons 2025-12-04 16:06:43 +01:00
michiel
4ea458c92e depth + thinktime back to AIs, along with a a specific TicTacToeAIRSleep 2025-12-04 15:11:41 +01:00
michiel
134c9a2fd8 better human/ai selector with bot selection and depth on TicTacToeAIR 2025-12-04 14:31:04 +01:00
lieght
f60df73b66 Loading circle, better loading colors. 2025-12-03 23:55:12 +01:00
michiel301b
a00d25f24a smalle fixes aan turn updates 2025-12-03 23:16:03 +01:00
michiel301b
406ad713f4 turn updates 2025-12-03 22:47:17 +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
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
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
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