8 commits

Author	SHA1	Message	Date
John	112184e1fd	Intermission music for CFO	2015-07-07 01:54:59 +03:00
John Cote	9b52f82419	UGH WHEN WILL THIS END	2015-06-26 00:32:17 -04:00
John Cote	d2b0d99175	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -04:00
John	468c192c14	Add tickets unite and make cog icons a bit smaller in the merits unite	2015-06-17 10:09:53 -04:00
John	6d24fb4390	Add merits unite which restocks 16.66% of the total merits required (meaning it needs a bit more than 6 unites to restock fully, even for BIg Cheese 23300 promotions.)	2015-06-17 10:08:57 -04:00
Master Jumblespeed	d882959bfa	switch to remote	2015-05-18 22:11:33 -04:00
Loudrob	9d54f4f88a	Murdered TTI's promotion system.	2015-05-13 07:41:49 -04:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00