Johannes Schmelz
|
b67379a6c3
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-28 22:56:06 +01:00 |
|
Johannes Schmelz
|
1e6188cf24
|
open buy popups
|
2024-11-28 22:56:02 +01:00 |
|
Yvonne Schmidt
|
12e859edd5
|
finished PropertyOverviewMenu
|
2024-11-28 21:55:44 +01:00 |
|
Johannes Schmelz
|
e000dcfc51
|
cleanup
|
2024-11-28 19:50:53 +01:00 |
|
Johannes Schmelz
|
e7a06159bb
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-28 19:42:07 +01:00 |
|
Johannes Schmelz
|
c900b6384d
|
lock button when not active
|
2024-11-28 19:40:30 +01:00 |
|
Simon Wilkening
|
970a0ae254
|
Gebäude_Abreißen erstellt
|
2024-11-28 04:34:33 +01:00 |
|
Yvonne Schmidt
|
5e0ac0abc7
|
fixed button disabled behaviour
|
2024-11-28 03:58:40 +01:00 |
|
Simon Wilkening
|
bcd6711965
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-28 03:16:35 +01:00 |
|
Simon Wilkening
|
bb63a4df9f
|
Popup_Handel_bestätigen erstellt
|
2024-11-28 03:16:11 +01:00 |
|
Yvonne Schmidt
|
b4d7349583
|
added framework for PropertyOverviewMenu
|
2024-11-28 03:00:28 +01:00 |
|
Luca Puderbach
|
fed8a3fd2d
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-28 02:31:50 +01:00 |
|
Luca Puderbach
|
bc6e7174ec
|
Test Modelle Umbenannt
|
2024-11-28 02:31:43 +01:00 |
|
Yvonne Schmidt
|
075f98883a
|
fixed toolbar fontsize
|
2024-11-28 02:02:29 +01:00 |
|
Yvonne Schmidt
|
c9df3a6176
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-28 00:40:25 +01:00 |
|
Johannes Schmelz
|
b2d2a79b00
|
added hslider
|
2024-11-28 00:40:11 +01:00 |
|
Luca Puderbach
|
26d8283930
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-28 00:18:27 +01:00 |
|
Luca Puderbach
|
4079c0a32c
|
Würfel animation hinzugefügt
|
2024-11-28 00:13:32 +01:00 |
|
Johannes Schmelz
|
6d72a94fe4
|
event card complete
|
2024-11-28 00:07:32 +01:00 |
|
Yvonne Schmidt
|
227a7a027f
|
added comments
|
2024-11-27 23:40:16 +01:00 |
|
Luca Puderbach
|
c346058631
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-27 17:34:52 +01:00 |
|
Luca Puderbach
|
f2678ea33d
|
doppelwürfel
|
2024-11-27 17:34:41 +01:00 |
|
Yvonne Schmidt
|
45a43d6998
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-27 00:17:31 +01:00 |
|
Yvonne Schmidt
|
cb9888af7a
|
completed BuildingAdminMenu
|
2024-11-27 00:17:04 +01:00 |
|
Johannes Schmelz
|
93b183254f
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-27 00:11:11 +01:00 |
|
Johannes Schmelz
|
e92b305a56
|
cleanup
|
2024-11-27 00:11:07 +01:00 |
|
Johannes Schmelz
|
5b0628da15
|
dynamically get the fieldid for by popups
|
2024-11-27 00:10:59 +01:00 |
|
Yvonne Schmidt
|
8d087a8e84
|
added framework for BuildingAdminMenu
|
2024-11-26 23:15:14 +01:00 |
|
Johannes Schmelz
|
1715926c1c
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-26 23:01:59 +01:00 |
|
Johannes Schmelz
|
c8b69efca2
|
added correct colors in LobbyMenu
|
2024-11-26 23:01:55 +01:00 |
|
Yvonne Schmidt
|
7f6011720c
|
lobbyMenu ready button toggles to grey
|
2024-11-26 22:30:13 +01:00 |
|
Yvonne Schmidt
|
bdc5f0269f
|
fixed cancel button position
|
2024-11-26 22:27:55 +01:00 |
|
Yvonne Schmidt
|
a6054e825e
|
fixed trade display
|
2024-11-26 22:24:03 +01:00 |
|
Johannes Schmelz
|
156e76fe0a
|
cleanup
|
2024-11-26 21:31:21 +01:00 |
|
Johannes Schmelz
|
89587a4c78
|
set default value for drop down selection
|
2024-11-26 21:28:41 +01:00 |
|
Johannes Schmelz
|
29cc73e83b
|
automaticyally set player name as 'Spieler'+ id+1
|
2024-11-26 20:58:57 +01:00 |
|
Johannes Schmelz
|
e56cdb1dcb
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-26 20:00:54 +01:00 |
|
Johannes Schmelz
|
9107a08011
|
dynamically set players in ChoosePatner
|
2024-11-26 20:00:50 +01:00 |
|
Yvonne Schmidt
|
0242587a5f
|
added groundwork for selection listeners
|
2024-11-26 19:54:02 +01:00 |
|
Yvonne Schmidt
|
3ce27023c2
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-26 19:42:01 +01:00 |
|
Johannes Schmelz
|
174958c6b1
|
can now dynamically update toolbar view
|
2024-11-26 18:50:24 +01:00 |
|
Yvonne Schmidt
|
ada067a2a0
|
added and centered buttons
|
2024-11-26 18:25:23 +01:00 |
|
Johannes Schmelz
|
f4c4f6bc93
|
cleanup
|
2024-11-26 17:53:49 +01:00 |
|
Simon Wilkening
|
efba3c496a
|
Deckhelper korrigiert, Properties angepasst
|
2024-11-26 15:15:29 +01:00 |
|
Johannes Schmelz
|
27a0ab52e6
|
dice button now works and update dice images accordingly
|
2024-11-26 14:59:48 +01:00 |
|
Yvonne Schmidt
|
d6ce859fcd
|
ChoosePartner accept-button opens TradeMenu
|
2024-11-26 01:12:29 +01:00 |
|
Yvonne Schmidt
|
e5f69c9536
|
Merge remote-tracking branch 'origin/gui' into gui
# Conflicts:
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/ChoosePartner.java
|
2024-11-26 01:08:59 +01:00 |
|
Yvonne Schmidt
|
d8a2225038
|
added framework for TradeMenu
|
2024-11-26 01:07:59 +01:00 |
|
Johannes Schmelz
|
7b91a679f5
|
abbrechen button in chossePatner
|
2024-11-26 00:57:22 +01:00 |
|
Yvonne Schmidt
|
840658b590
|
fixed background location again
|
2024-11-26 00:34:49 +01:00 |
|