Gruppe-01-fin

peet/Gruppe-01-fin

Fork 0

Commit Graph

Select branches

Hide Pull Requests

b_Bauer_Lukas

b_Beck_Cedric

b_Brennfoerder_Timo

b_Feyer_Benjamin

b_Fleischer_Hanno

b_Grigencha_Daniel

b_koppe_felix

dev/client

dev/client_beck

dev/client_koppe

dev/client_koppe2

dev/model

dev/server_h

dev/test

dev_client

development

development2

main

view_assets

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#5

#6

#7

#8

#9

Version1.0

Version1.1

Version1.1.1

b7a3790f81 added final Presentation main Fleischer Hanno 2024-12-17 16:46:20 +01:00
56112f01bb Update README.md Hanno Fleischer 2024-12-16 13:34:39 +00:00
75ce695029 Update README.md Hanno Fleischer 2024-12-16 11:24:35 +00:00
9af54051da Update README.md Hanno Fleischer 2024-12-16 11:24:24 +00:00
ccf77f052f repositioned Logger for server shutdown Version1.1.1 Hanno Fleischer 2024-12-16 12:14:09 +01:00
0d3e93b681 fixed test for state transition Hanno Fleischer 2024-12-16 12:12:21 +01:00
ab4c7159f3 Server now closes correctly when host is leaving Hanno Fleischer 2024-12-16 12:08:18 +01:00
61ea4c3276 the game will now create a new clg when entering the main view Fleischer Hanno 2024-12-16 11:38:31 +01:00
e8506e607c removed icon for app when using apple due to problems Fleischer Hanno 2024-12-16 11:23:27 +01:00
0c46477f01 Update README.md Hanno Fleischer 2024-12-15 10:04:49 +00:00
3ba1c62685 Merge branch 'development2' into 'main' Version1.1 Hanno Fleischer 2024-12-14 09:14:59 +00:00
82aa9f6a51 fixed double copunting of played cards and now calculating correct travled nodes Hanno Fleischer 2024-12-14 10:13:46 +01:00
9c9702b2c5 fixed setIcons; edited smoke particles; removed test code development2 Cedric Beck 2024-12-14 01:28:43 +01:00
d6ae8f3bdc Merge branch 'development2' into 'main' Hanno Fleischer 2024-12-13 20:54:51 +00:00
a3e6db6573 deleted unused modules; converted music Cedric Beck 2024-12-13 20:26:08 +01:00
c7cba412fe Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-13 14:24:33 +01:00
caa370fec2 added icon Cedric Beck 2024-12-13 14:23:45 +01:00
5c61c8c263 Merge branch 'main' into 'development2' Hanno Fleischer 2024-12-13 13:05:31 +00:00
d8eefeb348 renamed boardHandler methods Cedric Beck 2024-12-13 14:01:24 +01:00
3f07400cf8 fixed failing test, due to wrong assertions or missing messages, as well as rewriting the 'addBonusCards()' method in Game to not use duplicates Hanno Fleischer 2024-12-13 14:00:54 +01:00
e3ec2aaba8 added leave button logic to interrupt state Hanno Fleischer 2024-12-13 11:14:14 +01:00
70e31e15c7 added StartDialogTest and started PlayerTests Timo Brennförder 2024-12-13 10:58:13 +01:00
b891e78647 Add README.md Version1.0 Hanno Fleischer 2024-12-13 09:28:06 +00:00
ff41183643 Merge branch 'development2' into 'main' Hanno Fleischer 2024-12-13 09:26:49 +00:00
3658a91b7b added possiblity to build jar file and override shutdown behavior when closing via alt-f4 or the close button of the window Hanno Fleischer 2024-12-13 10:15:45 +01:00
1e5c5bd5eb added T016 Benjamin Feyer 2024-12-13 05:58:22 +01:00
23d4bf31a7 added testcase T004 Benjamin Feyer 2024-12-13 05:49:23 +01:00
5826d93be4 added test case T003 Benjamin Feyer 2024-12-13 05:47:30 +01:00
9c3b949e5a corrected javaDoc in GameTest Benjamin Feyer 2024-12-13 05:24:15 +01:00
81223653f9 added Piecetest T005/T006 Benjamin Feyer 2024-12-13 05:15:30 +01:00
28c06c931e added the game-test 6/7 (T008-T009) Benjamin Feyer 2024-12-13 04:25:37 +01:00
f93da332b3 added the game-test8 t010 Benjamin Feyer 2024-12-13 04:20:18 +01:00
379e4bcec1 corrected a pieceTest Benjamin Feyer 2024-12-13 04:08:36 +01:00
dc7dae5db9 added some gameTests and reformatted ServerStateTests Benjamin Feyer 2024-12-13 04:07:00 +01:00
702154c018 fixed PieceTest18 Benjamin Feyer 2024-12-13 02:52:11 +01:00
032cd76ec2 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-13 02:39:59 +01:00
5c8dce0626 finished the serverStateTests Benjamin Feyer 2024-12-13 02:39:48 +01:00
911ab42101 edited some tests for the server Benjamin Feyer 2024-12-13 02:18:45 +01:00
ea3f4df636 aaded some tests! Benjamin Feyer 2024-12-13 01:59:34 +01:00
065a626307 added Tests for LobbyStateTests Timo Brennförder 2024-12-13 00:44:37 +01:00
2ec9b3a246 added NetworkDialogClientTests testEnterIP -> passes testEnterPort -> can't be tested in model testConnectToServer -> passes testCantConnectToServer -> passes testCancelJoining -> passes Timo Brennförder 2024-12-12 20:53:04 +01:00
48d6516073 fixed and added some tests Benjamin Feyer 2024-12-12 15:01:57 +01:00
0d4685f3c2 added some tests and corrected some tests and added logic for the tests like getter and setter Benjamin Feyer 2024-12-12 13:46:23 +01:00
d12b0b6a77 fixed some tests Benjamin Feyer 2024-12-12 02:58:30 +01:00
4dda9229b3 fixed some tests Benjamin Feyer 2024-12-12 02:02:29 +01:00
e6453b2f1b Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-12 01:03:04 +01:00
af8ab21e5f fixed some tests Benjamin Feyer 2024-12-12 01:02:55 +01:00
d21e963d33 Merge remote-tracking branch 'origin/development2' into development2 Hanno Fleischer 2024-12-12 00:21:13 +01:00
1f3b07709c added java docs to NoPieceState Hanno Fleischer 2024-12-12 00:20:15 +01:00
a6215b9986 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-12 00:03:32 +01:00
6381d7b3b9 fixed some tests Benjamin Feyer 2024-12-12 00:03:24 +01:00
176affa9c5 added java docs to view Hanno Fleischer 2024-12-11 23:58:32 +01:00
67ea9ede18 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-11 23:32:30 +01:00
173cbe31e5 fixed some tests Benjamin Feyer 2024-12-11 23:32:19 +01:00
c13152bb29 added java docs to model Hanno Fleischer 2024-12-11 23:31:52 +01:00
a3d0056f7f finished clientStateTests Benjamin Feyer 2024-12-11 21:54:14 +01:00
06dcc4c0e4 fixed buck Benjamin Feyer 2024-12-11 20:19:15 +01:00
61e168cefb fixed buck Benjamin Feyer 2024-12-11 20:08:26 +01:00
cecd7e1a23 fixed buck Benjamin Feyer 2024-12-11 19:59:01 +01:00
f9772732c4 added better network support and disconnecting doesnt clos the client who hosts the server now Hanno Fleischer 2024-12-11 19:10:46 +01:00
f09766eb42 Merge remote-tracking branch 'origin/development2' into development2 Benjamin Feyer 2024-12-11 17:16:26 +01:00
62e3dd7932 fixed some tests Benjamin Feyer 2024-12-11 17:13:59 +01:00
d80499a18a Merge remote-tracking branch 'origin/development2' into development2 Hanno Fleischer 2024-12-11 16:50:18 +01:00
4b665c4cf2 getter and setter fo isDied Hanno Fleischer 2024-12-11 16:49:45 +01:00
3048caf5c9 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-11 14:23:44 +01:00
b8df688ba3 added highlight/hover/select to nodes Cedric Beck 2024-12-11 14:23:24 +01:00
8201ab4b63 added error handling when the drawpile is empty Hanno Fleischer 2024-12-11 14:11:07 +01:00
14a407b7d5 Merge commit Felix Koppe 2024-12-11 13:57:43 +01:00
170a282077 Add selectNext Felix Koppe 2024-12-11 13:56:55 +01:00
5854609b12 added notification to change to startdialog state when calling next in statitics state Hanno Fleischer 2024-12-11 13:43:15 +01:00
ea25f66dae wrote getter for ceremonyview in mdga app Hanno Fleischer 2024-12-11 13:34:38 +01:00
c069a61f2d Merge commit Felix Koppe 2024-12-11 13:12:51 +01:00
07029407d8 Add ceremony Felix Koppe 2024-12-11 13:11:48 +01:00
42a73ceb24 after switching from spectator to animation you should now be reset correctly into spectator Hanno Fleischer 2024-12-11 13:03:39 +01:00
42283f29a0 fixed missing passthrough statement in choosepiecestate Hanno Fleischer 2024-12-11 12:28:48 +01:00
574f8bb681 added java docs Hanno Fleischer 2024-12-11 12:00:39 +01:00
c1641cdac1 added the possibility when someone rolls a 6 and then has no valid move he can dice again Hanno Fleischer 2024-12-11 10:54:50 +01:00
f251bad97f fixed node selected after clear Cedric Beck 2024-12-11 08:59:21 +00:00
f8a021b310 Fix error in notification syncronizer Felix Koppe 2024-12-11 08:40:31 +01:00
aa44b84648 removed unused imports and reformatted the code for code style Daniel Grigencha 2024-12-11 05:34:34 +01:00
d8816be811 fixed some tests Benjamin Feyer 2024-12-11 01:03:18 +01:00
e61265fc99 fixed some tests Benjamin Feyer 2024-12-11 00:25:14 +01:00
9e2a0819ca fixed some tests Benjamin Feyer 2024-12-10 21:18:31 +01:00
cc756453a1 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Benjamin Feyer 2024-12-10 21:03:21 +01:00
f23f1f5abc fixed some tests Benjamin Feyer 2024-12-10 21:03:07 +01:00
cc8b2abbde fixed some tests Benjamin Feyer 2024-12-10 20:56:08 +01:00
8d7701cbf2 removed presentation die results Hanno Fleischer 2024-12-10 20:50:48 +01:00
874bba0fe9 removed starting alone ability Hanno Fleischer 2024-12-10 20:47:51 +01:00
3b73d1229b fixed ceremony statetransition Hanno Fleischer 2024-12-10 19:30:58 +01:00
9f1dafece2 added Ceremony integration Hanno Fleischer 2024-12-10 19:29:06 +01:00
997b31eba2 reverted turbo card percentages to normal Hanno Fleischer hanno.fleischer@unibw.de 2024-12-10 15:56:16 +01:00
148b769232 Add missing sound Felix Koppe 2024-12-10 15:43:35 +01:00
f0f4e0eb5e added presentation die results and powercards as well as fixed a bug where when a piece was thrown with a suppressed shield it wouldnt be cleared Hanno Fleischer 2024-12-10 15:06:35 +01:00
bda1a40cdb Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 Cedric Beck 2024-12-10 14:53:26 +01:00
0c8cb92fe8 fix anims Cedric Beck 2024-12-10 14:53:16 +01:00
e952233d20 added a hashset to fix double checking of powercards in the visitor Fleischer Hanno 2024-12-10 14:36:26 +01:00
9f8fd9c22f changed var name Cedric Beck 2024-12-10 14:34:44 +01:00
0432dd6bd7 merge Cedric Beck 2024-12-10 14:29:02 +01:00
4d31fc098b fixed swap bug Cedric Beck 2024-12-10 14:27:50 +01:00
40a61daa58 added flag Benjamin Feyer 2024-12-10 14:07:52 +01:00