Yvonne Schmidt
|
0b71c2cb96
|
added documentation
|
2024-12-02 05:53:52 +01:00 |
|
Johannes Schmelz
|
737576e0ca
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 05:43:53 +01:00 |
|
Johannes Schmelz
|
db7a99dc59
|
fixed Top Dialog
|
2024-12-02 05:43:49 +01:00 |
|
Luca Puderbach
|
4b48229329
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 05:43:24 +01:00 |
|
Luca Puderbach
|
1a41b548c4
|
Figuren Drehung
|
2024-12-02 05:43:20 +01:00 |
|
Yvonne Schmidt
|
7f58558da4
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 05:25:24 +01:00 |
|
Johannes Schmelz
|
1503e18585
|
limit name length
|
2024-12-02 05:24:53 +01:00 |
|
Yvonne Schmidt
|
94155d2816
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 05:16:12 +01:00 |
|
Luca Puderbach
|
ec42cc2c07
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 05:15:53 +01:00 |
|
Luca Puderbach
|
af79e39492
|
figuren drehen
|
2024-12-02 05:15:47 +01:00 |
|
Yvonne Schmidt
|
0698c29410
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 05:13:08 +01:00 |
|
Johannes Schmelz
|
08c1854885
|
fixed jail card trade
|
2024-12-02 05:10:45 +01:00 |
|
Johannes Schmelz
|
ff39402d82
|
fixed event card position
|
2024-12-02 05:09:31 +01:00 |
|
Johannes Schmelz
|
4e375131d1
|
change property side
|
2024-12-02 05:06:58 +01:00 |
|
Yvonne Schmidt
|
ac9ced2cf4
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 04:39:50 +01:00 |
|
Johannes Schmelz
|
e93791e6e8
|
remove testing
|
2024-12-02 04:39:30 +01:00 |
|
Yvonne Schmidt
|
fa554cbffc
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 04:37:49 +01:00 |
|
Luca Puderbach
|
f317d7723e
|
Lets GO
|
2024-12-02 04:35:55 +01:00 |
|
Luca Puderbach
|
07fd92c9b2
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 04:20:14 +01:00 |
|
Luca Puderbach
|
91fea83f26
|
Modelle Fixes
|
2024-12-02 04:19:56 +01:00 |
|
Johannes Schmelz
|
471f703634
|
updated models
|
2024-12-02 04:16:49 +01:00 |
|
Yvonne Schmidt
|
065049f663
|
added documentation in client package
|
2024-12-02 04:08:54 +01:00 |
|
Yvonne Schmidt
|
580d81a621
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 03:44:42 +01:00 |
|
Yvonne Schmidt
|
7acf448c0c
|
added documentation for MonopolyApp
|
2024-12-02 03:44:33 +01:00 |
|
Johannes Schmelz
|
bcf4956d2d
|
TradeReplay popup
|
2024-12-02 03:16:50 +01:00 |
|
Johannes Schmelz
|
13754c843a
|
clean up
|
2024-12-02 03:03:42 +01:00 |
|
Johannes Schmelz
|
4743a6882c
|
fixed testing env
|
2024-12-02 03:02:05 +01:00 |
|
Johannes Schmelz
|
2dbc727728
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 03:00:28 +01:00 |
|
Johannes Schmelz
|
560bedc80b
|
mortage
|
2024-12-02 03:00:22 +01:00 |
|
Johannes Schmelz
|
7ace959f1f
|
sellHouse
|
2024-12-02 02:48:06 +01:00 |
|
Yvonne Schmidt
|
95dc7b07e2
|
fixed typos
|
2024-12-02 02:40:53 +01:00 |
|
Yvonne Schmidt
|
fa20a6cb2a
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-02 01:50:20 +01:00 |
|
Yvonne Schmidt
|
36b308e616
|
fixed TradeMenu formating
|
2024-12-02 01:49:56 +01:00 |
|
Johannes Schmelz
|
b912835edb
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 01:37:37 +01:00 |
|
Johannes Schmelz
|
add5dab611
|
buyHouse complete
|
2024-12-02 01:37:32 +01:00 |
|
Johannes Schmelz
|
5172766216
|
cleanup
|
2024-12-02 01:34:43 +01:00 |
|
Yvonne Schmidt
|
fcb55e52fc
|
fixed esc in BuildingAdminMenu
|
2024-12-02 01:11:38 +01:00 |
|
Yvonne Schmidt
|
411f7ea25b
|
added selector and selection display to RepayMortage
|
2024-12-02 01:06:58 +01:00 |
|
Yvonne Schmidt
|
e05ad71fff
|
added selector and selection display to TakeMortage
|
2024-12-02 01:03:55 +01:00 |
|
Yvonne Schmidt
|
d08a172227
|
added selector and selection display to SellHouse
|
2024-12-02 00:59:10 +01:00 |
|
Johannes Schmelz
|
4fff8394d9
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-02 00:48:53 +01:00 |
|
Johannes Schmelz
|
5bb438c221
|
working selector
|
2024-12-02 00:47:06 +01:00 |
|
Simon Wilkening
|
a753017fcd
|
Rent relabeled
|
2024-12-01 23:52:25 +01:00 |
|
Yvonne Schmidt
|
5522be228b
|
added selection display
|
2024-12-01 23:22:19 +01:00 |
|
Johannes Schmelz
|
3b729c9a04
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 23:12:51 +01:00 |
|
Johannes Schmelz
|
eda2fcd327
|
jail logic complete
|
2024-12-01 23:11:02 +01:00 |
|
Simon Wilkening
|
09e12fc610
|
GulagInfo renamed
|
2024-12-01 22:08:28 +01:00 |
|
Johannes Schmelz
|
93152f4073
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 21:55:10 +01:00 |
|
Johannes Schmelz
|
17a1d3fbbb
|
fixed rent
|
2024-12-01 21:55:06 +01:00 |
|
Yvonne Schmidt
|
a0e2b6e8e2
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-01 21:54:30 +01:00 |
|
Yvonne Schmidt
|
79a08a0c9e
|
replaced listbox in sellHouse with a selector
|
2024-12-01 21:53:53 +01:00 |
|
Simon Wilkening
|
a24d6fd4b6
|
BuildingFields corrected
|
2024-12-01 21:44:14 +01:00 |
|
Johannes Schmelz
|
f220aeb78c
|
resolve merge
|
2024-12-01 21:42:05 +01:00 |
|
Luca Puderbach
|
85e0c68a36
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 21:33:18 +01:00 |
|
Luca Puderbach
|
113e1b7aa5
|
Spieler Bewegungs hochdatum
|
2024-12-01 21:33:07 +01:00 |
|
Johannes Schmelz
|
cfcc232432
|
trigger Bankrupt PopUp
|
2024-12-01 21:30:55 +01:00 |
|
Johannes Schmelz
|
29e9b54cc4
|
trigger NoMoneyPopUp
|
2024-12-01 21:24:33 +01:00 |
|
Yvonne Schmidt
|
0c90d1f185
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-01 21:19:20 +01:00 |
|
Yvonne Schmidt
|
b5090ea179
|
fixed overlapping with propertycard
|
2024-12-01 21:18:57 +01:00 |
|
Johannes Schmelz
|
cfbf20f745
|
payBail
|
2024-12-01 20:55:58 +01:00 |
|
Johannes Schmelz
|
dd002746aa
|
trigger winner and looser popup
|
2024-12-01 20:52:29 +01:00 |
|
Johannes Schmelz
|
11f4560745
|
du kommst ins Gulag Popup
|
2024-12-01 20:31:29 +01:00 |
|
Johannes Schmelz
|
b702e3a14d
|
first tests
|
2024-12-01 20:12:36 +01:00 |
|
Johannes Schmelz
|
3b2cfad774
|
fixed TradeConfrim
|
2024-12-01 19:20:34 +01:00 |
|
Johannes Schmelz
|
9164dc6893
|
formatting
|
2024-12-01 18:37:53 +01:00 |
|
Simon Wilkening
|
d3cf36ecb1
|
BuildingFields corrected
|
2024-12-01 18:23:20 +01:00 |
|
Johannes Schmelz
|
7d0a0123e0
|
server side logic for propertyAdmin
|
2024-12-01 18:17:46 +01:00 |
|
Johannes Schmelz
|
2f025e2e1a
|
sort according to id
|
2024-12-01 17:51:24 +01:00 |
|
Luca Puderbach
|
9bf9e8406b
|
model pfad gefixt
|
2024-12-01 16:29:25 +01:00 |
|
Johannes Schmelz
|
6bd1ed6e3a
|
earnMoney with event card movement
|
2024-12-01 16:05:57 +01:00 |
|
Johannes Schmelz
|
0f6205fbc7
|
fixed topDialog
|
2024-12-01 15:57:33 +01:00 |
|
Johannes Schmelz
|
f2a6888fb2
|
fixed JailState
|
2024-12-01 15:50:09 +01:00 |
|
Johannes Schmelz
|
5143e21ba6
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 13:53:55 +01:00 |
|
Johannes Schmelz
|
26dc24a1f4
|
fixed verhandeln
|
2024-12-01 13:53:50 +01:00 |
|
Luca Puderbach
|
350c157493
|
Figuren Animationen
|
2024-12-01 05:38:27 +01:00 |
|
Luca Puderbach
|
51b879a7c8
|
Figuren Bewegung eingefügt
|
2024-12-01 05:05:11 +01:00 |
|
Luca Puderbach
|
528126aa29
|
Kleines Ereigniskarten update
|
2024-12-01 05:04:27 +01:00 |
|
Luca Puderbach
|
73bfafa7f7
|
Anpassungen Ereigniskarten
|
2024-12-01 03:00:30 +01:00 |
|
Luca Puderbach
|
686a12e465
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 02:47:34 +01:00 |
|
Luca Puderbach
|
358beacc65
|
Mozzarella Update
|
2024-12-01 02:47:30 +01:00 |
|
Johannes Schmelz
|
69db0aa29b
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 02:47:12 +01:00 |
|
Johannes Schmelz
|
20f44ad2d4
|
fixed San cost
|
2024-12-01 02:40:12 +01:00 |
|
Simon Wilkening
|
d73c5e0904
|
Farben angepasst
|
2024-12-01 02:23:50 +01:00 |
|
Johannes Schmelz
|
f322e9bd8f
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 02:14:13 +01:00 |
|
Johannes Schmelz
|
b8e1645eb8
|
fixed player movement and go money
|
2024-12-01 02:14:09 +01:00 |
|
Simon Wilkening
|
73a908cd71
|
PorpertyOverwiev gerettet
|
2024-12-01 02:10:10 +01:00 |
|
Johannes Schmelz
|
a6b7ea4ce8
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 02:08:20 +01:00 |
|
Johannes Schmelz
|
4af08ffffd
|
fix trade reject
|
2024-12-01 02:07:39 +01:00 |
|
Yvonne Schmidt
|
dc66fd7384
|
changed font colors and sizes
|
2024-12-01 01:48:09 +01:00 |
|
Simon Wilkening
|
16ff61264b
|
BuyHouse etc. aktualisiert
|
2024-12-01 00:47:12 +01:00 |
|
Luca Puderbach
|
f3ec17b0b1
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 00:39:05 +01:00 |
|
Luca Puderbach
|
1c31915627
|
Werkzeugbank Rand
|
2024-12-01 00:39:00 +01:00 |
|
Yvonne Schmidt
|
79c96677bd
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-12-01 00:35:27 +01:00 |
|
Yvonne Schmidt
|
54118071cb
|
fixed popup overlap
|
2024-12-01 00:34:57 +01:00 |
|
Johannes Schmelz
|
2e28b54936
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-12-01 00:30:55 +01:00 |
|
Johannes Schmelz
|
f333e2d2c0
|
button function
|
2024-12-01 00:30:50 +01:00 |
|
Yvonne Schmidt
|
b89d40b39f
|
fixed nullPointer
|
2024-12-01 00:14:04 +01:00 |
|
Yvonne Schmidt
|
488ae154cf
|
fixed overlapping popups
|
2024-11-30 23:26:37 +01:00 |
|
Johannes Schmelz
|
c1e501c271
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-30 22:39:12 +01:00 |
|
Johannes Schmelz
|
89d5185c91
|
rent popup fixed
|
2024-11-30 22:39:08 +01:00 |
|
Simon Wilkening
|
f4bf38bca1
|
AcceptTrade, RejectTrade und NoMoneyWarning hinzugefügt
|
2024-11-30 22:01:35 +01:00 |
|
Johannes Schmelz
|
b87b3f054b
|
trigger rent popup
|
2024-11-30 21:49:16 +01:00 |
|
Johannes Schmelz
|
f6137b8b68
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-30 20:50:40 +01:00 |
|
Johannes Schmelz
|
87309235bd
|
trade logic complete
|
2024-11-30 20:50:36 +01:00 |
|
Simon Wilkening
|
d37017bfa0
|
Winner and Looser Popup close the game again
|
2024-11-30 20:33:08 +01:00 |
|
Simon Wilkening
|
5d6440bd50
|
Eventcards korrigiert
|
2024-11-30 20:20:43 +01:00 |
|
Johannes Schmelz
|
a70295f1ff
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-30 15:15:35 +01:00 |
|
Johannes Schmelz
|
b681b13468
|
send Trades
|
2024-11-30 15:15:30 +01:00 |
|
Johannes Schmelz
|
2c536f32cf
|
fixed close on FoodField
|
2024-11-30 15:14:58 +01:00 |
|
Yvonne Schmidt
|
991fe5280f
|
centered account values
|
2024-11-30 01:03:11 +01:00 |
|
Yvonne Schmidt
|
174fe5cfb3
|
resized LooserPopUp
|
2024-11-30 00:58:24 +01:00 |
|
Yvonne Schmidt
|
119284f256
|
resized WinnerPopUp
|
2024-11-30 00:40:58 +01:00 |
|
Yvonne Schmidt
|
05680af726
|
fixed BuildingAdminMenu
|
2024-11-29 23:07:58 +01:00 |
|
Johannes Schmelz
|
fba82f670b
|
fixed jailState
|
2024-11-29 19:21:27 +01:00 |
|
Johannes Schmelz
|
afa2ebd004
|
set correct translation
|
2024-11-29 19:04:00 +01:00 |
|
Johannes Schmelz
|
f0eeff3493
|
update view
|
2024-11-29 18:27:25 +01:00 |
|
Johannes Schmelz
|
44d64c4e0f
|
trigger timeoutPopup
|
2024-11-29 17:42:10 +01:00 |
|
Johannes Schmelz
|
86ece3b70d
|
fixed move logic
|
2024-11-29 16:44:28 +01:00 |
|
Simon Wilkening
|
6cdad71693
|
Gulag und Rent erstellt
|
2024-11-29 08:57:11 +01:00 |
|
Simon Wilkening
|
cf6d5ea22e
|
BuyHouse, RepayMortage und TakeMortage erstellt
|
2024-11-29 08:27:51 +01:00 |
|
Yvonne Schmidt
|
ecf227daa6
|
added colored strip to toolbar
|
2024-11-29 07:42:59 +01:00 |
|
Luca Puderbach
|
4b5a156865
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-29 07:22:51 +01:00 |
|
Luca Puderbach
|
cfae369fd3
|
Anzeige Spielerfarbe + Figur Pos
|
2024-11-29 07:22:46 +01:00 |
|
Simon Wilkening
|
b05eabbbf8
|
Verschiedene Popups kommentiert und richtig benannt
|
2024-11-29 07:21:28 +01:00 |
|
Simon Wilkening
|
fd178eee43
|
Merge remote-tracking branch 'origin/gui' into gui
# Conflicts:
# Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/ConfirmTrade.java
|
2024-11-29 07:16:21 +01:00 |
|
Simon Wilkening
|
aef2ef34fb
|
Verschiedene Popups kommentiert und richtig benannt
|
2024-11-29 07:14:44 +01:00 |
|
Johannes Schmelz
|
fcbffa1189
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-29 07:11:24 +01:00 |
|
Johannes Schmelz
|
0d8240381e
|
fixed some mistakes
|
2024-11-29 07:11:20 +01:00 |
|
Yvonne Schmidt
|
77da6679ef
|
added another label styling
|
2024-11-29 06:55:59 +01:00 |
|
Yvonne Schmidt
|
5845254caa
|
added new label styling
|
2024-11-29 06:47:26 +01:00 |
|
Yvonne Schmidt
|
5d92d7cfcc
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-29 06:42:56 +01:00 |
|
Yvonne Schmidt
|
67f6649242
|
added selector with no integration
|
2024-11-29 06:34:42 +01:00 |
|
Johannes Schmelz
|
1438ae5e4f
|
improve position calc
|
2024-11-29 06:26:09 +01:00 |
|
Johannes Schmelz
|
01c351e64b
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-29 06:23:12 +01:00 |
|
Johannes Schmelz
|
b0c21dfcb8
|
added trigger for winner looser popup
|
2024-11-29 06:23:08 +01:00 |
|
Simon Wilkening
|
f4cddbc87f
|
Bankrott-Warnung und Timeout-Warning kommentiert und richtig benannt
|
2024-11-29 06:20:23 +01:00 |
|
Luca Puderbach
|
cfce176c82
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-29 06:20:03 +01:00 |
|
Luca Puderbach
|
782b1a10c3
|
Kleine model Changes
|
2024-11-29 06:19:58 +01:00 |
|
Johannes Schmelz
|
2d9cd0e4e1
|
resolve merge conflict
|
2024-11-29 06:17:57 +01:00 |
|
Johannes Schmelz
|
908ba09e2a
|
more models
|
2024-11-29 05:58:28 +01:00 |
|
Johannes Schmelz
|
4a84ef4b3c
|
more models
|
2024-11-29 05:58:15 +01:00 |
|
Johannes Schmelz
|
f3353327dd
|
added first models
|
2024-11-29 05:56:39 +01:00 |
|
Johannes Schmelz
|
316433f592
|
resolve merge conflicts
|
2024-11-29 05:33:03 +01:00 |
|
Yvonne Schmidt
|
1ccdea0c87
|
Merge remote-tracking branch 'origin/gui' into gui
|
2024-11-29 05:16:44 +01:00 |
|
Yvonne Schmidt
|
7d9af0c4c7
|
added selector to SellHouse
|
2024-11-29 05:16:33 +01:00 |
|
Simon Wilkening
|
a1247cdae5
|
Bankrott-Warnung und Timeout-Warning erstellt erstellt
|
2024-11-29 05:11:24 +01:00 |
|
Luca Puderbach
|
5696192cce
|
Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui
|
2024-11-29 04:41:14 +01:00 |
|
Luca Puderbach
|
91826b730f
|
Lade Figuren auf Spielbrett
|
2024-11-29 04:35:16 +01:00 |
|
Johannes Schmelz
|
48b1cf817a
|
refactor
|
2024-11-29 04:32:57 +01:00 |
|
Johannes Schmelz
|
94ba9f0af2
|
rudimentary function for trade
|
2024-11-29 03:07:17 +01:00 |
|
Yvonne Schmidt
|
333f27a016
|
modified toolbar button behaviour
|
2024-11-28 23:41:45 +01:00 |
|
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 |
|
Johannes Schmelz
|
9e595b92ba
|
crash when rolling dice and waitForTurn removed
|
2024-11-27 23:19:25 +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 |
|
Johannes Schmelz
|
c71e8b1e8e
|
removed hostplayer as hostplayer always has id 0
|
2024-11-26 18:48:13 +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
|
6eeb6fd209
|
Properties_de übersetzt
|
2024-11-26 15:29:45 +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 |
|