5 Commits

Author	SHA1	Message	Date
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