Gruppe-02-clone

mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-18 18:23:44 +01:00

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

demo

gui

logic

main

revert-71a4ac8d

revert-f248a77c

reworkedGui

3ce27023c2 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-26 19:42:01 +0100
174958c6b1 can now dynamically update toolbar view Johannes Schmelz 2024-11-26 18:50:24 +0100
c71e8b1e8e removed hostplayer as hostplayer always has id 0 Johannes Schmelz 2024-11-26 18:48:13 +0100
ada067a2a0 added and centered buttons Yvonne Schmidt 2024-11-26 18:25:23 +0100
f4c4f6bc93 cleanup Johannes Schmelz 2024-11-26 17:53:49 +0100
6eeb6fd209 Properties_de übersetzt Simon Wilkening 2024-11-26 15:29:45 +0100
efba3c496a Deckhelper korrigiert, Properties angepasst Simon Wilkening 2024-11-26 15:15:29 +0100
27a0ab52e6 dice button now works and update dice images accordingly Johannes Schmelz 2024-11-26 14:59:48 +0100
d6ce859fcd ChoosePartner accept-button opens TradeMenu Yvonne Schmidt 2024-11-26 01:12:29 +0100
e5f69c9536 Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-26 01:08:59 +0100
d8a2225038 added framework for TradeMenu Yvonne Schmidt 2024-11-26 01:07:59 +0100
7b91a679f5 abbrechen button in chossePatner Johannes Schmelz 2024-11-26 00:57:22 +0100
840658b590 fixed background location again Yvonne Schmidt 2024-11-26 00:34:49 +0100
c5e7ef855e fixed background location Yvonne Schmidt 2024-11-26 00:25:31 +0100
170227c97f fixed header in ChoosePartner menu Yvonne Schmidt 2024-11-26 00:21:13 +0100
379803278b Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-26 00:11:42 +0100
3956d8efa7 show all playe stats in toolbar Johannes Schmelz 2024-11-26 00:11:37 +0100
269aceaf1a added ChoosePartner menu Yvonne Schmidt 2024-11-26 00:11:01 +0100
41127565fc Merge remote-tracking branch 'origin/gui' into gui Yvonne Schmidt 2024-11-26 00:10:52 +0100
0e405d2f90 send PlayerHandler in GameStart Johannes Schmelz 2024-11-25 22:11:35 +0100
f67810b288 fixed toolbar buttons Yvonne Schmidt 2024-11-25 21:29:54 +0100
4095d9e79d fixed buyCard color and button function Johannes Schmelz 2024-11-25 21:29:00 +0100
547a4c2353 cleanup toolbar Johannes Schmelz 2024-11-25 21:14:38 +0100
9120e4d53c show test world when GameStart message is recieved Johannes Schmelz 2024-11-25 17:50:54 +0100
1a62b76104 corrected map size Johannes Schmelz 2024-11-25 16:28:50 +0100
cc7f277bef fixed b button Johannes Schmelz 2024-11-25 15:05:02 +0100
4703afd656 Merge branch 'logic' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into logic logic Johannes Schmelz 2024-11-25 06:53:56 +0100
274df8dfd1 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-25 06:50:05 +0100
2e256f4ff5 Merge branch 'gui' into 'main' Johannes Schmelz 2024-11-25 05:33:36 +0000
d10111d2ab Gui v1.0 Johannes Schmelz 2024-11-25 05:33:36 +0000
d4d7598a13 Merge branch 'gui' into 'main' Johannes Schmelz 2024-11-25 05:33:23 +0000
0c2b266f5e Merge branch 'main' into 'gui' Johannes Schmelz 2024-11-25 05:33:21 +0000
16b4dbae18 Deckhelper korrigiert Simon Wilkening 2024-11-25 06:30:04 +0100
88409dcc99 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-25 05:42:49 +0100
5cacff39b7 refactor typo Johannes Schmelz 2024-11-25 05:42:45 +0100
093723a9d0 added outline for ChoosePartner Menu Yvonne Schmidt 2024-11-25 05:40:49 +0100
f67ce6be44 Merge branch 'Testhandbuch' into 'main' Johannes Schmelz 2024-11-25 04:34:06 +0000
1be29b8b7a newest version of tests Johannes Schmelz 2024-11-25 04:34:06 +0000
aa0f7cbd01 Merge branch 'Testhandbuch' into 'main' Johannes Schmelz 2024-11-25 04:33:01 +0000
6e5d9452b3 Merge branch 'main' into 'Testhandbuch' Johannes Schmelz 2024-11-25 04:32:59 +0000
dfdbcdc9f3 board visible again Johannes Schmelz 2024-11-25 05:16:24 +0100
bd725e2dc4 refactor Johannes Schmelz 2024-11-25 04:54:35 +0100
dd9d9144dd Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui Johannes Schmelz 2024-11-25 04:52:56 +0100
1a429e4bb6 fixed settings in toolbar Johannes Schmelz 2024-11-25 04:52:53 +0100
ad6fb5e926 added dice containers Yvonne Schmidt 2024-11-25 04:52:34 +0100
72cb7049ba remove demo cube Johannes Schmelz 2024-11-25 04:19:13 +0100
2e42f3afac added testing shortcuts Johannes Schmelz 2024-11-25 04:09:48 +0100
8474c9f5bc fixed EventCard sizing Yvonne Schmidt 2024-11-25 03:56:07 +0100
b7ed03f7e8 resolve merge conflicts Johannes Schmelz 2024-11-25 03:55:06 +0100
a44b6b5e4c Merge branch 'connect' into 'gui' Johannes Schmelz 2024-11-25 02:46:03 +0000
5268f75e17 Client connect to server Johannes Schmelz 2024-11-25 02:46:03 +0000
75a97d7520 Merge branch 'connect' into 'gui' Johannes Schmelz 2024-11-25 02:45:04 +0000
4ecccc5951 Merge branch 'gui' into 'connect' connect Johannes Schmelz 2024-11-25 02:45:02 +0000
f90ce5aa81 all button sounds now Johannes Schmelz 2024-11-25 03:35:32 +0100
4a9eba255b restyled selector Yvonne Schmidt 2024-11-25 03:24:00 +0100
4713a526b3 Merge branch 'connect' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into connect Johannes Schmelz 2024-11-25 03:08:01 +0100
362c0e5679 added serialisables Johannes Schmelz 2024-11-25 03:07:57 +0100
fab2457715 added header to CreateGameMenu Yvonne Schmidt 2024-11-25 02:51:43 +0100
7b3f31f099 Merge remote-tracking branch 'origin/connect' into connect Yvonne Schmidt 2024-11-25 02:48:26 +0100
ed105f1b70 cleanup Johannes Schmelz 2024-11-25 02:43:58 +0100
cd4331aee3 added header to CreateGameMenu Yvonne Schmidt 2024-11-25 02:43:08 +0100
acc797f2ff Merge remote-tracking branch 'origin/connect' into connect Yvonne Schmidt 2024-11-25 02:12:01 +0100
853c32a5b8 fixed Buttons Yvonne Schmidt 2024-11-25 02:11:05 +0100
72bef7143a serialize messages Johannes Schmelz 2024-11-25 02:05:56 +0100
b1ed571950 added background to CreateGameMenu Yvonne Schmidt 2024-11-25 02:01:38 +0100
1a75d6d6a8 buttons now work as intended Johannes Schmelz 2024-11-25 01:51:27 +0100
c990e7b562 added button sounds Yvonne Schmidt 2024-11-25 01:50:52 +0100
c87406f60e fixed esc menu Johannes Schmelz 2024-11-25 00:52:10 +0100
21914a1294 fixed startmenu Johannes Schmelz 2024-11-25 00:33:05 +0100
a344145732 fixed sounds Johannes Schmelz 2024-11-25 00:28:42 +0100
a27ac31086 Merge remote-tracking branch 'origin/connect' into connect Yvonne Schmidt 2024-11-25 00:24:43 +0100
9a7f75b76b added effect sound slider Yvonne Schmidt 2024-11-25 00:24:25 +0100
687d1621fc EventCard erweitert Simon Wilkening 2024-11-25 00:06:12 +0100
a6944aa6e3 added dice images Johannes Schmelz 2024-11-24 23:38:22 +0100
3e487c00d5 accidentally deleted volumeSlider Johannes Schmelz 2024-11-24 23:29:59 +0100
4820b8cf46 added looser popup Johannes Schmelz 2024-11-24 23:28:04 +0100
caa4cb5262 winner popup Johannes Schmelz 2024-11-24 23:23:56 +0100
b8365c76a1 fix mac executable Johannes Schmelz 2024-11-24 22:58:47 +0100
19216cc174 refactor Johannes Schmelz 2024-11-24 22:57:19 +0100
c6a23b9b8e execute for apple Johannes Schmelz 2024-11-24 22:56:52 +0100
c0f42fb1eb refactor Johannes Schmelz 2024-11-24 22:50:52 +0100
160873e2cc added pictures and popups fixed Tamino Mueller 2024-11-24 22:42:32 +0100
1b2a7d73b5 extend dialog Johannes Schmelz 2024-11-24 22:41:53 +0100
8df859bbef Merge remote-tracking branch 'origin/gui' into gui Tamino Mueller 2024-11-24 22:34:54 +0100
e30d10a85d Pop-Up hinzugefügt Tamino Mueller 2024-11-24 22:34:19 +0100
55778dbcea removed the buttons on start Johannes Schmelz 2024-11-24 22:29:19 +0100
422faec281 send player ready Johannes Schmelz 2024-11-24 22:06:19 +0100
dcf10e0819 automatically join lobby when selfhosting Johannes Schmelz 2024-11-24 21:36:03 +0100
6b78733a5d fixed server join Johannes Schmelz 2024-11-24 21:30:18 +0100
c124a99901 fixed screen size Johannes Schmelz 2024-11-24 21:29:41 +0100
d7df4002da lobby menu Johannes Schmelz 2024-11-24 21:01:57 +0100
8b0ef97a82 connect menu cow working Johannes Schmelz 2024-11-24 20:52:29 +0100
75d3bef5c8 move start menu Johannes Schmelz 2024-11-24 20:42:07 +0100
bafc3f1db6 Merge remote-tracking branch 'origin/gui' into 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 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