8 commits

Author	SHA1	Message	Date
John Cote	6b4329d263	Fixed pet trick data in battle.	2015-05-09 12:52:12 -04:00
John Cote	460587cbd7	Cleanup and typo fix.	2015-05-09 03:04:51 -04:00
John Cote	ab3072fb84	Pets will work in battle now.	2015-05-09 02:21:07 -04:00
DenialMC	587e734ba2	TimeManager cleanup and add death on game exit in cog battle	2015-04-25 14:18:50 +03:00
Daniel	f38f910638	Upstream update	2015-03-29 18:41:02 +03:00
Daniel	4881a40bc0	Curse you Loudrob	2015-03-29 17:17:34 +03:00
Loudrob	a503e92deb	fix button hiding pls k	2015-03-17 09:41:23 -04:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00