peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-12-01 22:49:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
208 Commits 16 Branches 0 Tags 318 MiB
7b3f31f099
Commit Graph

208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yvonne Schmidt
7b3f31f099 Merge remote-tracking branch 'origin/connect' into connect 
# Conflicts:
#	Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/CreateGameMenu.java
 2024-11-25 02:48:26 +01:00
Johannes Schmelz
ed105f1b70 cleanup 2024-11-25 02:43:58 +01:00
Yvonne Schmidt
cd4331aee3 added header to CreateGameMenu 2024-11-25 02:43:08 +01:00
Yvonne Schmidt
acc797f2ff Merge remote-tracking branch 'origin/connect' into connect 2024-11-25 02:12:01 +01:00
Yvonne Schmidt
853c32a5b8 fixed Buttons 2024-11-25 02:11:05 +01:00
Johannes Schmelz
72bef7143a serialize messages 2024-11-25 02:05:56 +01:00
Yvonne Schmidt
b1ed571950 added background to CreateGameMenu 2024-11-25 02:01:38 +01:00
Johannes Schmelz
1a75d6d6a8 buttons now work as intended 2024-11-25 01:51:27 +01:00
Yvonne Schmidt
c990e7b562 added button sounds 2024-11-25 01:50:52 +01:00
Johannes Schmelz
c87406f60e fixed esc menu 2024-11-25 00:52:10 +01:00
Johannes Schmelz
21914a1294 fixed startmenu 2024-11-25 00:33:05 +01:00
Johannes Schmelz
a344145732 fixed sounds 2024-11-25 00:28:42 +01:00
Yvonne Schmidt
a27ac31086 Merge remote-tracking branch 'origin/connect' into connect 2024-11-25 00:24:43 +01:00
Yvonne Schmidt
9a7f75b76b added effect sound slider 2024-11-25 00:24:25 +01:00
Johannes Schmelz
3e487c00d5 accidentally deleted volumeSlider 2024-11-24 23:29:59 +01:00
Johannes Schmelz
4820b8cf46 added looser popup 2024-11-24 23:28:04 +01:00
Johannes Schmelz
caa4cb5262 winner popup 2024-11-24 23:23:56 +01:00
Johannes Schmelz
1b2a7d73b5 extend dialog 2024-11-24 22:41:53 +01:00
Johannes Schmelz
55778dbcea removed the buttons on start 2024-11-24 22:29:19 +01:00
Johannes Schmelz
422faec281 send player ready 2024-11-24 22:06:19 +01:00
Johannes Schmelz
dcf10e0819 automatically join lobby when selfhosting 2024-11-24 21:36:03 +01:00
Johannes Schmelz
6b78733a5d fixed server join 2024-11-24 21:30:18 +01:00
Johannes Schmelz
c124a99901 fixed screen size 2024-11-24 21:29:41 +01:00
Johannes Schmelz
d7df4002da lobby menu 2024-11-24 21:01:57 +01:00
Johannes Schmelz
8b0ef97a82 connect menu cow working 2024-11-24 20:52:29 +01:00
Johannes Schmelz
75d3bef5c8 move start menu 2024-11-24 20:42:07 +01:00
Johannes Schmelz
c2d5611ab9 changed settings menu to match 2024-11-24 19:10:59 +01:00
Johannes Schmelz
fb28f3fefc tmp settings menu fix 2024-11-24 19:02:56 +01:00
Johannes Schmelz
6a34dab00c changed app to match battleship 2024-11-24 18:27:41 +01:00
Johannes Schmelz
c7bd7d18b7 removed bodged server connection 2024-11-24 18:03:22 +01:00
Johannes Schmelz
437114704a get client id 2024-11-24 17:20:35 +01:00
Johannes Schmelz
9b4cac4e56 send PlayerHandler when starting game 2024-11-24 16:51:00 +01:00
Johannes Schmelz
e780513b35 saving the players 2024-11-24 00:32:16 +01:00
Johannes Schmelz
d582c59a7d added playerState changes 2024-11-24 00:29:48 +01:00
Johannes Schmelz
7d2c85f617 fixed card bug 2024-11-24 00:13:32 +01:00
Johannes Schmelz
4a882bc4ac Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-24 00:11:18 +01:00
Johannes Schmelz
3c4eac1fcd added logic for visiting event field 2024-11-24 00:11:14 +01:00
Yvonne Schmidt
75d5a15bdb defaultwerte in die Lobby eingefügt 2024-11-23 23:19:53 +01:00
Yvonne Schmidt
17f121f7d1 Merge remote-tracking branch 'origin/gui' into gui 2024-11-23 23:15:04 +01:00
Johannes Schmelz
a66c570b51 remove 2d map view 2024-11-23 23:09:02 +01:00
Yvonne Schmidt
e1e7f2eaf6 überschneidungen von elementen beseitigt 2024-11-23 23:07:42 +01:00
Johannes Schmelz
46d2dce372 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-11-23 22:12:39 +01:00
Johannes Schmelz
c39f1f6d4c tweaked camera params 2024-11-23 22:12:34 +01:00
Yvonne Schmidt
738b04f2d9 oberfläche der lobby fertig 2024-11-23 21:29:14 +01:00
Simon Wilkening
ecba1c3135 GateField korrigiert 2024-11-23 21:22:54 +01:00
Johannes Schmelz
748226f4ed added Move Camera based on player position 2024-11-23 19:27:04 +01:00
Johannes Schmelz
f658f53ba9 refactor 2024-11-23 19:26:36 +01:00
Johannes Schmelz
4a8304ee4f relabled FoodField 2024-11-23 18:53:29 +01:00
Simon Wilkening
7fe9604338 FoodField korrigiert 2024-11-23 18:28:28 +01:00
Johannes Schmelz
7f09a6dae8 refactor 2024-11-23 18:02:46 +01:00