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 |
|
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
|
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 |
|
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
|
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 |
|
Daniel Grigencha
|
06195854d8
|
added mdga server controller
|
2024-11-25 16:35:49 +01:00 |
|
Felix
|
96489f2454
|
Minor work
|
2024-11-25 16:32:16 +01:00 |
|
Felix
|
439231aecf
|
Add rotateable cam
|
2024-11-25 16:15:59 +01:00 |
|
Felix
|
8982662f5b
|
Remove debug statement
|
2024-11-25 14:01:06 +01:00 |
|
Felix
|
d70efb32ea
|
Fix audio settings
|
2024-11-25 13:59:55 +01:00 |
|
Cedric Beck
|
b9986ded87
|
try push
|
2024-11-24 22:41:17 +01:00 |
|
Cedric Beck
|
fd09460d61
|
try push
|
2024-11-24 22:40:50 +01:00 |
|
Cedric Beck
|
e5dca013d1
|
try push
|
2024-11-24 22:38:23 +01:00 |
|
Cedric Beck
|
7bfc6e7c3e
|
try push
|
2024-11-24 22:37:37 +01:00 |
|
Cedric Beck
|
10428deedd
|
added resource restructuring
|
2024-11-24 19:54:29 +01:00 |
|
Cedric Beck
|
a196d3d7f2
|
added basic player name display
|
2024-11-24 19:49:54 +01:00 |
|
Cedric Beck
|
9ab71bfaf6
|
merge dev/client_koppe into dev/client
|
2024-11-24 10:34:48 +01:00 |
|
Cedric Beck
|
ccad47f95a
|
Merge branch 'dev/client' into dev/client_koppe
|
2024-11-24 10:32:00 +01:00 |
|
Cedric Beck
|
c8c0188452
|
merge dev/client into dev/client_koppe
|
2024-11-24 10:30:37 +01:00 |
|
Cedric Beck
|
11794b6ac7
|
added GuiHandler and showing bonuscards
|
2024-11-24 09:21:44 +01:00 |
|
Cedric Beck
|
7368014b10
|
merge dev/client into dev/client_beck
|
2024-11-22 20:38:00 +01:00 |
|
Cedric Beck
|
ebdedc6494
|
added working piece outline; added final tweaks for boardHandler
|
2024-11-22 19:53:32 +01:00 |
|
Cedric Beck
|
00014eeb09
|
tried fixing outline problem
|
2024-11-22 13:56:43 +01:00 |
|
Felix
|
a79a315f83
|
Minor work
|
2024-11-21 16:44:28 +01:00 |
|
Felix
|
c470c205e4
|
Add host&join menu and work on modelSyncronizer
|
2024-11-21 16:16:19 +01:00 |
|