Commit Graph

227 Commits

Author SHA1 Message Date
Luca Conte 3c7d68109a Merge pull request 'fix ready' (#31) from game-end-stuff into main
Reviewed-on: #31
2024-12-23 22:22:00 +00:00
Luca Conte eaa5b64956 fix ready 2024-12-23 23:21:48 +01:00
Luca Conte 5b3ecb52bb Merge pull request 'add rotate instruction' (#30) from game-end-stuff into main
Reviewed-on: #30
2024-12-23 22:15:19 +00:00
Luca Conte 9ea176cc6d add rotate instruction 2024-12-23 23:15:04 +01:00
Luca Conte 7a706e1b73 Merge pull request 'game-end-stuff' (#29) from game-end-stuff into main
Reviewed-on: #29
2024-12-23 22:13:57 +00:00
Luca Conte 175241395e add docs to makefile 2024-12-23 23:13:11 +01:00
Luca Conte 1b08b39105 don't repaint fields after game end 2024-12-23 23:12:43 +01:00
Luca Conte 8dd697bb66 proper game closing 2024-12-23 23:04:16 +01:00
Luca Conte 30360c7bd4 Merge pull request 'kommentar-check' (#28) from kommentar-check into main
Reviewed-on: #28
2024-12-23 20:37:06 +00:00
Luca Conte 6f98a82a90 KOOMMMEEENTTAAAREEEEEEEE 2024-12-23 21:36:19 +01:00
Luca Conte a4cb3f68d5 Merge branch 'FH_Last_changes' into kommentar-check 2024-12-23 20:51:53 +01:00
eyFlorian 424dd2544e FUCK ME 2024-12-23 20:50:46 +01:00
Luca Conte 27157fb0a3 Merge pull request 'Add komentare' (#27) from ole into main
Reviewed-on: #27
2024-12-23 19:49:01 +00:00
Luca Conte 0fef0069f8 wtf 2024-12-23 20:48:51 +01:00
Luca Conte 5839b13980 Merge branch 'main' into ole 2024-12-23 20:47:40 +01:00
Luca Conte 0f42a66e4a Merge pull request 'lucasjoshua' (#26) from lucasjoshua into main
Reviewed-on: #26
2024-12-23 19:46:03 +00:00
Luca Conte c14f7d5bfe Merge branch 'main' into lucasjoshua 2024-12-23 20:44:31 +01:00
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
Joshua 678ed9d81e Got rid of some todos 2024-12-23 19:28:02 +01:00
Luca Conte be6b50739f Merge branch 'lucasjoshua' into wip-fix-ai-players 2024-12-23 19:05:24 +01:00
Joshua 458aa46638 Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua 2024-12-23 18:51:02 +01:00
Joshua be46f3587e Fixed semesterCounter for onlineGame. 2024-12-23 18:50:39 +01:00
Kaver 9c6d629357 fix Board halb 2024-12-23 18:41:10 +01:00
ole 70749c2c62 add Komentare 2024-12-23 18:36:15 +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