Commit Graph

Select branches

Hide Pull Requests

FH_Fixes

FH_Last_changes

FloA

Kronjuwild

game-end-stuff

jar

kommentar-check

lucas

lucasjoshua

main

ole

oleFundF

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#4

#5

#6

#7

#8

#9

Mono Color

• 06cc025fda fix images jar ole 2024-12-23 23:38:16 +0100
• 6b0aa04b25 Merge branch 'main' into jar ole 2024-12-23 23:26:46 +0100
• c2700c1574 fix images ole 2024-12-23 23:23:23 +0100
• 3c7d68109a Merge pull request 'fix ready' (#31) from game-end-stuff into main main Luca Conte 2024-12-23 22:22:00 +0000
• eaa5b64956 fix ready game-end-stuff Luca Conte 2024-12-23 23:21:48 +0100
• 8e6b6c147e Merge branch 'main' into jar ole 2024-12-23 23:15:52 +0100
• 5b3ecb52bb Merge pull request 'add rotate instruction' (#30) from game-end-stuff into main Luca Conte 2024-12-23 22:15:19 +0000
• 9ea176cc6d add rotate instruction Luca Conte 2024-12-23 23:15:04 +0100
• c88991e5a1 Merge branch 'main' into jar ole 2024-12-23 23:14:42 +0100
• 7a706e1b73 Merge pull request 'game-end-stuff' (#29) from game-end-stuff into main Luca Conte 2024-12-23 22:13:57 +0000
• 175241395e add docs to makefile Luca Conte 2024-12-23 23:12:48 +0100
• 1b08b39105 don't repaint fields after game end Luca Conte 2024-12-23 23:12:43 +0100
• 8dd697bb66 proper game closing Luca Conte 2024-12-23 23:04:16 +0100
• 2cb7ee7ee1 fix sound ole 2024-12-23 22:19:58 +0100
• 1f4d7ef4b1 changes für jar generation ole 2024-12-23 22:05:39 +0100
• 30360c7bd4 Merge pull request 'kommentar-check' (#28) from kommentar-check into main Luca Conte 2024-12-23 20:37:06 +0000
• 6f98a82a90 KOOMMMEEENTTAAAREEEEEEEE kommentar-check Luca Conte 2024-12-23 21:36:19 +0100
• a4cb3f68d5 Merge branch 'FH_Last_changes' into kommentar-check Luca Conte 2024-12-23 20:51:53 +0100
• 424dd2544e FUCK ME FH_Last_changes eyFlorian 2024-12-23 20:50:46 +0100
• 27157fb0a3 Merge pull request 'Add komentare' (#27) from ole into main Luca Conte 2024-12-23 19:49:01 +0000
• 0fef0069f8 wtf ole Luca Conte 2024-12-23 20:48:51 +0100
• 5839b13980 Merge branch 'main' into ole Luca Conte 2024-12-23 20:47:40 +0100
• 0f42a66e4a Merge pull request 'lucasjoshua' (#26) from lucasjoshua into main Luca Conte 2024-12-23 19:46:03 +0000
• c14f7d5bfe Merge branch 'main' into lucasjoshua lucasjoshua Luca Conte 2024-12-23 20:44:31 +0100
• f13e0ab2ba Merge pull request 'Kommentare und Withdraw' (#24) from FH_Last_changes into main Luca Conte 2024-12-23 19:39:53 +0000
• e85f151b33 a bit cleaner withdraw Luca Conte 2024-12-23 20:28:06 +0100
• 7fb19bfeac Merge branch 'main' into FH_Last_changes Luca Conte 2024-12-23 20:17:51 +0100
• 9ed0dc1e9e Merge pull request 'wip-fix-ai-players' (#25) from wip-fix-ai-players into main Luca Conte 2024-12-23 19:14:59 +0000
• 9d51e708e5 remove game board on win or lose Luca Conte 2024-12-23 20:13:52 +0100
• 44f04a454f proper thread killing and online player myTurn handling Luca Conte 2024-12-23 20:02:11 +0100
• 678ed9d81e Got rid of some todos Joshua 2024-12-23 19:28:02 +0100
• be6b50739f Merge branch 'lucasjoshua' into wip-fix-ai-players Luca Conte 2024-12-23 19:05:24 +0100
• 458aa46638 Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua Joshua 2024-12-23 18:51:02 +0100
• be46f3587e Fixed semesterCounter for onlineGame. Joshua 2024-12-23 18:50:39 +0100
• 9c6d629357 fix Board halb Kaver 2024-12-23 18:41:10 +0100
• 70749c2c62 add Komentare ole 2024-12-23 18:36:15 +0100
• 3ad7233383 JoinGame now calls GameController.startOnlineGame(...) correctly. Joshua 2024-12-23 18:35:22 +0100
• 529178f4db Updated backButton.png. Joshua 2024-12-23 18:08:40 +0100
• 4045d3ce7b Kommentare und Withdraw eyFlorian 2024-12-23 15:28:33 +0100
• d97826db6c Merge pull request 'die letzten javadoc kommentare' (#23) from cleanup-work into main Luca Conte 2024-12-22 23:29:12 +0000
• 2cce52b827 die letzten javadoc kommentare Luca Conte 2024-12-23 00:28:55 +0100
• f73114eaeb Merge pull request 'cleanup-work' (#22) from cleanup-work into main Luca Conte 2024-12-22 23:06:00 +0000
• 931a757a67 Merge branch 'main' into cleanup-work Luca Conte 2024-12-23 00:05:49 +0100
• 8b4b017e85 MORE javadoc Luca Conte 2024-12-23 00:03:54 +0100
• 6909b9417f FINALLY FIX THE INDENTATION REEEE Luca Conte 2024-12-23 00:03:46 +0100
• 29d4118d8f Merge pull request 'AiPlayer Kommentare hinzugefügt' (#21) from FH_Fixes into main flo 2024-12-22 22:36:39 +0000
• 0cea473146 smol jdoc changes Kaver 2024-12-22 23:17:52 +0100
• a4bfe5eb5f KI HART Orientierung FH_Fixes eyFlorian 2024-12-22 16:15:11 +0100
• 1e58626e6f jdoc Kaver 2024-12-22 00:02:03 +0100
• 9d62e74877 AiPlayer Kommentare hinzugefügt eyFlorian 2024-12-21 21:11:21 +0100
• 8933a40d53 Changed the color of ships to white, as to make AI ships invisible. Joshua 2024-12-21 16:54:08 +0100
• cb9b110621 Added and integrated new sounds. Added standardPort to be default value of port field. Joshua 2024-12-21 16:26:10 +0100
• 4dd1c9b39b Code aufräumen und kleine Anpassungen/Korrekturen vorgenommen Kaver 2024-12-20 19:39:56 +0100
• a3827d6bd0 add metric shit ton of javadoc comments Luca Conte 2024-12-20 18:29:49 +0100
• b7215db6d9 destroy players on game end Luca Conte 2024-12-20 17:57:50 +0100
• 7f610b4a90 Merge branch 'ole' into cleanup-work Luca Conte 2024-12-20 17:56:41 +0100
• 65451d6912 destroy for AI Player Luca Conte 2024-12-20 17:55:38 +0100
• bfb25dfe2c disable testButton ole 2024-12-20 17:32:53 +0100
• 3370975e57 change parameta from showPanelWin and loos to check the request ole 2024-12-20 17:31:32 +0100
• 20732e730c some cleanup Luca Conte 2024-12-20 17:31:16 +0100
• f4cf28f4bf add endScreen machanic ole 2024-12-20 17:30:21 +0100
• 7ef04711c3 add getter for Player 1 ole 2024-12-20 17:29:37 +0100
• fdd2e6d2f1 Merge pull request 'lucasjoshua' (#20) from lucasjoshua into main Luca Conte 2024-12-20 16:08:05 +0000
• 31e4d91baf Merge pull request 'FloA' (#19) from FloA into main Luca Conte 2024-12-20 15:59:51 +0000
• 3c03e63899 Hard AI Verbesserung FloA FlorianAlexy 2024-12-19 17:42:48 +0100
• f7d2e14196 game start fixes & AI Player Names Luca Conte 2024-12-19 17:23:45 +0100
• 8e4a516e2c smol fix FlorianAlexy 2024-12-19 16:44:07 +0100
• e27b852c14 Kleine JavaDoc Anpassungen Kaver 2024-12-18 18:39:19 +0100
• 15c23c1f2c Added final TODOs Joshua 2024-12-17 17:21:59 +0100
• 0b2ee88316 mini Anpassungen Kaver 2024-12-17 17:13:40 +0100
• 42fc341608 Added more Javadoc (TODOs) comments. Joshua 2024-12-17 16:42:50 +0100
• 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 Kaver 2024-12-17 16:30:05 +0100
• 1f04760f6a Added more Javadoc (TODOs) comments. Added new sound. temporarily disabled sound when hitting/sinking ships (buggy) Joshua 2024-12-17 15:58:05 +0100
• db2b0532bc Added more Javadoc (TODOs) comments. Joshua 2024-12-17 14:34:03 +0100
• 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 Joshua 2024-12-17 09:19:52 +0100
• 626ae041e5 Added 3 more sounds. Added function calls to test sounds, some still untested Joshua 2024-12-15 18:55:45 +0100
• f5a0f8c9fe Merge remote-tracking branch 'origin/main' into lucasjoshua Joshua 2024-12-15 17:17:39 +0100
• f1adf06035 Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua Joshua 2024-12-15 16:56:20 +0100
• e0748ceff9 Small Stuff Joshua 2024-12-15 16:55:59 +0100
• 0935c3bcb7 WinLoose grob erstellt Kaver 2024-12-15 16:55:29 +0100
• 78f6dd01f9 Merge pull request 'display improvements' (#18) from pewpew into main Luca Conte 2024-12-15 15:54:33 +0000
• ec35646dab display improvements Luca Conte 2024-12-15 16:54:04 +0100
• d8804d5369 Added TODO for frontend Joshua 2024-12-15 16:17:02 +0100
• 6857df94e0 Merge pull request 'pewpew' (#17) from pewpew into main Luca Conte 2024-12-15 15:08:21 +0000
• d7637e1e51 Merge branch 'main' into pewpew Luca Conte 2024-12-15 16:05:09 +0100
• 7b80e3dfd3 Merge pull request 'lucasjoshua' (#16) from lucasjoshua into main Luca Conte 2024-12-15 15:02:32 +0000
• 37a984772c Javadoc Kommentare erweitert in BoardDisplay Kaver 2024-12-15 16:01:52 +0100
• c0f22cec6e Cleaned up code Joshua 2024-12-15 16:01:11 +0100
• d9a93952d2 PEW PEW Luca Conte 2024-12-15 15:59:26 +0100
• ad61fcecb7 Anpasung an paintFields, sodass preview unterscheidet, ob setzen von Schiff valide ist Kaver 2024-12-15 15:51:32 +0100
• b4f1de82bd Preview des setzen von Schiffen Kaver 2024-12-15 15:25:53 +0100
• 60e44f2e1a add getVirtualOccupiedPoints Luca Conte 2024-12-15 15:10:20 +0100
• 7605646b80 Action Listener Update fuer BoardDisplay Kaver 2024-12-15 14:51:40 +0100
• 5be3f4daf3 Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua Kaver 2024-12-15 14:44:41 +0100
• 0391b3265a Merge pull request 'fix horizontal' (#15) from lucasjoshua into main Luca Conte 2024-12-15 13:42:34 +0000
• 864ca20e18 fix horizontal Luca Conte 2024-12-15 14:42:18 +0100
• 9e07350f7d Merge pull request 'lucasjoshua' (#14) from lucasjoshua into main Luca Conte 2024-12-15 13:27:15 +0000
• b5f1151a4f add checkValidShipPlacement and set horizontal in setPosition Luca Conte 2024-12-15 14:26:42 +0100
• f565708461 implement ready for players and board refresh method Luca Conte 2024-12-15 14:21:17 +0100
• 970550308b Fixed showing Player names in GameBoard. Added functionality to Button coloring (when selected, placed etc.) Joshua 2024-12-15 13:48:01 +0100