Commit Graph

206 Commits

Author SHA1 Message Date
Luca Conte f13e0ab2ba Merge pull request 'Kommentare und Withdraw' (#24) from FH_Last_changes into main
Reviewed-on: #24
2024-12-23 19:39:53 +00:00
Luca Conte e85f151b33 a bit cleaner withdraw 2024-12-23 20:28:06 +01:00
Luca Conte 7fb19bfeac Merge branch 'main' into FH_Last_changes 2024-12-23 20:17:51 +01:00
Luca Conte 9ed0dc1e9e Merge pull request 'wip-fix-ai-players' (#25) from wip-fix-ai-players into main
Reviewed-on: #25
2024-12-23 19:14:59 +00:00
Luca Conte 9d51e708e5 remove game board on win or lose 2024-12-23 20:13:52 +01:00
Luca Conte 44f04a454f proper thread killing and online player myTurn handling 2024-12-23 20:02:11 +01:00
Luca Conte be6b50739f Merge branch 'lucasjoshua' into wip-fix-ai-players 2024-12-23 19:05:24 +01:00
Kaver 9c6d629357 fix Board halb 2024-12-23 18:41:10 +01:00
Joshua 3ad7233383 JoinGame now calls GameController.startOnlineGame(...) correctly. 2024-12-23 18:35:22 +01:00
Joshua 529178f4db Updated backButton.png. 2024-12-23 18:08:40 +01:00
eyFlorian 4045d3ce7b Kommentare und Withdraw 2024-12-23 15:28:33 +01:00
Luca Conte d97826db6c Merge pull request 'die letzten javadoc kommentare' (#23) from cleanup-work into main
Reviewed-on: #23
2024-12-22 23:29:12 +00:00
Luca Conte 2cce52b827 die letzten javadoc kommentare 2024-12-23 00:28:55 +01:00
Luca Conte f73114eaeb Merge pull request 'cleanup-work' (#22) from cleanup-work into main
Reviewed-on: #22
2024-12-22 23:06:00 +00:00
Luca Conte 931a757a67 Merge branch 'main' into cleanup-work 2024-12-23 00:05:49 +01:00
Luca Conte 8b4b017e85 MORE javadoc 2024-12-23 00:03:54 +01:00
Luca Conte 6909b9417f FINALLY FIX THE INDENTATION REEEE 2024-12-23 00:03:46 +01:00
flo 29d4118d8f Merge pull request 'AiPlayer Kommentare hinzugefügt' (#21) from FH_Fixes into main
Reviewed-on: #21
Reviewed-by: lgc <main@lugico.de>
2024-12-22 22:36:39 +00:00
Kaver 0cea473146 smol jdoc changes 2024-12-22 23:17:52 +01:00
eyFlorian a4bfe5eb5f KI HART Orientierung
Harte Ki Orientiert sich an der Orientierung um sich zu Orientieren und unnötige Schüsse zu vermeiden.
2024-12-22 16:15:11 +01:00
Kaver 1e58626e6f jdoc 2024-12-22 00:02:03 +01:00
eyFlorian 9d62e74877 AiPlayer Kommentare hinzugefügt
Bitte nicht schlagen. Kommentare sind drin. Kommentiert ja, High Quality Kommentare nein (._.) Bitte nicht schlagen.
2024-12-21 21:11:21 +01:00
Joshua 8933a40d53 Changed the color of ships to white, as to make AI ships invisible. 2024-12-21 16:54:08 +01:00
Joshua cb9b110621 Added and integrated new sounds.
Added standardPort to be default value of port field.
2024-12-21 16:26:10 +01:00
Kaver 4dd1c9b39b Code aufräumen und kleine Anpassungen/Korrekturen vorgenommen 2024-12-20 19:39:56 +01:00
Luca Conte a3827d6bd0 add metric shit ton of javadoc comments 2024-12-20 18:29:49 +01:00
Luca Conte b7215db6d9 destroy players on game end 2024-12-20 17:57:50 +01:00
Luca Conte 7f610b4a90 Merge branch 'ole' into cleanup-work 2024-12-20 17:56:41 +01:00
Luca Conte 65451d6912 destroy for AI Player 2024-12-20 17:55:38 +01:00
ole bfb25dfe2c disable testButton 2024-12-20 17:32:53 +01:00
ole 3370975e57 change parameta from showPanelWin and loos to check the request 2024-12-20 17:31:32 +01:00
Luca Conte 20732e730c some cleanup 2024-12-20 17:31:16 +01:00
ole f4cf28f4bf add endScreen machanic 2024-12-20 17:30:21 +01:00
ole 7ef04711c3 add getter for Player 1 2024-12-20 17:29:37 +01:00
Luca Conte fdd2e6d2f1 Merge pull request 'lucasjoshua' (#20) from lucasjoshua into main
Reviewed-on: #20
2024-12-20 16:08:05 +00:00
Luca Conte 31e4d91baf Merge pull request 'FloA' (#19) from FloA into main
Reviewed-on: #19
2024-12-20 15:59:51 +00:00
FlorianAlexy 3c03e63899 Hard AI Verbesserung
besser aber nicht perfekt
2024-12-19 17:42:48 +01:00
Luca Conte f7d2e14196 game start fixes & AI Player Names 2024-12-19 17:23:45 +01:00
FlorianAlexy 8e4a516e2c smol fix
:3
2024-12-19 16:44:07 +01:00
Kaver e27b852c14 Kleine JavaDoc Anpassungen 2024-12-18 18:39:19 +01:00
Joshua 15c23c1f2c Added final TODOs 2024-12-17 17:21:59 +01:00
Kaver 0b2ee88316 mini Anpassungen 2024-12-17 17:13:40 +01:00
Joshua 42fc341608 Added more Javadoc (TODOs) comments. 2024-12-17 16:42:50 +01:00
Kaver 10e5a8ef5e WinScreen und LooseScreen erstellt zzgl. Methoden in MainFrame für Aufrufen aus dem Backend.
Diverse Javadoc Kommentaren hinzugefügt und alte nicht mehr Gebraucht Klassen entfernt.
Viel Code aufgeräumt
2024-12-17 16:30:05 +01:00
Joshua 1f04760f6a Added more Javadoc (TODOs) comments.
Added new sound.
temporarily disabled sound when hitting/sinking ships (buggy)
2024-12-17 15:58:05 +01:00
Joshua db2b0532bc Added more Javadoc (TODOs) comments. 2024-12-17 14:34:03 +01:00
Joshua 8c953a1f2b Added Javadoc comments to all FrontEnd classes.
Added functionality to mute button.
Added "//" comments to all Actionlisteners.
Added "Todo" where there is still need for something
2024-12-17 09:19:52 +01:00
Joshua 626ae041e5 Added 3 more sounds. Added function calls to test sounds, some still untested 2024-12-15 18:55:45 +01:00
Joshua f5a0f8c9fe Merge remote-tracking branch 'origin/main' into lucasjoshua 2024-12-15 17:17:39 +01:00
Joshua f1adf06035 Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua 2024-12-15 16:56:20 +01:00