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

• bafc3f1db6 Merge remote-tracking branch 'origin/gui' into gui gui Yvonne Schmidt 2024-11-24 19:25:12 +0100
• 03571fcf74 code cleanup in der lobby Yvonne Schmidt 2024-11-24 19:24:51 +0100
• e7a6802488 fixed buyProperty Johannes Schmelz 2024-11-24 19:14:56 +0100
• c2d5611ab9 changed settings menu to match connect Johannes Schmelz 2024-11-24 19:10:59 +0100
• a6e6b5e158 lobby übergibt figur Yvonne Schmidt 2024-11-24 19:05:28 +0100
• 74c3d925e6 TODOs und Kommentare ergänst Simon Wilkening 2024-11-24 19:04:58 +0100
• fb28f3fefc tmp settings menu fix Johannes Schmelz 2024-11-24 19:02:56 +0100
• f67fa4d7f0 lobby übergibt namen Yvonne Schmidt 2024-11-24 18:39:32 +0100
• 6a34dab00c changed app to match battleship Johannes Schmelz 2024-11-24 18:27:41 +0100
• 225a8c0e08 BuildingPropertyCard adjusted Simon Wilkening 2024-11-24 18:11:42 +0100
• 9a6ce27fe1 lobby uebergibt farbe und startgeld Yvonne Schmidt 2024-11-24 18:07:39 +0100
• c7bd7d18b7 removed bodged server connection Johannes Schmelz 2024-11-24 18:03:22 +0100
• 437114704a get client id Johannes Schmelz 2024-11-24 17:20:35 +0100
• 9b4cac4e56 send PlayerHandler when starting game Johannes Schmelz 2024-11-24 16:51:00 +0100
• e780513b35 saving the players Johannes Schmelz 2024-11-24 00:32:16 +0100
• d582c59a7d added playerState changes Johannes Schmelz 2024-11-24 00:29:48 +0100
• 7d2c85f617 fixed card bug Johannes Schmelz 2024-11-24 00:13:32 +0100
• 4a882bc4ac Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-24 00:11:18 +0100
• 3c4eac1fcd added logic for visiting event field Johannes Schmelz 2024-11-24 00:11:14 +0100
• 75d5a15bdb defaultwerte in die Lobby eingefügt Yvonne Schmidt 2024-11-23 23:19:53 +0100
• 17f121f7d1 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-23 23:15:04 +0100
• a66c570b51 remove 2d map view Johannes Schmelz 2024-11-23 23:09:02 +0100
• e1e7f2eaf6 überschneidungen von elementen beseitigt Yvonne Schmidt 2024-11-23 23:07:42 +0100
• 46d2dce372 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-23 22:12:39 +0100
• c39f1f6d4c tweaked camera params Johannes Schmelz 2024-11-23 22:12:34 +0100
• 738b04f2d9 oberfläche der lobby fertig Yvonne Schmidt 2024-11-23 21:29:14 +0100
• ecba1c3135 GateField korrigiert Simon Wilkening 2024-11-23 21:22:54 +0100
• 748226f4ed added Move Camera based on player position Johannes Schmelz 2024-11-23 19:27:04 +0100
• f658f53ba9 refactor Johannes Schmelz 2024-11-23 19:26:36 +0100
• 4a8304ee4f relabled FoodField Johannes Schmelz 2024-11-23 18:53:29 +0100
• 7fe9604338 FoodField korrigiert Simon Wilkening 2024-11-23 18:28:28 +0100
• 7f09a6dae8 refactor Johannes Schmelz 2024-11-23 18:02:46 +0100
• 270129bc97 fixed typo Johannes Schmelz 2024-11-23 17:58:56 +0100
• 62ec6f6bef dynamically allocate values Johannes Schmelz 2024-11-23 17:58:17 +0100
• b24c14900c food field dynamic value allocation Johannes Schmelz 2024-11-23 17:54:11 +0100
• 44c55ce3a6 refactor Johannes Schmelz 2024-11-23 17:42:51 +0100
• 895bea048c Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-23 17:41:47 +0100
• 885ab5bdc9 dynamically allocate values Johannes Schmelz 2024-11-23 17:41:20 +0100
• c6355b2c09 dropdown lesbar Yvonne Schmidt 2024-11-23 17:37:27 +0100
• ada6bf3f24 changed GateField font color Yvonne Schmidt 2024-11-23 17:24:41 +0100
• db471ac679 Merge remote-tracking branch 'origin/gui' into gui Simon Wilkening 2024-11-23 17:22:37 +0100
• 84059c4085 GateField Simon Wilkening 2024-11-23 17:22:24 +0100
• 09b363f943 auswahllogik im dropdown implementiert Yvonne Schmidt 2024-11-23 17:03:56 +0100
• fd347c7780 Building property eingefügt Simon Wilkening 2024-11-23 16:50:16 +0100
• b38a34efa5 add figure when player added Johannes Schmelz 2024-11-23 16:35:33 +0100
• 10e24cf30e small bug fixes Johannes Schmelz 2024-11-23 16:16:40 +0100
• 3369057afb update the players figure when moved Johannes Schmelz 2024-11-23 16:08:46 +0100
• 7ada56e215 limit the amount of players to 6 Johannes Schmelz 2024-11-23 14:41:17 +0100
• 373b9e6d53 allow the host player to set start money Johannes Schmelz 2024-11-23 13:20:05 +0100
• 3de31de9f7 bind playercolor to join order Johannes Schmelz 2024-11-23 12:46:20 +0100
• 7252259ab3 updated trade and client logic Johannes Schmelz 2024-11-23 09:15:57 +0100
• f1d52c445b Tests bis T075 überarbeitet Testhandbuch Filip Szepielewicz 2024-11-22 21:45:22 +0100
• f33c673a05 lobby für feinschliff vorbereitet Yvonne Schmidt 2024-11-22 07:15:25 +0100
• 65a7958b66 popup ebenen angepasst und dropdown entfernt Yvonne Schmidt 2024-11-22 05:28:51 +0100
• 91e4df7478 B-Taste um Karte Kaufen Popup zu öffnen Simon Wilkening 2024-11-22 05:23:52 +0100
• 399606d9a0 Toolbar-Design angepasst Yvonne Schmidt 2024-11-22 04:45:27 +0100
• 559afcaffd added NextPlayerTurn Johannes Schmelz 2024-11-22 01:38:48 +0100
• 15f5f91ddb rename sound files Johannes Schmelz 2024-11-22 01:02:48 +0100
• 067a8063a5 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-22 00:54:13 +0100
• 35e367ba24 added sounds Johannes Schmelz 2024-11-22 00:54:09 +0100
• fe68d991fc Merge remote-tracking branch 'origin/gui' into gui Simon Wilkening 2024-11-22 00:44:55 +0100
• 88dc633e8e Würfellogik mit toolbar erneut verbunden Simon Wilkening 2024-11-22 00:44:36 +0100
• 0b9cbb0f5f view assets response now send alls properties and fixed which players properties are sent Johannes Schmelz 2024-11-22 00:42:07 +0100
• c3a33b4402 added house prices and color to buildingfields Johannes Schmelz 2024-11-21 15:30:34 +0100
• e12f00aad6 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-20 03:36:59 +0100
• 47bac0185f Port fix Luca Puderbach 2024-11-20 03:36:54 +0100
• dafe1dab2a Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-20 03:24:46 +0100
• 8ba4ea2819 menues angepasst und vorlage für dropdown implementiert Yvonne Schmidt 2024-11-20 03:24:27 +0100
• f6f708fd5b Angepasste Toolbar Simon Wilkening 2024-11-20 03:17:10 +0100
• 1203077aed Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-20 02:39:20 +0100
• ddbf79c928 can now add players Luca Puderbach 2024-11-20 02:37:00 +0100
• aa47dd579f added selenium dependecy for drop down menu Johannes Schmelz 2024-11-20 02:21:23 +0100
• cdce478d77 send GameStart message with a list of all Players Johannes Schmelz 2024-11-20 01:45:34 +0100
• f11f4a59f1 fixed lemurproto dependecy Johannes Schmelz 2024-11-20 00:55:33 +0100
• d631e8df1e TempFix Luca Puderbach 2024-11-20 00:50:19 +0100
• af80d40700 fix server start Johannes Schmelz 2024-11-19 23:59:23 +0100
• 3a6f8a945a palyer ready fix Johannes Schmelz 2024-11-19 23:59:16 +0100
• bb9727d54a Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-19 23:09:44 +0100
• 7da8b3e545 Spieler Lobby Luca Puderbach 2024-11-19 23:09:39 +0100
• b6968df451 Merge branch 'main' into 'gui' Johannes Schmelz 2024-11-19 20:30:56 +0000
• c7514e63b5 Merge branch 'main' into 'gui' Johannes Schmelz 2024-11-19 20:30:41 +0000
• b85bbdd0ad updates gitignore for vscode main Johannes Schmelz 2024-11-19 21:29:48 +0100
• aa986fb948 added backgroud music file Johannes Schmelz 2024-11-19 20:51:24 +0100
• 6e63de6e99 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-19 19:54:40 +0100
• 962ecd08fa SettingsMenu hat neues design Yvonne Schmidt 2024-11-19 19:54:22 +0100
• 580a26b3ea Grundlage Toolbar Luca Puderbach 2024-11-19 19:50:25 +0100
• 0cda6b5fa0 added first sound files Johannes Schmelz 2024-11-19 19:40:27 +0100
• cc8c3795b8 added game sound logic Johannes Schmelz 2024-11-19 19:27:52 +0100
• 3c21165efb adjusted config params Johannes Schmelz 2024-11-19 19:09:37 +0100
• 818fdf4670 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-19 17:44:57 +0100
• b7d679b492 neue map Luca Puderbach 2024-11-19 17:44:52 +0100
• a42093df23 SettingsMenu nochmal angepasst Yvonne Schmidt 2024-11-19 17:34:22 +0100
• 6157db51da added server label Johannes Schmelz 2024-11-19 14:46:11 +0100
• 843052989b Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-18 23:04:43 +0100
• 8e01fa3192 SettingsMenu angepasst Yvonne Schmidt 2024-11-18 23:04:09 +0100
• e2126a7ea7 implemented self host for server Johannes Schmelz 2024-11-18 23:01:34 +0100
• 0b46d14650 LobbyServer Einfügen Luca Puderbach 2024-11-18 18:56:42 +0100
• 9e28deedf7 Grundlagen Lobby Luca Puderbach 2024-11-18 18:30:35 +0100
• 9c0172b413 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Luca Puderbach 2024-11-18 17:27:51 +0100
• 2933d022aa Veränderung Erreichen der Testwelt Luca Puderbach 2024-11-18 17:27:46 +0100