Commit Graph

Select branches

Hide Pull Requests

Testhandbuch

b_Mueller_Tamino

b_Schmelz_Johannes

b_malkmus_dennis

b_puderbach_luca

b_schmelz_johannes

b_schmidt_yvonne

b_szepielewicz_filip

b_wilkening_simon

client_logic

connect

gui

logic

main

revert-71a4ac8d

revert-f248a77c

Mono Color

• 2dd70c10b5 Server checks imported map for invalid placements Yvonne Schmidt 2024-10-07 01:23:52 +0200
• 6475b63a22 fixed incorrect remove function and corrected a mistake during the initiation of a game over state Yvonne Schmidt 2024-10-06 14:52:33 +0200
• 98dea36368 added backroundsound Filip Szepielewicz 2024-10-13 11:24:13 +0200
• 21fc46f9c5 Added background music for everything Simon Wilkening 2024-10-13 04:32:33 +0200
• dc52cf4f32 Added boat model for 3x1 boats Simon Wilkening 2024-10-12 21:35:55 +0200
• c339f3fc9d Added boat model for 2x1 boats Simon Wilkening 2024-10-12 21:16:13 +0200
• de0b2a4054 Added boat model for 1x1 boats Simon Wilkening 2024-10-12 20:41:35 +0200
• 67e4c1e805 Added map6 with missing ship Simon Wilkening 2024-10-12 16:54:39 +0200
• 0a66d3cbfd Added map5 ignoring zoc Simon Wilkening 2024-10-12 16:50:25 +0200
• 30d129735c Added map3 with ship out of map Added map4 with ship colliding each other Simon Wilkening 2024-10-12 16:29:53 +0200
• 5f91ce0947 Server site map loading validation Simon Wilkening 2024-10-12 16:27:38 +0200
• fae747e504 Server site map loading validation Simon Wilkening 2024-10-12 15:51:44 +0200
• cd50358181 Update 2 files Filip Szepielewicz 2024-10-11 23:39:09 +0000
• 1740988629 added a miss effect Johannes Schmelz 2024-10-11 16:00:15 +0200
• 2192f6dbc3 fixed sizes of the boats Tamino Mueller 2024-10-11 10:22:17 +0200
• 2b8bfb82ba added last boat und finished task 9 Tamino Mueller 2024-10-11 02:47:38 +0200
• 70ed981ea2 added boat with length 1 and 3 Tamino Mueller 2024-10-11 02:23:59 +0200
• d5450df77c added alienboat Tamino Mueller 2024-10-11 01:39:25 +0200
• ae41ec4007 added a sinking effect for damaged ships Yvonne Schmidt 2024-10-11 01:33:52 +0200
• dcc7cf9c20 added rudimentary effects when ships are hit Johannes Schmelz 2024-10-11 00:43:22 +0200
• b9309b6f5f added fire and explosion effect, when a ship is hit Yvonne Schmidt 2024-10-10 23:31:32 +0200
• 3386d395fe testValidMap Luca Puderbach 2024-10-10 20:31:21 +0200
• 91b24db6ca getPosition() Luca Puderbach 2024-10-10 20:30:34 +0200
• ae5ba034fe added the option to host the server on a client Yvonne Schmidt 2024-10-10 15:48:14 +0200
• 5501c0716d clients can now start server in thread Johannes Schmelz 2024-10-09 16:29:59 +0200
• 8261e1b3b2 clen up Johannes Schmelz 2024-10-09 16:05:37 +0200
• 682da199e8 added missing comments to public void setVolume and public void update. Also removed unused import statements. Yvonne Schmidt 2024-10-08 22:45:28 +0200
• 8a7446d81c added background music Yvonne Schmidt 2024-10-08 22:17:29 +0200
• 1f75f7bf30 Task 8 Tamino Mueller 2024-10-08 20:49:19 +0200
• 5cca8f5c05 refactor and documentation Johannes Schmelz 2024-10-08 19:57:37 +0200
• cb57187f98 removed superfluous models and cleaned up code Yvonne Schmidt 2024-10-08 18:43:35 +0200
• 958f4f6a13 added new models and fixed loading of 3d interface Yvonne Schmidt 2024-10-08 18:37:46 +0200
• 133921cfbb added background music Johannes Schmelz 2024-10-08 17:32:37 +0200
• af08a84dc3 added battlecruiser model Yvonne Schmidt 2024-10-08 00:55:35 +0200
• 53df6011db added u-boat model Yvonne Schmidt 2024-10-08 00:43:02 +0200
• 4bc3b3dc33 fixed model export for small Boat Yvonne Schmidt 2024-10-07 19:58:08 +0200
• cf780f0995 added small boat model Yvonne Schmidt 2024-10-07 18:58:24 +0200
• 64834e8bf1 Map generation fixed Simon Wilkening 2024-10-07 12:26:14 +0200
• 8f08e83358 Map generation fixed Simon Wilkening 2024-10-07 12:25:17 +0200
• 05618c0793 Server checks imported map for invalid placements Yvonne Schmidt 2024-10-07 01:23:52 +0200
• 1ac55a9570 Aufgabe 7 Tamino Mueller 2024-10-07 00:57:00 +0200
• 430bac86bd Update ServerGameLogic.java Filip Szepielewicz 2024-10-06 20:16:47 +0000
• 107798bfd3 Update BattleState.java Filip Szepielewicz 2024-10-06 20:15:16 +0000
• 320baf27ee Update ShipMap.java Filip Szepielewicz 2024-10-06 20:12:43 +0000
• 4cf14d02ee reverted commit 35f154aa Johannes Schmelz 2024-10-06 18:33:20 +0200
• 50bee91775 tweaked ship positions Johannes Schmelz 2024-10-06 18:29:09 +0200
• a656ab5062 clean up Johannes Schmelz 2024-10-06 18:21:55 +0200
• b2a6f86fc2 added 3d model for ship with length 2 Johannes Schmelz 2024-10-06 18:21:40 +0200
• 0ff5fceae7 neue maps erstellt, 2->3. map2 out of bound, map4 overlaping Luca Puderbach 2024-10-06 17:34:57 +0200
• 9f90d92198 added 3d model for ship with length 3 Johannes Schmelz 2024-10-06 16:52:43 +0200
• 3e913f636c added small boat Johannes Schmelz 2024-10-06 15:39:06 +0200
• f6699c2a0a own->opponent Luca Puderbach 2024-10-06 15:20:18 +0200
• 3ee095215a Assignment 7 ready Yvonne Schmidt 2024-10-06 14:52:33 +0200
• 9ca08c3d0c added -> removed Luca Puderbach 2024-10-06 00:53:15 +0200
• 806c00c94a server now shuts down with invalid ship placement Johannes Schmelz 2024-10-06 00:37:20 +0200
• 4fff32c13e added server side map loading verification Johannes Schmelz 2024-10-06 00:18:36 +0200
• 1c99117ca0 reviced() did not update the OpponentPlayer ships list corretly Johannes Schmelz 2024-10-05 23:46:08 +0200
• 62421e87cc fixed ConcurrentModificationException in clear() Johannes Schmelz 2024-10-05 20:53:07 +0200
• e343074240 fixed remove Johannes Schmelz 2024-10-05 13:14:20 +0200
• 35f154aa0f fixed clear Johannes Schmelz 2024-10-05 13:13:48 +0200
• 4488911e82 Fixing branch setup to match main Johannes Schmelz 2024-10-05 11:58:12 +0200
• 9abf7350e4 Revert "added contents" revert-71a4ac8d Johannes Schmelz 2024-10-03 14:05:06 +0000
• f47cda7dc4 Merge branch 'b_schmelz_johannes' into 'main' b_Schmelz_Johannes Johannes Schmelz 2024-10-03 14:03:23 +0000
• c7269f032f Revert "branched" Johannes Schmelz 2024-10-03 13:59:48 +0000
• 4581e611ca branched Johannes Schmelz 2024-10-03 15:55:58 +0200
• 71a4ac8d12 added contents Mark Minas 2024-09-18 17:04:31 +0200
• d28b17eba5 initial commit Mark Minas 2024-09-18 17:04:31 +0200