Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

try merge #59

Open
wants to merge 135 commits into
base: main
Choose a base branch
from
Open

try merge #59

wants to merge 135 commits into from

Conversation

42lukas
Copy link

@42lukas 42lukas commented Apr 22, 2024

No description provided.

42lukas and others added 30 commits April 10, 2024 09:14
@42lukas
Name in pom.xml eingefügt.
4e17463
@42lukas
Name in pom.xml eingefügt.
846c629
@42lukas
ToDo's in der pom.xml Datei entfernt
6a24792
@42lukas
Alle Karten werden erstellt und können getestet werden :)
b4929ad
@42lukas
Jede Karte hat einen Wert (also z.B. Herz Neun hat den Wert null)
eb718d7
@blnpurple
improve function "initializeCards"
a46804e
@42lukas
Merge branch 'stefreschke:main' into main
575ee28
@blnpurple
Merge branch 'main' of https://github.com/Ryumo434/hwr-oop-group6-Dop…
b0f0d75 
…pelkopf
@blnpurple
increase line coverage to 100%
554aa66
@blnpurple
remove Example modules, add players
40be793
@42lukas
added shuffled Deck
03a34ee
@42lukas
added shuffled Deck
1605820
@42lukas
try merge
c6ff73e
@42lukas
added dealCards Method. Doesn't work because value of player is null
934dec9
@42lukas
Every Player now gets 12 cards from the shuffled Deck
9bb84d5
@42lukas
Es wird nun nicht mehr die Objektreferenz ausgegeben, sondern die Tat…
6c7359b 
…sächliche Karte jedes Spielers
@blnpurple
update readme and delete println
2c42126
@42lukas
Feedback implemented
4067aac
@42lukas
Feedback implemented
793a423
@42lukas
one test needed to be fixed
2578958
@42lukas
Merge branch 'main' of https://github.com/stefreschke/hwr-oop-project…
6b8272a 
…-template
@42lukas
new entry point in "DoppelkopfGame" and the possibility to implement …
a598811 
…the first commands like "create game"...
@blnpurple
update after feedback, change public-arguments to private
c069edf
@42lukas
added strength to cards
1aea122
@42lukas
Merge remote-tracking branch 'origin/main'
f19a1e2 
# Conflicts:
#	src/main/java/hwr/oop/doppelkopf/DoppelkopfGame.java
@42lukas
fixed errors
626ef9d
@snaan5
added PlayerOrder
d06bf6c
@blnpurple
add round-function (play and compare cards, add points to a player)
fd2bb9c
@blnpurple
Merge remote-tracking branch 'origin/main'
08dc0e8 
# Conflicts:
#	.run/Run All Tests.run.xml
#	src/main/java/hwr/oop/doppelkopf/group6/DoppelkopfGame.java
@42lukas
added "createGame" Method. NOTE: the path needs to be manually change…
d51197b 
…d, depending on the os
Ryumo434 and others added 30 commits May 29, 2024 12:14
@Ryumo434
Added Test for method sortCards
e3e3f53
@Ryumo434
Added Test for method sortCards
1b30f23
@42lukas
-added Test and Method to Switch Cards between two players
fe076ec 
-reformatted code
@42lukas
-added Test and Method to Switch Cards between two players
f6f14af 
-reformatted code
-merged code
@42lukas
-added Test and Method to Switch Cards between two players
66972a9 
-reformatted code
-merged code
@42lukas
-added Test and increased Mutation Coverage to 100%
a2e0934 
-reformatted code
@42lukas
-all changes described in Discord Chat for more detail
416d1f2 
-code reformatted
@blnpurple
add Hochzeit
0605130
@blnpurple
Merge branch 'main' of https://github.com/Ryumo434/hwr-oop-group6-Dop…
95cf681 
…pelkopf
@42lukas
few changes and more tests.
e8946e2
@blnpurple
refactor code
6d4424b
@blnpurple
Merge branch 'main' of https://github.com/Ryumo434/hwr-oop-group6-Dop…
0771f2e 
…pelkopf
@blnpurple
refactor code and add tests
b705439
@blnpurple
improve Sonar Lint
2668969
@blnpurple
fix test and format
ba9a975
@blnpurple
delete warnings
bca855f
@42lukas
increased Mutation Coverage to 98% and reformatted the whole code. Al…
14a9e03 
…so deleted "SupressWarnings", because Stefan said so.
@42lukas
Merge remote-tracking branch 'origin/main'
a5e90a5
@blnpurple
add new Test
108569d
@blnpurple
Merge branch 'main' of https://github.com/Ryumo434/hwr-oop-group6-Dop…
a603666 
…pelkopf
@blnpurple
update readme and format
a1e7d6c
@blnpurple
replace println system.out with outputstream, improve Sonar Lint
9fcd9ff
@42lukas
increased mutation coverage added play command and players cards alon…
498d782 
…g with the players itself are saved into the .csv file.
@42lukas
increased mutation coverage added play command and players cards alon…
c227a63 
…g with the players itself are saved into the .csv file.
@42lukas
increased mutation coverage added play command and players cards alon…
6f2c824 
…g with the players itself are saved into the .csv file.
@blnpurple
Google format and create a table for cli-commands in the readme
fd9fcb0
@blnpurple
Google format and create a table for cli-commands in the readme
d1b4d5c
@blnpurple
static code analysis
3c56c98
@blnpurple
static code analysis
89a84b0
@blnpurple
update readme
08bbe59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@42lukas @blnpurple @snaan5 @Ryumo434