Commit graph

84 commits

Author SHA1 Message Date
Malte Tammena e77cd680e3 Implemented twoOfFourPatterns, ai development 2017-10-20 22:05:35 +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
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