Commit graph

27 commits

Author SHA1 Message Date
MaurizioBruetsch 352f991005 Makefile is for UNIX and makeWindows is for Windows 2017-10-27 17:50:04 +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
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
Malte Tammena 0c3623a45e Switching to Sequence approach 2017-10-23 14:07:25 +02:00
Maurizio Bruetsch 281b7ce321 un-Windowsed Makefile 2017-10-23 13:28:12 +02:00
Malte Tammena dfc1aad31b Merge remote-tracking branch 'origin/master' into malte-alternative 2017-10-21 20:37:52 +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 0b69e9671e File changes 2017-10-21 20:27:52 +02:00
MaurizioBruetsch ff624e3bff Merge branch '6-colorize-output-with-jansi' into mauriAI 2017-10-21 13:10:16 +02:00
Malte Tammena b6214bd9e1 Finished implementation of Human, improving IO 2017-10-20 23:59:05 +02:00
Malte Tammena 9769fc0c6d Worked on Patterns for the ai 2017-10-20 23:55:25 +02:00
Malte Tammena a0b3290987 Finished implementation of Human, improving IO 2017-10-20 22:58:07 +02:00
Malte Tammena 7425038306 Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-20 22:12:06 +02:00
Maurizio Bruetsch a0b734e4c4 changed name of Makefile, because of Bill Gates 2017-10-20 21:49:05 +02:00
Malte Tammena a6a2a5a863 Added jansi, working colorization 2017-10-20 14:50:43 +02:00
Malte Tammena 33c16320a9 Worked on Patterns for the ai 2017-10-19 14:26:12 +02:00
Malte Tammena 56e4de5695 Finished implementation of multi-mode 2017-10-18 23:21:13 +02:00
Malte Tammena b91c53b492 Added Pattern and Item classes 2017-10-18 14:28:48 +02:00
Malte Tammena ec9a9439c1 Fixing Makefile 2017-10-18 14:07:16 +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 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 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 c5d3cf127a Fixed post-merge bugs
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-14 22:17:05 +02:00
Malte Tammena ed10fdb24b Working game, needing stateChanges 2017-10-13 14:43:08 +02:00
Malte Tammena 4240ac37cd Worked on Game 2017-10-13 11:04:14 +02:00