UML from Hugo added
Merge pull request #11 from Jayce6/master

Added a star UML - Jay
UML from RoboGame added - code as it appeared at the end of Lesson 04
UML from RoboGame updated so it matches the start of Lesson 05 code
(Contender.java)
changed energyCheck() method to be private
(Jay.~ml)
removed file - no need for it
added UML from Tania
Merge pull request #13 from Jayce6/master

Updated the Freedom contender
manual update of Nathan's Robo class changes
setting up LastManStanding mode
Merge branch 'master' of https://github.com/marekgorski/Robo.git
added new Mode called CareerMode in which each Contender gets to fight every other Contender

(Contender.java)
added in 3 public int variables:
totalWon - to keep track of won battles
totalDrawn - to keep track of Mutual Annihiliation
totalLost - to keep track of lost battles
added in setHealth() method to be able to heal Contenders before a battle

(LastManStanding.java)
updated to reflect the Mode structure of the other Modes

(RandomMatchUp.java)
moved code into matchUp() and battle() methods

(CareerMode.java)
added a new file that uses a lot of the battle() method code from the RandomMatchUp mode

(YogiBear.java, JayGundam.java and NathanRobo.java)
commented out their a.name + " attacks!" println() from their AI() methods

Out of interest, below are the results of the CareerMode with the current Contenders - the number signifies total wins:
All Contenders have participated
Adam's : 3W 4D 7L 
Boo Boo : 8W 0D 6L 
Omega : 0W 7D 7L 
Freedom : 13W 1D 0L 
Blitz : 10W 2D 2L 
Max : 4W 1D 9L 
Tania : 8W 1D 5L 
Yogi Bear : 1W 2D 11L
Merge pull request #14 from marekgorski-user/master

CareerMode added to project - allows each Contender to battle with every other Contender
Merge branch 'master' of https://github.com/marekgorski/Robo.git
King of the Hill mode - Progressing
Freedom - Updated AI
New Team Deathmatch Mode and fixed problems with Max AI
Update RoboGame/src/com/eatthatgame/robo/contenders/John.java

made the AI for my contender (Blitz)
Merge pull request #17 from Callidusjohn/patch-1

Update RoboGame/src/com/eatthatgame/robo/contenders/John.java
Merge pull request #16 from Ominous-Noise/master

Updated NathanRobo and Added Team Deathmatch Mode
Manually added in Adam's changes to the project (RandomMatchUp2v2.java added and RandomMatchUp.java as well as Adam.java modified)

Added comments to Nathan's Mode (TeamDeathmatch.java)

Additionally modified (RoboGame.java) to add in the new game modes to be able to test them easily (uncomment what you want to test)

Out of interest, below are the results of the CareerMode with the current Contenders - the number signifies total wins:
All Contenders have participated
Awesom-O : 12W 2D 0L 
Boo Boo : 6W 0D 8L 
Omega : 0W 7D 7L 
Freedom : 9W 1D 4L 
Blitz : 4W 1D 9L 
Max : 6W 3D 5L 
Tania : 7W 3D 4L 
Yogi Bear : 3W 1D 10L
King of the Hill mode - Progressing
Freedom - Updated AI