megamanmalte/VierGewinnt
1
0
Fork 0
Code Issues 1 Pull requests 3 Packages Projects Releases Wiki Activity
42 commits 6 branches 0 tags 407 KiB
Commit graph

42 commits

This branch
This branch
All branches
Author SHA1 Message Date
Malte Tammena 6fbf9d6cbc Added random response again, creating method for pick from Set 2017-10-18 13:35:36 +02:00
Malte Tammena eddeaaf5f3 Merge branch 'master' into malte-ai 2017-10-18 13:16:18 +02:00
Malte Tammena 9e968e4050 Merge branch 'fix-naming' into 'master' 
Fixed naming issue, build passing

See merge request !12
 2017-10-18 13:14:43 +02:00
Malte Tammena b04e2a8fc6 Fixed naming issue, build passing 2017-10-18 13:02:26 +02:00
Malte Tammena dd0ac78bd0 Merge branch 'master' into malte-ai 2017-10-18 12:47:06 +02:00
Malte Tammena 361fe5920a AI changes. 2017-10-17 12:32:06 +02:00
Maurizio Bruetsch abcf0c9bd0 Merge branch 'postMergeBugs' into 'master' 
fixed post merge bugs

See merge request !11
 2017-10-16 20:23:56 +02:00
MaurizioBruetsch c3e8c1bef2 fixed post merge bugs 2017-10-16 20:22:49 +02:00
Maurizio Bruetsch c0db993f39 Merge branch 'maurizio-branch' into 'master' 
Maurizio branch

See merge request !10
 2017-10-16 20:08:40 +02:00
Maurizio Bruetsch f6062f8530 Merge branch 'master' into 'maurizio-branch' 
# Conflicts:
#   src/game/Game.java
#   src/game/Main.java
 2017-10-16 20:08:24 +02:00
Malte Tammena 3a7b86a1ff Merge branch 'master' into malte-ai 2017-10-16 11:25:53 +02:00
Malte Tammena d8d4680eca Changing move. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-16 11:25:23 +02:00
Malte Tammena 9245101b2c Merge branch 'fix-output' into 'master' 
Fixing winner being called Player 1/2.

See merge request !9
 2017-10-16 11:18:17 +02:00
Malte Tammena 9a32883dbd Fixing winner being called Player 1/2. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-16 11:10:05 +02:00
Malte Tammena b78978a02e Merge branch 'rename-ai' into 'master' 
Rename ai

See merge request !7
 2017-10-16 10:58:08 +02:00
Malte Tammena 51d18de92f Fixed the issues. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-16 10:55:48 +02:00
Malte Tammena e09cffbabe Merge branch 'rename-ai' into 'master' 
Changed AI names

See merge request !6
 2017-10-16 10:46:33 +02:00
Malte Tammena 3da406151e Changed AI names 2017-10-16 10:43:50 +02:00
MaurizioBruetsch b9e24a89b2 Enhancement + added #8 multipleRounds to Main 2017-10-15 20:59:03 +02:00
MaurizioBruetsch 574cb1df34 Enhancement + added #8 multipleRounds to the Main 2017-10-15 20:56:12 +02:00
MalteT c5f26606f9 Merge pull request #5 from MalteT/redo-output 
Redo output
 2017-10-15 14:22:29 +02:00
Malte Tammena b14c1bddba Added GameHistory and changed things. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 14:17:48 +02:00
Malte Tammena b96e0e2799 Created PlayerObject and implemented into game 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 13:32:15 +02:00
Malte Tammena be0540a879 Added a player wrapper PlayerObject 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 13:20:16 +02:00
Malte Tammena 049171749d Redoing players in the game. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 13:12:31 +02:00
MaurizioBruetsch e32eafe3a0 Merge pull request #4 from MalteT/redo-output 
[WIP] Did some comments and minor change.
 2017-10-15 13:10:05 +02:00
Malte Tammena d7074f2a18 Fixing format 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 12:52:53 +02:00
Malte Tammena 770e78dc4a Did some comments and minor change. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 12:49:14 +02:00
MalteT 4f0b94a7a5 Merge pull request #3 from MalteT/issue#2 
Added last winning condition check
 2017-10-15 12:24:19 +02:00
Malte Tammena f7c348b6ce Added last winning condition check 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 12:21:39 +02:00
Malte Tammena 8839a61ae5 Almost finished winning conditions. 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-15 00:45:35 +02:00
Malte Tammena 3fe047f1bb Not a working state, implementing winning conditions 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-14 23:31:31 +02:00
Malte Tammena 0dda4b6d0c Changed makeMove such that illegal moves will be punished 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-14 22:50:52 +02:00
Malte Tammena 47903da1a7 Added deepCopy method for board and removed magic nrs 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-14 22:31:40 +02:00
Malte Tammena c5d3cf127a Fixed post-merge bugs 
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
 2017-10-14 22:17:05 +02:00
MalteT 3836d7b7a9 Merge pull request #1 from MalteT/maurizio-branch 
Added a few functionalities to Game.java and created basic AI's.
 2017-10-14 21:05:56 +02:00
MalteT 5860b3c4ce Merge branch 'master' into maurizio-branch 2017-10-14 21:05:33 +02:00
MaurizioBruetsch a9681a2161 Added a few functionalities to Game.java and created basic AI's. 
The AIs are rather simple minded, but if possible they make a vlid move.
 2017-10-14 12:03:43 +02:00
Malte Tammena ed10fdb24b Working game, needing stateChanges 2017-10-13 14:43:08 +02:00
Malte Tammena fdfd1219df Worked on Game 2017-10-13 11:26:08 +02:00
Malte Tammena 4240ac37cd Worked on Game 2017-10-13 11:04:14 +02:00
Malte Tammena 09c7e4e41d Added basics 2017-10-13 10:46:02 +02:00