Commit Graph

174 Commits

Author SHA1 Message Date
Maurizio Bruetsch 937ba9663d Merge branch 'fix-make' into 'master'
Fix make

See merge request !33
2017-10-27 18:22:58 +02:00
MaurizioBruetsch b60a9b4d06 makefile 2017-10-27 18:19:43 +02:00
MaurizioBruetsch f2fd55ec47 merging conflicts 2017-10-27 18:01:50 +02:00
MaurizioBruetsch 87725b969b Makefile :( 2017-10-27 17:58:55 +02:00
Maurizio Bruetsch afddc1ba6e Merge branch 'fix-make' into 'master'
Fixed Makefile problems

See merge request !32
2017-10-27 17:51:30 +02:00
MaurizioBruetsch 352f991005 Makefile is for UNIX and makeWindows is for Windows 2017-10-27 17:50:04 +02:00
Maurizio Bruetsch f2359321cc Merge branch 'mauriAI' into 'master'
mauriAI

See merge request !26
2017-10-27 17:38:34 +02:00
Malte Tammena 4cb2eecac4 Merge branch 'malte-ai' into 'master'
Malte ai

See merge request !25
2017-10-27 09:46:51 +02:00
Malte Tammena 74320a091a Added informational output 2017-10-27 09:41:56 +02:00
MaurizioBruetsch b717ba4e24 improved AI 2017-10-26 23:42:44 +02:00
MaurizioBruetsch 37d9f8da73 AI sees two move loosing tricks 2017-10-25 15:20:13 +02:00
MaurizioBruetsch 5605076dbf Merge remote-tracking branch 'origin/master' into mauriAI 2017-10-25 14:21:59 +02:00
Maurizio Bruetsch 21f73d6694 windowsed Makefile 2017-10-24 21:32:39 +02:00
Malte Tammena 5496b0d40b Merge branch 'malte-alternative-sequence' into 'master'
Maltes new AI

See merge request !29
2017-10-24 21:26:10 +02:00
Malte Tammena ad9edad93f Removed output 2017-10-24 21:23:00 +02:00
Maurizio Bruetsch 047ec9b728 simplified AI code 2017-10-24 12:48:51 +02:00
Malte Tammena d75ac6e20d ai advances 2017-10-23 20:14:18 +02:00
Malte Tammena 409d49ea8f Merge branch 'malte-alternative' into malte-alternative-sequence 2017-10-23 15:21:10 +02:00
Malte Tammena c8c8c8d973 Merge remote-tracking branch 'origin/master' into malte-alternative 2017-10-23 15:20:00 +02:00
Malte Tammena 60d6668408 Added sequence moves 2017-10-23 15:16:15 +02:00
Malte Tammena 8f984e653f Implemented sequences 2017-10-23 15:13:54 +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 b19fbf3e52 Merge branch 'remove-printf-debugging-remains' into 'master'
removed unnecessary output

See merge request !28
2017-10-23 14:43:24 +02:00
Maurizio Bruetsch 6394e2d323 removed unnecessary output 2017-10-23 14:40:40 +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
Malte Tammena 0c3623a45e Switching to Sequence approach 2017-10-23 14:07:25 +02:00
Malte Tammena 8cab8c8deb Playing with the weights 2017-10-23 13:44:42 +02:00
Maurizio Bruetsch 281b7ce321 un-Windowsed Makefile 2017-10-23 13:28:12 +02:00
Malte Tammena 5016d07571 Merge branch 'malte-ai' into malte-alternative 2017-10-23 12:38:57 +02:00
Malte Tammena 19bcbec099 Ai advances 2017-10-23 12:38:52 +02:00
Malte Tammena 5d4815b73b Changed output format 2017-10-23 11:57:15 +02:00
MaurizioBruetsch fa8ce856f1 AI enhancement 2017-10-22 18:17:49 +02:00
Malte Tammena cbd763ac47 Implementing alternate ai 2017-10-21 22:24:15 +02:00
Malte Tammena dfc1aad31b Merge remote-tracking branch 'origin/master' into malte-alternative 2017-10-21 20:37:52 +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
Malte Tammena 34fa594127 Merge remote-tracking branch 'origin/master' into malte-alternative 2017-10-21 20:28:07 +02:00
Malte Tammena 0b69e9671e File changes 2017-10-21 20:27:52 +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