Commit graph

144 commits

Author SHA1 Message Date
Maurizio Bruetsch 21f73d6694 windowsed Makefile 2017-10-24 21:32:39 +02:00
Maurizio Bruetsch 047ec9b728 simplified AI code 2017-10-24 12:48:51 +02:00
Maurizio Bruetsch b543da5964 post merge problems 2017-10-23 14:54:01 +02:00
Maurizio Bruetsch d9d4f50e74 resolving merge conflicts 2017-10-23 14:47:55 +02:00
Maurizio Bruetsch 68ea8df7fe Merge branch '12-bug-fix' into 'master'
fixed bug 12 and improved output of Human.java

Closes #12

See merge request !27
2017-10-23 14:34:19 +02:00
Maurizio Bruetsch c40c3fb50e fixed bug 12 and improved output of Human.java 2017-10-23 14:26:03 +02:00
Maurizio Bruetsch 281b7ce321 un-Windowsed Makefile 2017-10-23 13:28:12 +02:00
MaurizioBruetsch fa8ce856f1 AI enhancement 2017-10-22 18:17:49 +02:00
Malte Tammena 4d3b14c3cc Merge branch '6-colorize-output-with-jansi' into 'master'
Resolve "Colorize output with jansi"

Closes #6

See merge request !21
2017-10-21 20:36:22 +02:00
Malte Tammena 22fe5843ce Merge remote-tracking branch 'origin/master' into 6-colorize-output-with-jansi 2017-10-21 20:33:41 +02:00
MaurizioBruetsch ea340e5cda AI checking for two-move wins now 2017-10-21 16:30:35 +02:00
MaurizioBruetsch 466c41737e Merge branch 'master' into mauriAI 2017-10-21 13:18:51 +02:00
MaurizioBruetsch ff624e3bff Merge branch '6-colorize-output-with-jansi' into mauriAI 2017-10-21 13:10:16 +02:00
MaurizioBruetsch 101ef5bd89 fixed bug in AI 2017-10-21 12:07:07 +02:00
Maurizio Bruetsch dd68bbf6c7 found bug 2017-10-21 00:12:17 +02:00
Malte Tammena 8bc4af7d8a Removed output 2017-10-20 23:59:05 +02:00
Maurizio Bruetsch d52b8c60a9 furhter AI enhancement 2017-10-20 23:59:05 +02:00
Malte Tammena 1cb455100d IO good enough 2017-10-20 23:59:05 +02:00
Malte Tammena b6214bd9e1 Finished implementation of Human, improving IO 2017-10-20 23:59:05 +02:00
Malte Tammena eef311480f Fixed enemyID bug 2017-10-20 23:58:11 +02:00
Malte Tammena 96758d864d Informational output 2017-10-20 23:57:42 +02:00
Malte Tammena 6a93dd4a05 Implemented twoOfFourPatterns, ai development 2017-10-20 23:57:42 +02:00
Malte Tammena a3d7f190d0 Removed unneccesary output 2017-10-20 23:57:42 +02:00
Malte Tammena f7576ebfe6 AI improvements 2017-10-20 23:57:42 +02:00
Malte Tammena 479cd7f975 Commiting wrongly on this branch to cherry-pick 2017-10-20 23:57:42 +02:00
Malte Tammena 6f55dde659 Did bug work-around 2017-10-20 23:57:42 +02:00
Malte Tammena 62f6466370 Did commenting 2017-10-20 23:57:42 +02:00
Malte Tammena a4110b96a2 Did commenting 2017-10-20 23:57:42 +02:00
Malte Tammena dc1e45fe0c Did commenting 2017-10-20 23:57:42 +02:00
Malte Tammena 1d87754f53 Did commenting 2017-10-20 23:57:41 +02:00
Malte Tammena 2e9347cfb3 AI improvements 2017-10-20 23:55:25 +02:00
Malte Tammena 9769fc0c6d Worked on Patterns for the ai 2017-10-20 23:55:25 +02:00
Malte Tammena b0ed66a786 Strip output, fixing all AI problemes 2017-10-20 23:53:55 +02:00
Malte Tammena 318792c9b0 Having problems with the Pattern, losing 2017-10-20 23:53:55 +02:00
Malte Tammena 499859fd53 Changing Patterns, creating and testing them 2017-10-20 23:53:55 +02:00
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
Malte Tammena 5d957c47fe Merge branch 'malte-ai' into 'master'
Maltes AI

See merge request !24
2017-10-20 23:22:31 +02:00
Malte Tammena 11fa74bbb7 Removed output 2017-10-20 23:20:48 +02:00
Malte Tammena 2737a76fc8 Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-20 23:11:34 +02:00
Malte Tammena 64e6109ff9 Merge branch '11-implementation-of-player-class' into 'master'
Resolve "Implementation of player class"

Closes #11

See merge request !23
2017-10-20 23:10:34 +02:00
Malte Tammena 15b8c723dc Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-20 23:08:47 +02:00
Malte Tammena b8512a1693 IO good enough 2017-10-20 23:05:15 +02:00
Malte Tammena a0b3290987 Finished implementation of Human, improving IO 2017-10-20 22:58:07 +02:00
Malte Tammena d492cd48dd Fixed enemyID bug 2017-10-20 22:30:15 +02:00
Malte Tammena aaf84031a4 Informational output 2017-10-20 22:26:48 +02:00
Malte Tammena 9df17ac2e8 Merge branch 'malte-ai' into 'master'
Maltes AI

See merge request !15
2017-10-20 22:13:35 +02:00
Malte Tammena 7425038306 Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-20 22:12:06 +02:00
Maurizio Bruetsch a9095ed38a Merge branch 'mauriAI' into 'master'
mauriAI

See merge request !22
2017-10-20 22:10:32 +02:00
Maurizio Bruetsch f0c3999797 bug fixing 2017-10-20 22:05:39 +02:00