stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 19:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
225 Commits 8 Branches 1 Tag
af9da9342134e8d3944b7ce87c73d852d5ee4f77
Commit Graph

55 Commits

Author SHA1 Message Date
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 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
lieght
395dc8c603 Merge branch 'Ticho' of github.com:2OOP/pism_ttt into Ticho 
# Conflicts:
#	src/main/java/org/toop/Main.java
#	src/main/java/org/toop/eventbus/Events.java
#	src/main/java/org/toop/game/TTT.java
#	src/main/resources/log4j2.xml
 2025-09-17 19:47:04 +02:00
lieght
a056171644 Rebased 2025-09-17 19:39:08 +02:00
Ticho Hidding
e906e812fa Added GUI with swift. 2025-09-17 19:28:04 +02:00
lieght
82fd67d351 removed unecessary import 2025-09-17 18:36:48 +02:00
lieght
61264a9b43 Moved disable and enable logging to dedicated class, removed unecessary imports 2025-09-17 17:48:22 +02:00
lieght
4c0e70fc1f removed unused imports 2025-09-17 17:45:10 +02:00
lieght
23e0ee6c62 Added a quick function to disable logs 2025-09-17 17:44:50 +02:00
lieght
38ea15738c Fixed ai naming 2025-09-17 17:35:00 +02:00
lieght
17a3827ef0 Removed unecessary space 2025-09-17 17:20:00 +02:00
lieght
0d4472c814 Documentation added for server events 2025-09-17 17:19:29 +02:00
Ticho Hidding
ef80baae5c Added GUI with swift. 2025-09-17 17:17:21 +02:00
lieght
4378852394 Created event for ReceivedMessage from connection 2025-09-17 16:52:47 +02:00
lieght
867eddb0ff Easier to read log pattern 2025-09-17 16:51:56 +02:00
lieght
49b9d5a87c Fixed .idea 2025-09-17 16:02:41 +02:00
lieght
620e98d29e Renamed command to SendCommand 2025-09-17 16:02:02 +02:00
lieght
4671885ad7 Fixed OMAR's neuk manoeuvre 2025-09-17 15:59:25 +02:00
lieght
6fe4239eb7 readded .idea 2025-09-17 15:52:33 +02:00
ramollia
5a8840a789 fix: some small issues 2025-09-17 15:42:39 +02:00
Bas Antonius de Jong
34401dd35f AI TTT merge to ServerManager branche (#24) 
* AI made and also a minor change to core board

* Minor changes to the AI, Gamebase changed a little to make some stuff public for usability, TTT changed a few things to public too and making the tests for the AI

* New test on the AI

* fixed some questionable styling in my code

* fixed some questionable styling in omar's code!

* fixed some questionable styling in omar's code! v2

* Update src/main/java/org/toop/game/MinMaxTTT.java

* Wrong value, was 9x9 grid, is now 3x3 grid

---------

Co-authored-by: michiel <m.brands.3@st.hanze.nl>
 2025-09-15 20:12:25 +02:00