Cedric Beck
|
389d1b6056
|
merge development into dev/client_beck
|
2024-12-07 17:04:43 +01:00 |
|
Cedric Beck
|
e5abcbdc8c
|
added jet_noGear.j3o
|
2024-12-07 16:51:38 +01:00 |
|
Cedric Beck
|
e14b8cb510
|
added converted assets
|
2024-12-07 16:50:43 +01:00 |
|
Felix Koppe
|
0c42a2df88
|
Merge branch 'dev/client_beck' into development
# Conflicts:
# Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/AcousticHandler.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/MdgaSound.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/acoustic/SoundAsset.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/animation/JetAnimation.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
# Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java
|
2024-12-07 15:00:27 +01:00 |
|
Cedric Beck
|
6d3c733f91
|
added effect for shell flying
|
2024-12-07 14:45:39 +01:00 |
|
Cedric Beck
|
1a079dad44
|
added shell asset for ShellAnimation
|
2024-12-07 14:22:36 +01:00 |
|
Cedric Beck
|
32f49a6181
|
added shellAnimation without shell asset
|
2024-12-07 13:30:30 +01:00 |
|
Felix Koppe
|
236d3db930
|
Add ambience
|
2024-12-06 18:10:09 +01:00 |
|
Cedric Beck
|
29c6b13300
|
added MatrixAnimation
|
2024-12-06 17:09:06 +01:00 |
|
Felix Koppe
|
960a57caba
|
Fix broken lose sound
|
2024-12-06 13:28:38 +01:00 |
|
Felix Koppe
|
36631df2e9
|
Fix broken jet-sound
|
2024-12-06 13:26:28 +01:00 |
|
Felix Koppe
|
df27c23cd5
|
Fix shadercode
|
2024-12-06 13:19:17 +01:00 |
|
Felix Koppe
|
acd64d1507
|
Fix shadercode
|
2024-12-06 13:14:54 +01:00 |
|
Felix Koppe
|
7f5f4b8c68
|
Fix broken sound
|
2024-12-06 09:24:49 +01:00 |
|
Felix Koppe
|
7f3483aa6b
|
Add broken sound
|
2024-12-06 09:22:10 +01:00 |
|
Felix Koppe
|
f0b23ab9c2
|
Readd broken files
|
2024-12-06 09:10:47 +01:00 |
|
Felix Koppe
|
78f1dbb3d3
|
Remove broken files
|
2024-12-06 09:08:52 +01:00 |
|
Felix Koppe
|
8d398450f1
|
Minor changes
|
2024-12-05 22:15:59 +01:00 |
|
Felix Koppe
|
0a96dd6f9f
|
Repair sounds
|
2024-12-05 22:07:36 +01:00 |
|
Felix Koppe
|
e8a556de27
|
Add missle
|
2024-12-05 22:02:02 +01:00 |
|
Cedric Beck
|
f3816cb2a5
|
added particle_cir.png
|
2024-12-05 17:49:56 +01:00 |
|
Felix Koppe
|
ac5d7ed74b
|
Add sounds
|
2024-12-05 17:11:07 +01:00 |
|
Felix Koppe
|
4a7c23708c
|
Add jetAnimation
|
2024-12-05 16:21:13 +01:00 |
|
Cedric Beck
|
44ef21e6af
|
added handCard Num to playerName display + added remove card in guiHandler
|
2024-12-04 11:38:35 +01:00 |
|
Cedric Beck
|
aa651ec62f
|
added trees
|
2024-12-02 22:43:03 +01:00 |
|
Cedric Beck
|
7db75a2ca1
|
added converted assets
|
2024-12-01 21:48:40 +01:00 |
|
Cedric Beck
|
c08c81ea46
|
edited map
|
2024-12-01 18:42:57 +01:00 |
|
Felix Koppe
|
2c81665f80
|
Update startmenu.png
|
2024-12-01 14:22:18 +01:00 |
|
Felix Koppe
|
e6fb78507c
|
Remove garbarge files
|
2024-12-01 14:10:04 +01:00 |
|
Felix Koppe
|
c3ad8fe79a
|
Gerneral improvements
|
2024-12-01 13:35:14 +01:00 |
|
Felix Koppe
|
d53067f21a
|
Merge dev/client
|
2024-11-30 14:03:54 +01:00 |
|
Felix Koppe
|
8c8bd4db0d
|
Add sounds
|
2024-11-30 12:37:18 +01:00 |
|
Cedric Beck
|
f7a34d0d59
|
tried merge with dev/client
|
2024-11-30 12:34:39 +01:00 |
|
Cedric Beck
|
13690cf73d
|
added skybox; reworked guiHandler
|
2024-11-29 21:28:50 +01:00 |
|
Felix Koppe
|
f024ba4866
|
Add preferences and sounds
|
2024-11-29 14:01:18 +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
|
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 |
|
Cedric Beck
|
3dcdbdf489
|
added display of 'colorÃ' to playerName
|
2024-11-28 17:29:59 +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 |
|
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 |
|
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 |
|
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 |
|