Commit Graph

234 Commits

Author SHA1 Message Date
Kaver 3b9b1eaebb Klasse fuer verbinden Panel erstellt(extrem grobes Beispiel) und Panel Weiterleitung eingefuegt
Anpassungen an ActionListenern in MainMenuView

Backbutton mit Funktion eingefuegt fuer joinGame Panel
2024-12-02 19:04:34 +01:00
Luca Conte addf542300 strip string before passing to handler 2024-11-30 18:43:04 +01:00
Luca Conte 1fb284eb1a add IAM Package 2024-11-30 18:40:04 +01:00
Luca Conte bdde2066f3 add getter and setter for name 2024-11-30 18:39:58 +01:00
Luca Conte ab1aae7798 add method to convert semester to board size 2024-11-30 18:39:41 +01:00
Luca Conte cecc44abf4 fix: remove board size from constructor 2024-11-30 18:28:05 +01:00
Luca Conte 998ff3d663 Merge branch 'networking' into networking-start-online-game 2024-11-30 18:16:27 +01:00
Luca Conte 2c6f9adf54 move board size out of player constructor 2024-11-30 18:15:07 +01:00
Luca Conte 3eeb4d25bd start online game 2024-11-30 17:58:24 +01:00
ole b1273e759d Merge remote-tracking branch 'origin/ole' into ole
# Conflicts:
#	src/OnlinePlayer.java
2024-11-30 17:15:51 +01:00
ole 6a4e157605 add: Network implementation 2024-11-30 17:09:44 +01:00
ole 22950cd155 add: Thread protection Player.java 2024-11-30 17:07:11 +01:00
ole 058d069ff2 change: all Points from java.awt.point too new Point.java 2024-11-30 17:06:25 +01:00
ole c2ca83c718 chore: remove all unjust imports 2024-11-30 17:04:29 +01:00
ole 5a48e7e0a9 Merge branch 'networking' into ole 2024-11-30 14:17:54 +01:00
Luca Conte 8bc64bd9ba move joined logic out of if statement 2024-11-30 14:14:29 +01:00
Luca Conte ff9ffbd628 sleep first in loop to avoid skipping sleep with continue 2024-11-30 14:13:15 +01:00
Luca Conte 7303f49d0d avoid nulls 2024-11-30 14:13:01 +01:00
ole 48a5958414 add Thread safety for Player 2024-11-30 13:48:50 +01:00
Luca Conte c92b3b3551 networking basis 2024-11-30 13:45:06 +01:00
Ole Wachtel a381c8d660 add OnlinePlayer Konstructer 2024-11-30 13:25:42 +01:00
Luca Conte d425e64fa0 Merge pull request 'hotfixes - so we can at least run it' (#9) from hotfixes into main
Reviewed-on: #9
2024-11-27 12:01:15 +00:00
Luca Conte b2a26c1f81 fix compiler errors 2024-11-27 13:00:18 +01:00
Luca Conte 73add1442b fix class names 2024-11-27 13:00:05 +01:00
Luca Conte 11c7dda19b fix deprecated function calls 2024-11-27 12:59:55 +01:00
Joshua 2274a1e558 Created GameBoard.
Added showPanel methods to pass parameters between methods.
2024-11-26 17:15:21 +01:00
alexy f3d56b37c7 Merge pull request 'Schiffe setzen Validierung hinzugefuegt' (#8) from oleFundF into main
Reviewed-on: #8
Reviewed-by: flo <florian.hantzschel@stud.hs-hannover.de>
2024-11-26 16:00:08 +00:00
FlorianAlexy c8b3f4f2db Schiffe setzen Validierung hinzugefuegt
Florian und Florian haben eine schoene Validierung zum setzen der Position eines Schiffes hinzugefuegt.
2024-11-26 16:43:25 +01:00
Kaver 88d016ed99 Umstrukturierung von MainFrame, sodass beim druecken eines Buttons parameter an die Funktion uebergeben werden welche das naechste Panel stellt (showPanelExtra) 2024-11-26 16:43:14 +01:00
Kaver 5cabd5325a Umstrukturierung von MainFrame, sodass beim druecken eines Buttons parameter an die Funktion uebergeben werden welche das naechste Panel stellt (showPanelExtra) 2024-11-26 16:42:00 +01:00
Luca Conte ec789dd562 Merge pull request 'ole' (#7) from ole into main
Reviewed-on: #7
Reviewed-by: lgc <main@lugico.de>
2024-11-26 14:01:01 +00:00
ole d00e12e72f Merge remote-tracking branch 'origin/lucasjoshua' into ole
# Conflicts:
#	src/HalloSchiffeVersenken.java
2024-11-26 14:56:19 +01:00
Joshua 1fc1abee3a Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua 2024-11-26 14:14:43 +01:00
Joshua 3d557361ee Implemented coinToss(still incomplete) 2024-11-26 14:13:14 +01:00
eyFlorian aaa9d57f68 Easy/MediumAI
Haben eine sehr einfache und Medium KI hinzugefügt. F&F

Fragenaufwerfende Methoden:

https://cdn.discordapp.com/attachments/1296860613212897413/1310209916325068894/WhatsApp_Bild_2024-11-24_um_12.31.02_fb836c3d.jpg?ex=67446392&is=67431212&hm=82f37b83dc5e711622abb43abe51edd62833450dddf91ed524991da6d0981f38&
2024-11-24 12:47:45 +01:00
Kaver ea6a1c9804 grobe Weiterleitung fuer startMultiplayerGame an Spiel beitreten/Spiel erstellen eingefügt 2024-11-19 18:33:05 +01:00
Joshua 737e485773 Implemented coinToss(still incomplete) 2024-11-19 17:37:16 +01:00
Joshua 6ef3b38dd5 Implemented CardLayout into startMultiplayerGame, startLocalGame, MainMenuView. Implemented MainFrame. 2024-11-19 17:08:59 +01:00
Joshua 8069315c15 Implemented CardLayout into startMultiplayerGame, startLocalGame, MainMenuView. Implemented MainFrame. 2024-11-19 16:25:52 +01:00
Kaver a84110a8a8 Panellogik neu gemacht und dementsprechend views angepasst 2024-11-19 15:41:45 +01:00
Joshua 607004a3b3 Added test classes for CardLayout and GameBoard.java 2024-11-19 14:24:09 +01:00
Kaver d95df0cf5f Minimale Anpassung an Actionlistener fuer MainMenu zu LocalGame 2024-11-19 13:39:43 +01:00
Kaver 5bedfddc60 Erste Anpassungen an Multiplayermenu (sehr grob)
diverse alte ungenutzte Methoden entfernt
2024-11-18 18:20:48 +01:00
Joshua f7326a57d9 Added coinToss.java, first attempts integrating cardlayout in startLocalGame.java and startMultiplayerGame.java 2024-11-16 15:26:52 +01:00
Kaver a11885c76d Transission von Main zu MultiMenu angepasst
Panels eingeführt anstatt neue Frames zu öffnen
MainmenuController angepasst
2024-11-15 18:34:05 +01:00
Joshua fe942ab660 Continued work on startLocalGame and started work startMultiplayerGame 2024-11-15 18:18:28 +01:00
Joshua 15d5a67c38 Continued work on startLocalGame and started work startMultiplayerGame 2024-11-15 18:18:21 +01:00
ole ce4995fb94 add Shoot logik and Structure for backend 2024-11-15 17:35:35 +01:00
Joshua 016ef2a317 Test 2024-11-15 16:26:30 +01:00
Kaver 393984343c Grafiken in graphics Ordner verschoben 2024-11-15 16:24:38 +01:00