merge the new developmentbranch into the test branch #39

Closed

j23f0712 wants to merge 431 commits from development2 into dev/test

pull from: development2

merge into: peet:dev/test

peet:main

peet:development

peet:dev/server_h

peet:dev/client_beck

peet:dev/model

peet:dev/client_koppe2

peet:dev/test

peet:dev/client

peet:dev/client_koppe

peet:dev_client

peet:view_assets

peet:b_Beck_Cedric

peet:b_Grigencha_Daniel

peet:b_Brennfoerder_Timo

peet:b_Feyer_Benjamin

peet:b_Fleischer_Hanno

peet:b_koppe_felix

peet:b_Bauer_Lukas

Conversation 1 Commits 431 Files Changed 269

4 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files Hide outdated comments

Showing only changes of commit 8422b7be1e - Show all commits

BIN

Projekte/mdga/client/src/main/resources/Images/handcard.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 0 B After Width:  |  Height:  |  Size: 12 KiB

BIN

Projekte/mdga/client/src/main/resources/Images/particle/particle_cir.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 0 B After Width:  |  Height:  |  Size: 6.2 KiB

BIN

Projekte/mdga/client/src/main/resources/Sounds/mixkit-war-field-explosion-1702.wav

Binary file not shown.

BIN

Projekte/mdga/client/src/main/resources/Sounds/thunder.wav

Binary file not shown.