Commit Graph

8 Commits

Author SHA1 Message Date
Steve 4792c6d971 Added TEAM_PLAYER trophy. 2016-04-08 11:03:50 +01:00
Steve 9c35d47e33 Added Mace trophy. 2016-04-05 09:59:11 +01:00
Steve f5b3933a87 Merge branch 'develop' into trophies
Conflicts:
	src/battle/battle.c
2016-03-12 18:28:43 +00:00
Steve e8d63df494 Merge remote-tracking branch 'origin/develop' into trophies
# Conflicts:
#	src/battle/battle.c
#	src/challenges/challengeHome.c
2016-03-10 12:04:04 +00:00
Steve f8344f4047 Added new trophies. 2016-03-09 15:54:45 +00:00
Steve 93dd00c785 Prototyping stats trophies. 2016-03-09 12:31:33 +00:00
Steve 721ca3e110 Trophy updates. 2016-03-06 17:13:34 +00:00
Steve b6012a2e21 Merged config branch. 2016-03-03 18:03:07 +00:00