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

71 commits

This branch
This branch
All branches
Author SHA1 Message Date
Malte Tammena 51a783eb4b Working on pattern implementation 2017-10-20 23:53:55 +02:00
Malte Tammena dee946cb5a Working on Patterns, doing great 2017-10-20 23:53:55 +02:00
Maurizio Bruetsch f0c3999797 bug fixing 2017-10-20 22:05:39 +02:00
Maurizio Bruetsch a0b734e4c4 changed name of Makefile, because of Bill Gates 2017-10-20 21:49:05 +02:00
Maurizio Bruetsch 0f3490cc65 bug fixing 2017-10-20 21:45:09 +02:00
Maurizio Bruetsch b2500b0c86 Implemeted basic Ai2 2017-10-20 21:37:01 +02:00
Malte Tammena a0d6033cb7 Merge branch 'minor-game-change' into 'master' 
Added enemyID functionality

See merge request !20
 2017-10-20 14:23:48 +02:00
Malte Tammena a3a1da1d9a Added enemyID functionality 2017-10-20 14:21:54 +02:00
Malte Tammena 2a5a6efd59 Merge branch 'add-player-stuff' into 'master' 
Add player stuff

See merge request !19
 2017-10-20 14:14:34 +02:00
Malte Tammena 1c78ba0113 Added setEnemyID function 2017-10-20 14:12:03 +02:00
Malte Tammena 8b667d88fd Merge branch 'move-winning-method' into 'master' 
Move winning method

See merge request !18
 2017-10-18 23:36:59 +02:00
Malte Tammena e584e3a919 Moved the method 2017-10-18 23:35:26 +02:00
Malte Tammena fe765ec4a5 Merge branch 'multi-mode' into 'master' 
Multi mode

See merge request !17
 2017-10-18 23:26:53 +02:00
Malte Tammena 56e4de5695 Finished implementation of multi-mode 2017-10-18 23:21:13 +02:00
Malte Tammena 5df378e315 Fixing things 2017-10-18 23:13:29 +02:00
Malte Tammena 8ed7093d2d Added simulation method. Implementing #8 2017-10-18 23:09:40 +02:00
Malte Tammena 1c968e676b Notifying Player about his ID 2017-10-18 22:57:41 +02:00
Malte Tammena 25a9a1bbd3 Changed visibility of static vars in Game.java 2017-10-18 22:56:32 +02:00
Malte Tammena 5fe910e2b0 Added setPlayerID method to Player.java 2017-10-18 22:55:57 +02:00
Malte Tammena 6d58286d3b Merge branch 'malte-ai' into 'master' 
Malte ai

See merge request !14
 2017-10-18 14:34:37 +02:00
Malte Tammena 2d106f36bc Fixing naming issues and imports after !8 2017-10-18 14:32:22 +02:00
Malte Tammena b91c53b492 Added Pattern and Item classes 2017-10-18 14:28:48 +02:00
Malte Tammena 3c2e947b33 Merge branch 'master' into malte-ai 2017-10-18 14:10:54 +02:00
Malte Tammena 27609f11aa Merge branch 'fixes' into 'master' 
Fixing Makefile

See merge request !13
 2017-10-18 14:10:38 +02:00
Malte Tammena ec9a9439c1 Fixing Makefile 2017-10-18 14:07:16 +02:00
Malte Tammena 013bbd57b6 Added pattern class 2017-10-18 14:05:15 +02:00
Malte Tammena cabe330bd5 Merge branch 'malte-ai' into 'master' 
Malte ai

See merge request !8
 2017-10-18 13:57:51 +02:00
Malte Tammena b89eae69bc Redone structure for multi-file ai 2017-10-18 13:56:22 +02:00
Malte Tammena 54ede03ced Minor AI changes, preparing filestruture change 2017-10-18 13:52:42 +02:00
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