Commit Graph

57 Commits

Author SHA1 Message Date
Luca Conte 11c7dda19b fix deprecated function calls 2024-11-27 12:59:55 +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
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
Joshua 95a9efa772 Seperated code (comments) 2024-11-14 17:58:52 +01:00
ole 22937ab45d Merge pull request 'Kronjuwild' (#6) from Kronjuwild into main
Reviewed-on: #6
Reviewed-by: ole <git@peer-ole.de>
2024-11-14 16:23:21 +00:00
Joshua c8528a6b58 Merge remote-tracking branch 'origin/main' into Kronjuwild 2024-11-14 17:14:13 +01:00
Joshua edfa942830 Merge remote-tracking branch 'origin/lucas' into Kronjuwild
# Conflicts:
#	src/HalloSchiffeVersenken.java
2024-11-14 17:13:32 +01:00
Joshua 23315ffdb1 added 3 graphics 2024-11-14 17:09:54 +01:00
Kaver 5f6d5b426d Erstellen von MVC für MultiPlayerMenu, anpassen von Controller und View des MainMenu.
Fensterwechsel eingefügt, bessere Idee wird die Tage implementiert
2024-11-14 13:26:37 +01:00
Luca Conte b9a0a21503 fix some player stuff 2024-11-12 15:18:16 +01:00
Ole Wachtel 579ce9831d Merge branch 'FF24' into ole 2024-11-12 15:06:33 +01:00
Luca Conte 2e8d2f5465 Merge pull request 'add Sound in to Thread' (#5) from ole into main
Reviewed-on: #5
Reviewed-by: lgc <main@lugico.de>
2024-11-12 14:00:34 +00:00
Luca Conte c9c7866c4c add library 2024-11-12 14:57:06 +01:00
Luca Conte 26e27730db add libs to gitignore 2024-11-12 14:43:03 +01:00
Luca Conte eca1b0168d add makefile 2024-11-12 14:42:20 +01:00
Ole Wachtel 0ae3c62215 change path from sound 2024-11-12 14:37:07 +01:00
Joshua 238f5b7f2c Continued development of class "startLocalGame" 2024-11-05 17:53:08 +01:00
Kaver d95b467f72 Diverse Anpassungen an View und Controller vorgenommen
Hintergrundbild hinzugefuegt sowie sound button der sich on action
verändert
2024-11-05 17:40:21 +01:00
Joshua d2b33e8676 Added folder "graphics" and content. 2024-11-05 16:00:14 +01:00
Kaver 3005d6ca0d MainMenu aufgeteilt nach Model View Controller Prinzip 2024-11-05 15:51:21 +01:00
Joshua e679d1ef8e Added folder "graphics" and content. 2024-11-05 15:40:48 +01:00
eyFlorian 8ae51f6316 Locales Spiel Initialisierung
Florian und Florian Haben 3 Stunden an diesem kack gearbeitet.
Player, AiPlayer und jeweils die Boards wurden erstellt und Initialisiert.
Erweiterung zu Hitresponse /- type für die Board.
2024-11-03 12:39:19 +01:00
Kaver 372a29698a Basic main menu changes
disable sound test in "HalloSchiffeVersenken"
2024-10-29 18:58:48 +01:00
Joshua f798125ced Added new class "startLocalGame.java" containing first UI code 2024-10-29 18:56:20 +01:00
Kaver d1f9ff5984 testweise main menue erstellt 2024-10-29 17:17:06 +01:00
Ole Wachtel 521f6a578f add Sound in to Thread 2024-10-29 14:34:57 +01:00
Luca Conte a7558e67f9 Merge pull request 'fix projet struktur' (#4) from ole into main
Reviewed-on: #4
Reviewed-by: lgc <main@lugico.de>
2024-10-29 13:34:05 +00:00
Ole Wachtel 810ffe7c5f fix projet struktur 2024-10-29 13:46:13 +01:00
Luca Conte 68999b3464 Merge pull request 'add Java Project' (#2) from ole into main
Reviewed-on: #2
Reviewed-by: lgc <main@lugico.de>
2024-10-29 11:49:50 +00:00
Ole Wachtel 9a661633b9 fix sound path 2024-10-29 12:46:38 +01:00