14 commits

Author	SHA1	Message	Date
John Cote	167c5c5736	Current work	2015-06-24 13:19:10 -04:00
John Cote	d2b0d99175	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -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
John	dd3867b46c	Better nametag wrap for cogs	2015-06-16 19:20:40 -04:00
John	35b646c4e6	Revert "Spring cleaning" ... This reverts commit 1e4bad8c6b.	2015-06-16 20:26:44 +03:00
John Cote	1e4bad8c6b	Spring cleaning	2015-06-15 20:56:12 -04:00
John Cote	3436e6a8e4	Less hacky suitA hands fix	2015-05-28 14:57:11 -04:00
John Cote	437571aefb	suitA Cogs now have their proper hand colors ... And with this I'd like to point out that this is technically a hack fix since it's just not using the preloaded models whilst everything else is	2015-05-25 20:01:38 -04:00
Master Jumblespeed	d882959bfa	switch to remote	2015-05-18 22:11:33 -04:00
DenialMC	36bb543af6	Upstream	2015-05-13 14:00:52 +03:00
John Cote	0c4d6feffa	Add Cigar Smoke Cog attack	2015-05-11 22:50:12 -04:00
John Cote	7f3c321490	Add Re-Org and finish Throw Book Cog attacks	2015-05-10 22:46:41 -04:00
Loudrob	72cd51bf93	Added Cog Level Gui, time to polish it...	2015-03-29 15:05:19 -04:00
Loudrob	02c7dc11e4	Initial commit	2015-03-03 17:10:12 -05:00