Fleischer Hanno
|
a7e048d4b4
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 23:08:50 +01:00 |
|
Felix Koppe
|
bcd510804f
|
Merge commit
|
2024-12-01 23:12:46 +01:00 |
|
Felix Koppe
|
7319f7a62c
|
Process startMenuNotification in lobby
|
2024-12-01 23:12:36 +01:00 |
|
Felix Koppe
|
bec199036c
|
Minor change
|
2024-12-01 23:10:25 +01:00 |
|
Fleischer Hanno
|
a1e51fb2f4
|
added logic to the leave game method
|
2024-12-01 23:08:25 +01:00 |
|
Daniel Grigencha
|
f15d0eb5d8
|
Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development
|
2024-12-01 23:06:31 +01:00 |
|
Daniel Grigencha
|
f484a4abc8
|
Updated server states.
Updated server stats by adding the logger to all states. In Addition, new joined clients should be updated correctly.
|
2024-12-01 23:06:02 +01:00 |
|
Felix Koppe
|
5905a232a5
|
Adjust state
|
2024-12-01 23:03:26 +01:00 |
|
Cedric Beck
|
12cb87ef70
|
added outline package back
|
2024-12-01 22:56:09 +01:00 |
|
Cedric Beck
|
9cb7a156bb
|
Merge branch 'development' into dev/client_beck
|
2024-12-01 22:47:48 +01:00 |
|
Fleischer Hanno
|
76e2606847
|
reverted the client state machine
|
2024-12-01 22:47:13 +01:00 |
|
Cedric Beck
|
7762b97303
|
added init & taktical view by ownColor
|
2024-12-01 22:46:17 +01:00 |
|
Daniel Grigencha
|
eaf46f3e14
|
updated the project to pass the checkstyle
|
2024-12-01 22:37:49 +01:00 |
|
Fleischer Hanno
|
92be52b62a
|
fixed server join logic
|
2024-12-01 22:33:30 +01:00 |
|
Fleischer Hanno
|
7a0a3589a5
|
trying to fix server ip to use outward ip
|
2024-12-01 22:14:09 +01:00 |
|
Cedric Beck
|
661c28f096
|
merge to dev/client_beck from development
|
2024-12-01 22:06:30 +01:00 |
|
Cedric Beck
|
4a94e85aac
|
Merge branch 'dev/client' into dev/client_beck
|
2024-12-01 21:55:37 +01:00 |
|
Felix Koppe
|
799bd096a0
|
Merge development
|
2024-12-01 21:56:52 +01:00 |
|
Cedric Beck
|
63fa692910
|
removed comments
|
2024-12-01 21:52:28 +01:00 |
|
Felix Koppe
|
638cb93d7b
|
Merge dev/client_beck
|
2024-12-01 21:51:01 +01:00 |
|
Cedric Beck
|
7db75a2ca1
|
added converted assets
|
2024-12-01 21:48:40 +01:00 |
|
Cedric Beck
|
da2b1af698
|
fixed shutdown guiHandler bug
|
2024-12-01 20:45:24 +01:00 |
|
Cedric Beck
|
e5b007accd
|
debug commit
|
2024-12-01 20:24:26 +01:00 |
|
Cedric Beck
|
c08c81ea46
|
edited map
|
2024-12-01 18:42:57 +01:00 |
|
Cedric Beck
|
453aacfe1a
|
fixed missing messages
|
2024-12-01 18:12:31 +01:00 |
|
Cedric Beck
|
2732a89da6
|
fixed error with SelectObjectOutliner
|
2024-12-01 17:47:04 +01:00 |
|
Felix Koppe
|
21f98de3e6
|
Minor adjustment
|
2024-12-01 17:32:05 +01:00 |
|
Cedric Beck
|
b099972656
|
merge from dev/client_beck
|
2024-12-01 17:10:04 +01:00 |
|
Cedric Beck
|
eb703cbd2c
|
fixed bad performancegit status!; edited GameNotification; fixed error because of changed 'Color' enum
|
2024-12-01 17:03:09 +01:00 |
|