Commit graph

99 commits

Author SHA1 Message Date
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
Malte Tammena e77cd680e3 Implemented twoOfFourPatterns, ai development 2017-10-20 22:05:35 +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 bc9b43fcc0 Removed unneccesary output 2017-10-20 21:08:14 +02:00
Malte Tammena dbc2d5b2d8 AI improvements 2017-10-20 21:01:12 +02:00
Malte Tammena 7f83c6f01f Commiting wrongly on this branch to cherry-pick 2017-10-20 20:56:34 +02:00
Malte Tammena 21ec72f499 Did bug work-around 2017-10-20 17:11:08 +02:00
Malte Tammena 3e574c84f6 Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-20 16:55:14 +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 caeb331d94 Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-20 14:15:59 +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 54b015ec77 Did commenting 2017-10-20 13:57:50 +02:00
Malte Tammena b0a1999b94 Did commenting 2017-10-20 13:51:52 +02:00
Malte Tammena ee60b28986 Did commenting 2017-10-20 13:38:42 +02:00
Malte Tammena 00f813ba0f Did commenting 2017-10-20 13:24:11 +02:00
Malte Tammena bee8baec1d AI improvements 2017-10-20 09:12:16 +02:00
Malte Tammena 33c16320a9 Worked on Patterns for the ai 2017-10-19 14:26:12 +02:00
Malte Tammena 6232484d63 Strip output, fixing all AI problemes 2017-10-19 13:52:08 +02:00
Malte Tammena 5495b3e157 Having problems with the Pattern, losing 2017-10-19 13:44:03 +02:00
Malte Tammena e126b18cde Changing Patterns, creating and testing them 2017-10-19 13:07:10 +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 6822716035 Merge remote-tracking branch 'origin/master' into malte-ai 2017-10-18 23:28:42 +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 3085c9255b Working on pattern implementation 2017-10-18 22:41:44 +02:00
Malte Tammena bbd22f830e Working on Patterns, doing great 2017-10-18 15:16:05 +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