Commit Graph

  • 20949b641e Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-18 08:05:35 +01:00
  • 56e2174b6d Figur ist jetzt flawless übers Spielfeld am flyen Luca Puderbach 2024-11-18 08:02:53 +01:00
  • acfeebca14 Startmenü fertig Yvonne Schmidt 2024-11-18 07:52:47 +01:00
  • cc47acbd3f Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-18 07:27:21 +01:00
  • 869e16406d eigenes GUI Styling eingeführt Yvonne Schmidt 2024-11-18 07:26:31 +01:00
  • 1c99da4fc5 Hinzugefügt Kamera und 1. Spielfigut Luca Puderbach 2024-11-18 07:25:15 +01:00
  • b74ca4e702 eigenes GUI Styling eingeführt Yvonne Schmidt 2024-11-18 07:04:44 +01:00
  • 5fde7451c8 Verbesserung TestWorld Luca Puderbach 2024-11-18 06:54:38 +01:00
  • 6fd9209336 Angleichen MonopolyApp Luca Puderbach 2024-11-18 05:58:18 +01:00
  • 0213dc3560 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-18 05:55:15 +01:00
  • e73c434c1b Angleichen Monopolyapp Luca Puderbach 2024-11-18 05:55:10 +01:00
  • b135f3fa50 idk Johannes Schmelz 2024-11-18 05:51:31 +01:00
  • 0e580a3180 Figure Syncronizer now added Johannes Schmelz 2024-11-18 05:38:04 +01:00
  • 8e3cb43244 eigenes GUI Styling eingeführt Yvonne Schmidt 2024-11-18 05:32:33 +01:00
  • 6dcfb92dba resolve merge conflict Johannes Schmelz 2024-11-18 05:07:41 +01:00
  • a7ea5773da resolve merge conflict Johannes Schmelz 2024-11-18 05:05:37 +01:00
  • 5b66131d30 Merge branch 'logic' into 'gui' Johannes Schmelz 2024-11-18 04:01:41 +00:00
  • cac06dda7d Refactor Johannes Schmelz 2024-11-18 04:01:41 +00:00
  • fc5315d35a Merge branch 'logic' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into logic Johannes Schmelz 2024-11-18 05:00:36 +01:00
  • c7c2d95aed refactor for java 20 Johannes Schmelz 2024-11-18 05:00:31 +01:00
  • 84e68d9fa8 Merge branch 'gui' into 'logic' Johannes Schmelz 2024-11-18 03:50:55 +00:00
  • 465aef567e Gui Johannes Schmelz 2024-11-18 03:50:54 +00:00
  • 12c1c97a99 Merge branch 'logic' into 'gui' Johannes Schmelz 2024-11-18 03:50:41 +00:00
  • af4b4243ea Resolve merge conflicts Luca Puderbach 2024-11-18 04:42:30 +01:00
  • 5189c74058 Merge branch 'gui' into 'main' Johannes Schmelz 2024-11-18 03:14:39 +00:00
  • fffd32e13c Merge branch 'main' into 'gui' Johannes Schmelz 2024-11-18 03:14:07 +00:00
  • b37a5095f0 client recieve message logic Johannes Schmelz 2024-11-18 03:20:39 +01:00
  • 951b4c198c Server bug fix. Add player did not correspond with the params Johannes Schmelz 2024-11-18 00:24:15 +01:00
  • 8698eed273 Tooolbar implementiert Yvonne Schmidt 2024-11-17 22:33:58 +01:00
  • 1af8614b35 Tooolbar in Testworld implementiert Yvonne Schmidt 2024-11-17 22:33:12 +01:00
  • 30e4298f88 Merge remote-tracking branch 'origin/Testhandbuch' into Testhandbuch Filip Szepielewicz 2024-11-17 20:38:30 +01:00
  • 7a9e84f49c Tests bis T071 erweitert Filip Szepielewicz 2024-11-17 20:06:47 +01:00
  • 7fce07ac19 Tests bis T070 erweitert Filip Szepielewicz 2024-11-17 20:00:05 +01:00
  • 11faeeaf45 Merge branch 'Testhandbuch' into 'main' Johannes Schmelz 2024-11-17 18:28:55 +00:00
  • 9d0fcc3370 Erste Tests Johannes Schmelz 2024-11-17 18:28:55 +00:00
  • 2496ad812a Merge branch 'main' into 'Testhandbuch' Johannes Schmelz 2024-11-17 18:27:54 +00:00
  • 2f6d6037de Merge branch 'logic' into 'main' Johannes Schmelz 2024-11-17 18:25:32 +00:00
  • 1d69bcc814 refactor and bug fixes Johannes Schmelz 2024-11-17 17:43:05 +01:00
  • 62c363068b fixed bug with client server messages Johannes Schmelz 2024-11-16 18:57:52 +01:00
  • d2e0b8187b implemented PlayerStates Johannes Schmelz 2024-11-16 18:42:05 +01:00
  • 628b98af9b recive logic for messages Johannes Schmelz 2024-11-16 18:03:19 +01:00
  • 627e3dbd7f added fine to FineField Johannes Schmelz 2024-11-16 17:53:07 +01:00
  • f4fb04d17e T001 - T037 überarbeitet Filip Szepielewicz 2024-11-15 19:46:26 +01:00
  • 61b88f6bf8 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-15 18:39:47 +01:00
  • 8ab37e73c1 Anpassung des Button designs Yvonne Schmidt 2024-11-15 18:39:21 +01:00
  • 1b4fee2853 T001 - T034 erster versuch Filip Szepielewicz 2024-11-15 08:42:56 +01:00
  • b65f458302 T001 - T034 erster versuch Filip Szepielewicz 2024-11-15 08:42:11 +01:00
  • afdf43ebf1 Übergang zu TestMap verbessert Luca Puderbach 2024-11-15 08:36:16 +01:00
  • 2e0d1c059d TestWord eingefügt Luca Puderbach 2024-11-15 07:00:55 +01:00
  • 2b772199b0 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-15 06:49:13 +01:00
  • c37b850798 Buttons im Startmenü angepasst Yvonne Schmidt 2024-11-15 06:48:25 +01:00
  • c31f924d77 CreateGame fertig für feinschliff (Icon test) Luca Puderbach 2024-11-15 06:25:21 +01:00
  • ed87a6167d Verbesserung SettingsMenu Luca Puderbach 2024-11-15 05:36:57 +01:00
  • 0d86ba0ca9 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-15 05:12:39 +01:00
  • f2fd283d06 Positionierung StartMenu Buttons & SettingsMenu Luca Puderbach 2024-11-15 05:04:25 +01:00
  • 10b978debf fixed addPlayer Johannes Schmelz 2024-11-15 04:27:32 +01:00
  • 85756713df Erweitern des Setting und CreateGameMenü Luca Puderbach 2024-11-15 03:23:27 +01:00
  • 3bdfd6a78a TradeHandler logic Johannes Schmelz 2024-11-15 03:19:48 +01:00
  • e59ab4a320 cleintmessages logic Johannes Schmelz 2024-11-15 03:06:07 +01:00
  • 15b3902bd3 SettingsMenü Anpassungen Luca Puderbach 2024-11-15 02:31:12 +01:00
  • b622d66942 Buttons im Startmenü ausgerichtet Yvonne Schmidt 2024-11-15 02:28:10 +01:00
  • 12ef219064 Änderungs des StartBildschirms Luca Puderbach 2024-11-15 01:25:09 +01:00
  • 853b52b52d Implementierung eines grundlegenden Startmenüs Luca Puderbach 2024-11-15 00:39:47 +01:00
  • 7a2ad1d31a corrected server states Johannes Schmelz 2024-11-14 23:50:18 +01:00
  • c5ad476eaf added rent payment logic added player on field logic Johannes Schmelz 2024-11-14 23:50:06 +01:00
  • c792a8b3fb T001 - T034 erster versuch Filip Szepielewicz 2024-11-14 21:54:27 +01:00
  • 12978ff410 T001 - T034 erster versuch Filip Szepielewicz 2024-11-14 21:54:27 +01:00
  • caa45097c3 klassen angepasst Yvonne Schmidt 2024-11-14 21:31:47 +01:00
  • 232e3a117c corrected rent prices Johannes Schmelz 2024-11-14 01:08:22 +01:00
  • 3668382911 FineField in Player Johannes Schmelz 2024-11-13 23:50:06 +01:00
  • fafa53ffb7 rent calculation Johannes Schmelz 2024-11-13 23:49:37 +01:00
  • 44673fd57e createBoard method Johannes Schmelz 2024-11-13 23:30:04 +01:00
  • f7149f225c Interpreter fuer messages hinzugefuegt Johannes Schmelz 2024-11-13 18:54:24 +01:00
  • 6773e18d34 Message Klassen hinzugefuegt Johannes Schmelz 2024-11-13 14:11:20 +01:00
  • 19a9b06f3c Merge branch 'gui' into 'main' Johannes Schmelz 2024-11-13 12:42:37 +00:00
  • 7ee2273761 First compileable version of Client Johannes Schmelz 2024-11-13 12:42:37 +00:00
  • 86b8297c9d fixed bugs, game now compiles Johannes Schmelz 2024-11-13 13:31:02 +01:00
  • 17533112a1 Startmenü implementiert und Spielmenü Stummel erstellt Yvonne Schmidt 2024-11-12 23:30:44 +01:00
  • 2cc1a338ec added Figure to Player for visual representation Johannes Schmelz 2024-11-12 22:36:02 +01:00
  • 81731247c7 added Fields Johannes Schmelz 2024-11-12 22:35:41 +01:00
  • 65c85aacf0 started UC-gameplay-15 Johannes Schmelz 2024-11-12 22:34:46 +01:00
  • dca23151a8 added Visitors Johannes Schmelz 2024-11-12 22:33:10 +01:00
  • 25305760c5 added Player Johannes Schmelz 2024-11-12 22:32:55 +01:00
  • 3ef2459ad0 Hintergrundfarbe der Menüs zu Weiß geändert Yvonne Schmidt 2024-11-12 21:32:46 +01:00
  • 29a56f42a8 Merge branch 'main' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 Johannes Schmelz 2024-11-12 14:53:08 +01:00
  • 3784348f91 init for monopoly Johannes Schmelz 2024-11-12 14:53:04 +01:00
  • 188ec03abd working version of battleship Johannes Schmelz 2024-11-12 00:37:05 +01:00
  • 79a9b0ed3c fix 13 b_szepielewicz_filip Filip Szepielewicz 2024-10-21 07:34:56 +02:00
  • fe41a67341 add missing pic :/ b_puderbach_luca Luca Puderbach 2024-10-20 04:44:12 +02:00
  • 842eabd32e fixed shell pos Luca Puderbach 2024-10-20 04:33:40 +02:00
  • e4a24c3070 fixing shell Luca Puderbach 2024-10-20 04:30:57 +02:00
  • 04d16a2882 implements shell Luca Puderbach 2024-10-19 22:50:17 +02:00
  • 1f4ebdb630 fixed incorrect splash effect b_wilkening_simon Simon Wilkening 2024-10-18 17:15:57 +02:00
  • 1f5c8ba4a6 fixed bug of chrashing servers when shell hits a target Simon Wilkening 2024-10-18 17:09:50 +02:00
  • 6c8da2f4a0 fixed crash when starting animation in selfhost b_schmidt_yvonne Yvonne Schmidt 2024-10-18 14:24:06 +02:00
  • 0cdd345ab5 corrected minor error Simon Wilkening 2024-10-18 13:53:21 +02:00
  • ba837d4016 shell sound Simon Wilkening 2024-10-18 13:21:29 +02:00
  • 28d9cb10e5 shell animation Simon Wilkening 2024-10-18 13:20:23 +02:00
  • 446cb43abb reworked the shell animation Yvonne Schmidt 2024-10-18 00:30:28 +02:00
  • 237d93f38b completed documentation b_schmelz_johannes Johannes Schmelz 2024-10-16 20:44:56 +02:00