Jenkins
|
8310a61f22
|
Merge commit 'e830f0665102b436938b6873416a83843382f500' into HEAD
|
3 years ago |
 Jonas Wagner
|
e830f06651
|
Merge remote-tracking branch 'origin/Final_Refactoring' into develop
|
3 years ago |
|
Jonas Wagner
|
909cd6f887
|
Update ReadMe
|
3 years ago |
|
Jonas Wagner
|
ffb7feeb2e
|
Final Refactoring
|
3 years ago |
|
Jenkins
|
0dc98e685f
|
Merge commit '3a46b47c63aa048cf1ed94197cbef451ed5ebef6' into HEAD
|
3 years ago |
 FelixKrull
|
3a46b47c63
|
Update pom
|
3 years ago |
|
Jenkins
|
0d5e17cfdc
|
Merge commit '90109e9a2588549f17e7f9f134577e98aacb58bb' into HEAD
|
3 years ago |
|
FelixKrull
|
90109e9a25
|
Merge branch 'show2dDice' into develop
|
3 years ago |
|
FelixKrull
|
b3412a5f5e
|
Merge branch 'develop' into show2dDice
|
3 years ago |
|
Jonas Wagner
|
145e811eeb
|
Hotfix checkDice
|
3 years ago |
|
FelixKrull
|
0f3af993a0
|
Merge branch 'develop' into show2dDice
|
3 years ago |
|
FelixKrull
|
775ed23753
|
Merge branch 'FixCheckDice' into develop
|
3 years ago |
|
FelixKrull
|
647f0350dd
|
Merge branch 'develop' into FixCheckDice
|
3 years ago |
|
FelixKrull
|
0ba70f64e7
|
Merge branch 'FixSetFigures' into develop
|
3 years ago |
|
FelixKrull
|
2c498e42ee
|
Rewrite checkdice with new tests
|
3 years ago |
|
FelixKrull
|
fd172a994f
|
Merge branch 'FixCheckDice' into show2dDice
|
3 years ago |
|
FelixKrull
|
9f6b3480f1
|
Merge branch 'FixSetFigures' into show2dDice
# Conflicts:
# src/main/java/Game.java
|
3 years ago |
|
FelixKrull
|
4defdab710
|
Add 2d dice to Gameboard
|
3 years ago |
|
FelixKrull
|
6643e1d08e
|
Change condition of checkDice
|
3 years ago |
|
FelixKrull
|
8aceb8574c
|
Remove double sleep
|
3 years ago |
|
FelixKrull
|
54b65e717e
|
Remove sout's
|
3 years ago |
|
FelixKrull
|
4bc75c74a3
|
Merge remote-tracking branch 'origin/FixSetFigures' into FixSetFigures
|
3 years ago |
|
FelixKrull
|
f8c9d023e0
|
Fix Gametest for only 3 dice rolls
|
3 years ago |
|
FelixKrull
|
81fb0fda4e
|
Fix moving in the house
|
3 years ago |
|
Jonas Wagner
|
cc248b514a
|
Add 1 Second Delay when Player swap
|
3 years ago |
|
Jonas Wagner
|
975909dacb
|
Add clearScreen at beginning
|
3 years ago |
|
Jonas Wagner
|
404260a233
|
Fix Gameboard in Gameloop
|
3 years ago |
|
Jonas Wagner
|
7175a51eda
|
Fix getUsableFigures for Home
|
3 years ago |
|
Jenkins
|
fb10b14629
|
Merge commit '6d05b245bc181038ddb16ec7e9c2ee0cd1cdca44' into HEAD
|
3 years ago |
|
FelixKrull
|
6d05b245bc
|
Merge branch 'GameboardOutput' into develop
|
3 years ago |
|
FelixKrull
|
5bea3033d1
|
Merge remote-tracking branch 'origin/develop' into GameboardOutput
# Conflicts:
# src/main/java/Game.java
|
3 years ago |
|
FelixKrull
|
d2d5cfc135
|
Add exit to end mid-game
|
3 years ago |
|
FelixKrull
|
63ec77cf5c
|
Change Output of choose method to match gameboard
|
3 years ago |
|
Jenkins
|
6c49f86ea2
|
Merge commit '7bb16ad4a901908167f8467be8499f7263c728b7' into HEAD
|
3 years ago |
|
FelixKrull
|
2f8f41b04b
|
Implement printGameboard into Gameloop
|
3 years ago |
|
Jonas Wagner
|
7bb16ad4a9
|
Update Readme
|
3 years ago |
|
FelixKrull
|
6f7e2cfe59
|
Edit Board String and add player
|
3 years ago |
|
FelixKrull
|
f2ef9a7c81
|
Remove Color Test
|
3 years ago |
|
FelixKrull
|
36596f6716
|
Fix Board-String
|
3 years ago |
|
FelixKrull
|
bf9d29158b
|
Refactoring
|
3 years ago |
|
FelixKrull
|
2d27095edf
|
Implement method to get Figures on Gameboard
|
3 years ago |
|
Jenkins
|
47db41bc82
|
Merge commit '472b72c1acb9c0ac7dfdb4937f7e092a4ef09b0e' into HEAD
|
3 years ago |
|
FelixKrull
|
472b72c1ac
|
Merge branch 'AddJavaDoc' into develop
|
3 years ago |
|
FelixKrull
|
37606db2dc
|
Merge remote-tracking branch 'origin/develop' into AddJavaDoc
# Conflicts:
# README.md
|
3 years ago |
|
FelixKrull
|
4053d84269
|
Add Descriptions in Javadoc
|
3 years ago |
|
Jonas Wagner
|
707145bd0f
|
Merge branch 'ReadMe' into develop
|
3 years ago |
|
Jonas Wagner
|
9aec0c4447
|
Fix Links in ReadMe
|
3 years ago |
|
FelixKrull
|
cd10df7555
|
Add Descriptions in Javadoc
|
3 years ago |
|
Jonas Wagner
|
49e6b6966d
|
Merge branch 'ReadMe' into develop
|
3 years ago |
|
Jonas Wagner
|
1b6758a0dc
|
Merge remote-tracking branch 'origin/develop' into ReadMe
|
3 years ago |
