peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-31 11:52:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 7ff0ceca61 Merge branch 'b_schmelz_johannes' into 'main' Johannes Schmelz 2024-11-11 23:46:20 +0000
  • 188ec03abd working version of battleship Johannes Schmelz 2024-11-12 00:37:05 +0100
  • 79a9b0ed3c fix 13 b_szepielewicz_filip Filip Szepielewicz 2024-10-21 07:34:56 +0200
  • fe41a67341 add missing pic :/ b_puderbach_luca Luca Puderbach 2024-10-20 04:44:12 +0200
  • 842eabd32e fixed shell pos Luca Puderbach 2024-10-20 04:33:40 +0200
  • e4a24c3070 fixing shell Luca Puderbach 2024-10-20 04:30:57 +0200
  • 04d16a2882 implements shell Luca Puderbach 2024-10-19 22:50:17 +0200
  • 1f4ebdb630 fixed incorrect splash effect b_wilkening_simon Simon Wilkening 2024-10-18 17:15:57 +0200
  • 1f5c8ba4a6 fixed bug of chrashing servers when shell hits a target Simon Wilkening 2024-10-18 17:09:50 +0200
  • 6c8da2f4a0 fixed crash when starting animation in selfhost b_schmidt_yvonne Yvonne Schmidt 2024-10-18 14:24:06 +0200
  • 0cdd345ab5 corrected minor error Simon Wilkening 2024-10-18 13:53:21 +0200
  • ba837d4016 shell sound Simon Wilkening 2024-10-18 13:21:29 +0200
  • 28d9cb10e5 shell animation Simon Wilkening 2024-10-18 13:20:23 +0200
  • 446cb43abb reworked the shell animation Yvonne Schmidt 2024-10-18 00:30:28 +0200
  • 237d93f38b completed documentation b_schmelz_johannes Johannes Schmelz 2024-10-16 20:44:56 +0200
  • f78106b43d added shell sound Johannes Schmelz 2024-10-16 20:42:04 +0200
  • 113202278f added shell animation Johannes Schmelz 2024-10-16 20:33:15 +0200
  • 6b2b917864 Merge branch 'revert-f248a77c' into 'b_schmelz_johannes' Johannes Schmelz 2024-10-14 12:35:07 +0000
  • 0f44d37d4a Revert "states for shell logic implemented" revert-f248a77c Johannes Schmelz 2024-10-14 12:34:49 +0000
  • e0bea47583 task 13 b_Mueller_Tamino Tamino Mueller 2024-10-14 08:39:59 +0200
  • 38979bdf86 effect when opponent miss the ship Tamino Mueller 2024-10-14 08:15:02 +0200
  • 68beedcf29 effect when opponent miss the ship Tamino Mueller 2024-10-14 08:12:56 +0200
  • 7d70e8bd13 effect when opponent miss the ship Tamino Mueller 2024-10-14 08:12:37 +0200
  • 0fd0555dea add effects when ships are hit Tamino Mueller 2024-10-14 08:07:57 +0200
  • 00a8f11602 task 13 + debug Filip Szepielewicz 2024-10-14 07:39:31 +0200
  • d5e5254051 task 12 Filip Szepielewicz 2024-10-14 07:38:39 +0200
  • a798edf07f add spinning drop Luca Puderbach 2024-10-14 06:30:01 +0200
  • 5dff2c271f fixing effects Luca Puderbach 2024-10-14 06:02:20 +0200
  • 47610d9e11 added groundwork for shell animation Yvonne Schmidt 2024-10-14 05:31:20 +0200
  • b6642a4815 add img sinking eff Luca Puderbach 2024-10-14 05:12:56 +0200
  • a0dffbfc34 Aufgabe 13: 1.Shell implementiert 2.ShellControl 3.ShellAnimation 4.State für Shell b_malkmus_dennis Dennis_Malkmus 2024-10-14 04:54:05 +0200
  • 21553ec52e ships are finally sinking Simon Wilkening 2024-10-14 04:40:37 +0200
  • 33dba7f3b6 more fixing things Luca Puderbach 2024-10-14 04:38:01 +0200
  • 5f79e8e00c Added effect for not hitting ships Simon Wilkening 2024-10-14 04:25:55 +0200
  • 96992c5b03 fixing server host Luca Puderbach 2024-10-14 04:25:55 +0200
  • c525a8994c "redo" task11 (black screen) Luca Puderbach 2024-10-14 04:17:43 +0200
  • 86a3d90bf8 clean up Luca Puderbach 2024-10-14 04:08:26 +0200
  • 03adf45167 Adjusted effects Simon Wilkening 2024-10-14 04:06:27 +0200
  • f248a77c81 states for shell logic implemented Johannes Schmelz 2024-10-14 03:38:04 +0200
  • a6fec62fa0 neue modelle + fixing Luca Puderbach 2024-10-14 03:01:55 +0200
  • 7076e204af Aufgabe 12: 1.Partikelsystem implementiert 2.Klasse SeaSyncronizer angepasst 3.Klasse SinkingControl implementiert Auftretendes Problem: Es ist nichtmehr möglich, Klassen zu erstellen. Weg über "Erstelle File->Name eingeben-> Rename file" Dennis_Malkmus 2024-10-14 01:41:24 +0200
  • 563784dbab Merge remote-tracking branch 'origin/b_schmidt_yvonne' into b_schmidt_yvonne Yvonne Schmidt 2024-10-14 00:45:01 +0200
  • 50559f5785 Aufgabe 11: 1.Importierung Button für Verbindung aus Lemur. 2.Import BattleShipServer 3.Startbutton implementiert. 4.Methode "startServerInThread" implementiert Dennis_Malkmus 2024-10-14 00:38:18 +0200
  • f5dc8a0f05 Aufgabe 1-10 bearbeitet. Musik (Piratenmusik.ogg) hinzugefügt. Schiebregler hinzugefügt (VolumeLSider); update Methode überschrieben; Lemur Doc gelesen Dennis_Malkmus 2024-10-13 23:45:26 +0200
  • b8cd71120f implement server start from client Luca Puderbach 2024-10-13 21:02:20 +0200
  • b962444506 task 11 Tamino Mueller 2024-10-13 20:58:18 +0200
  • aa9c073931 added sinking animation for destroyed ships Johannes Schmelz 2024-10-13 20:52:33 +0200
  • c0a3e8b37a task 10 Tamino Mueller 2024-10-13 20:34:01 +0200
  • c8621e02c6 insert music Tamino Mueller 2024-10-13 19:56:12 +0200
  • 5d0f4401a0 task 9 Filip Szepielewicz 2024-10-13 19:51:43 +0200
  • 0e5ffcc501 added very basic splash effect Yvonne Schmidt 2024-10-13 18:59:18 +0200
  • 17c4fca078 Added effects for hits Simon Wilkening 2024-10-13 18:54:36 +0200
  • fc22ae1819 add and convert 3d models Luca Puderbach 2024-10-13 18:11:11 +0200
  • f27ec36d2b add bgmusic Luca Puderbach 2024-10-13 17:44:13 +0200
  • 68e252e174 add slider + update menu Luca Puderbach 2024-10-13 17:42:31 +0200
  • b33ddcb2c2 insert bgmusic Luca Puderbach 2024-10-13 17:41:40 +0200
  • 25d7884cad fixed sizes of the boats Tamino Mueller 2024-10-13 17:34:43 +0200
  • f0ea67c966 client start his own server Filip Szepielewicz 2024-10-13 14:25:32 +0200
  • 75d6403894 client start his own server Filip Szepielewicz 2024-10-13 14:24:16 +0200
  • 16620a0a3b Added map 7 and map 8 to compare 3D ship models Simon Wilkening 2024-10-13 14:18:25 +0200
  • 2028d936e3 Server can now be started from client menu Simon Wilkening 2024-10-13 14:16:28 +0200
  • 1288d6d1ca added missing documentation Yvonne Schmidt 2024-10-13 12:53:02 +0200
  • 520b98f693 added a sinking effect for damaged ships Yvonne Schmidt 2024-10-11 01:33:52 +0200
  • 8e02c3919e added fire and explosion effect, when a ship is hit Yvonne Schmidt 2024-10-10 23:31:32 +0200
  • 4df5a1a7d1 added the option to host the server on a client Yvonne Schmidt 2024-10-10 15:48:14 +0200
  • 3bdc9c20dc 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
  • f541f3edc0 added background music Yvonne Schmidt 2024-10-08 22:17:29 +0200
  • c26d7b5422 removed superfluous models and cleaned up code Yvonne Schmidt 2024-10-08 18:43:35 +0200
  • 2e294896d8 added new models and fixed loading of 3d interface Yvonne Schmidt 2024-10-08 18:37:46 +0200
  • f02a3107a0 added battlecruiser model Yvonne Schmidt 2024-10-08 00:55:35 +0200
  • 141d817421 added u-boat model Yvonne Schmidt 2024-10-08 00:43:02 +0200
  • fe1bf7746b fixed model export for small Boat Yvonne Schmidt 2024-10-07 19:58:08 +0200
  • 2c7820491a added small boat model Yvonne Schmidt 2024-10-07 18:58:24 +0200
  • 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