Felix Koppe
|
184410ba31
|
Merge commit
|
2024-11-29 14:38:23 +01:00 |
|
Felix Koppe
|
3147f5b7a3
|
Fix some errors
|
2024-11-29 14:37:46 +01:00 |
|
Felix Koppe
|
0e79f35cb0
|
Merge dev/client_koppe2
|
2024-11-29 14:02:59 +01:00 |
|
Felix Koppe
|
f024ba4866
|
Add preferences and sounds
|
2024-11-29 14:01:18 +01:00 |
|
Felix Koppe
|
35270cce7b
|
Fix ceremony statistics error
|
2024-11-29 12:49:07 +01:00 |
|
Felix Koppe
|
b0761082ce
|
Fix error after merge
|
2024-11-29 12:42:03 +01:00 |
|
Felix Koppe
|
46182b33a8
|
Merge dev/client_koppe2 and development
|
2024-11-29 12:36:07 +01:00 |
|
Felix Koppe
|
457023ad93
|
Work
|
2024-11-29 12:30:59 +01:00 |
|
Felix Koppe
|
c3055a0646
|
Work
|
2024-11-29 12:29:20 +01:00 |
|
Felix Koppe
|
ae1ec74056
|
Merge dev/client_beck
|
2024-11-29 10:48:05 +01:00 |
|
Felix Koppe
|
24cc81d9d4
|
Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2
# Conflicts:
# Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
|
2024-11-29 10:13:15 +01:00 |
|
Felix Koppe
|
c25c12d0d6
|
Work on ceremony2
|
2024-11-29 09:45:36 +01:00 |
|
Felix Koppe
|
7b689d6bf6
|
Work on ceremony
|
2024-11-28 21:39:08 +01:00 |
|
Cedric Beck
|
2099e02567
|
added board dice; edited DiceControl; added high-res font; working on ActionTextHandler
|
2024-11-28 20:07:15 +01:00 |
|
Fleischer Hanno
|
7690340b8f
|
added mor client state transitions
and renamed every client state with state as its suffix and renamed every message with messag as its suffix
|
2024-11-28 18:28:55 +01:00 |
|
Cedric Beck
|
3dcdbdf489
|
added display of 'colorÃ' to playerName
|
2024-11-28 17:29:59 +01:00 |
|
Felix Koppe
|
88cb87d4cd
|
Merge commit
|
2024-11-28 16:25:57 +01:00 |
|
Felix Koppe
|
827e7aac86
|
Add stuff
|
2024-11-28 16:25:13 +01:00 |
|
Felix Koppe
|
eec68188ee
|
Make use of parallelProjection
|
2024-11-28 16:08:33 +01:00 |
|
Hanno Fleischer
|
476ca82bda
|
created the first part of the cliejnt state machine with its corresponding logic
|
2024-11-28 15:27:31 +01:00 |
|
Felix Koppe
|
3235a46788
|
Rewrite gui
|
2024-11-28 15:00:53 +01:00 |
|
Cedric Beck
|
7da388af37
|
added improved pieces model; added functionality to notifications + todos
|
2024-11-28 02:08:51 +01:00 |
|
Cedric Beck
|
304acf17a3
|
added full highlight functionality for bonuscards; added bonus Symbols display
|
2024-11-28 01:21:15 +01:00 |
|
Cedric Beck
|
9736dc828b
|
added highlight to bonuscards
|
2024-11-27 19:50:29 +01:00 |
|
Hanno Fleischer
|
cbbef16374
|
added two more todos
|
2024-11-27 09:20:22 +01:00 |
|
Hanno Fleischer
|
c9362a7a95
|
fixed bugs so the programm would start and added some Todo where code is missing or was fraudulent
|
2024-11-27 09:19:57 +01:00 |
|
Cedric Beck
|
0b9fc90274
|
added dice, started adding notification implementation, added hover, highlight and select functionality for pieces
|
2024-11-27 03:05:35 +01:00 |
|
Daniel Grigencha
|
20c9000d56
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-26 23:29:02 +01:00 |
|
Daniel Grigencha
|
5a911326ba
|
minor changes to the server state automaton
|
2024-11-26 23:28:49 +01:00 |
|
Cedric Beck
|
6528e5c2b6
|
started adding notifications
|
2024-11-26 20:53:29 +01:00 |
|
Hanno Fleischer
|
621bb9efae
|
fixed bugs inside of the client state machine and the message UpdateTSK
|
2024-11-26 20:31:16 +01:00 |
|
Fleischer Hanno
|
84c289cfd1
|
implemented all methods required for the state pattern in the client and adjusted the messages to work with player ids instead of names
|
2024-11-26 20:04:58 +01:00 |
|
Fleischer Hanno
|
f827757ad1
|
added next method for Color
|
2024-11-26 18:16:19 +01:00 |
|
Daniel Grigencha
|
e4a9b16fd5
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-26 18:12:32 +01:00 |
|
Daniel Grigencha
|
d63d0cc2a0
|
changed default constructor of 'Player' class
|
2024-11-26 18:12:08 +01:00 |
|
Hanno Fleischer
|
a127ee524a
|
Merge remote-tracking branch 'origin/development' into development
# Conflicts:
# Projekte/.run/MdgaApp.run.xml
|
2024-11-26 18:05:37 +01:00 |
|
Hanno Fleischer
|
5c2df2430d
|
reworked the client state machine and removed the seperate classes for the statemachines
these machines are now directly included in the parent states
|
2024-11-26 18:04:56 +01:00 |
|
Daniel Grigencha
|
2e76c41d3a
|
added new 'Disconnect' client message and updated 'Player' and 'Game' classes
|
2024-11-26 18:02:19 +01:00 |
|
Cedric Beck
|
c204a3a4cb
|
change shader folder structure
|
2024-11-26 17:05:38 +01:00 |
|
Cedric Beck
|
d794ba9d03
|
added smooth outline
|
2024-11-26 16:54:40 +01:00 |
|
Cedric Beck
|
e97147d0e9
|
merge from koppe
|
2024-11-26 16:47:24 +01:00 |
|
Cedric Beck
|
1b151aabdd
|
added select nodes, cards & pieces
|
2024-11-26 16:45:13 +01:00 |
|
Felix
|
3e7d3dbc1b
|
Fix
|
2024-11-26 16:18:33 +01:00 |
|
Cedric Beck
|
7a482b74ab
|
fixed shaders in/out
|
2024-11-26 13:29:40 +01:00 |
|
Cedric Beck
|
5cc1888794
|
merge dev/client_koppe into dev/client_beck for camera movement
|
2024-11-26 13:13:32 +01:00 |
|
Cedric Beck
|
9dd70a96a0
|
added outline for bonuscards
|
2024-11-26 12:56:26 +01:00 |
|
Cedric Beck
|
80f5c4ce90
|
tried adding shield outline, but there is a bug -> black screen
|
2024-11-26 07:40:41 +01:00 |
|
Fleischer Hanno
|
7eafa3da39
|
refactored the whole client package structure
|
2024-11-25 17:43:29 +01:00 |
|
Fleischer Hanno
|
7178935553
|
refactored the model to incoporate a correct folder structure
|
2024-11-25 16:41:44 +01:00 |
|
Daniel Grigencha
|
0b538efbfb
|
Merge remote-tracking branch 'origin/development' into development
|
2024-11-25 16:36:53 +01:00 |
|