314 commits

Author	SHA1	Message	Date
John	26de40ce8c	Ability to switch poles in shticker book + poles appear in every catalog	2015-07-27 10:46:14 +03:00
John	95649ed20a	Fix	2015-07-25 18:19:45 +03:00
John	1c10218bb2	Delete All button in clerk purchase gui + a bit of inventorynew cleanup	2015-07-25 13:04:16 +03:00
John	9a059f3893	Add clerks to Cog HQs, change their appearences, clerk rewrite, add ~dna showrandom m/f magic word.	2015-07-25 12:15:08 +03:00
John	9494a47466	New laff restock NPC	2015-07-25 09:08:54 +03:00
John	725e936a5d	Delivery is instant on dev	2015-07-25 08:15:10 +03:00
John	e1de301f2a	Revert "Loyalty items cum back. ;(. & add ctime so mongo doesn't complain." ... This reverts commit 881a8007df.	2015-07-23 23:00:50 +03:00
Loudrob	881a8007df	Loyalty items cum back. ;(. & add ctime so mongo doesn't complain.	2015-07-23 15:54:46 -04:00
Loudrob	1de4367482	No more updateCoons.	2015-07-22 18:00:31 -04:00
Loudrob	c042107c4d	maxGarden	2015-07-21 23:41:50 -04:00
John Cote	b044f98305	More gardening GUI widescreen	2015-07-21 14:32:19 -04:00
John Cote	d0ff9ff635	widescreen gardening gui	2015-07-21 14:12:56 -04:00
John Cote	3de77cb7b0	Fix an error with plating statuary.	2015-07-21 12:21:20 -04:00
Loudrob	c93fec2f19	Top Toons	2015-07-20 13:16:39 -04:00
John	95f67faab5	Stuff	2015-07-18 02:28:36 +03:00
John	f28c65d32b	Match Jaymo	2015-07-18 01:21:43 +03:00
John	a17151ef96	You can now buy any nametag style, the game will store it. Changeable in the shticker book!	2015-07-18 00:25:20 +03:00
Loudrob	c76b2ca2c8	Easy Promotion Papers	2015-07-17 14:01:50 -04:00
John	d5dc2c9d50	PotentialAvatar cleanup	2015-07-17 19:05:29 +03:00
John	50297ca489	Trunks	2015-07-17 17:51:43 +03:00
John	81e339d9e9	Preparation for next commit (sry have to git reset)	2015-07-17 15:40:14 +03:00
John	61705bbf20	Gifting update!!!	2015-07-17 14:50:16 +03:00
Loudrob	dfcd7c2124	Gift duplication fixed.	2015-07-14 14:35:15 -04:00
Master Voltage	1d48a7fa28	praise nacib	2015-07-14 10:40:11 -04:00
Loudrob	7f1d4b8e18	Merge branch 'master' into features/ttn	2015-07-14 06:38:49 -04:00
John	5b2f6ce816	The rounds effective for lure now shows on the battle inventory screen	2015-07-14 13:01:45 +03:00
John	a6b0aeaaff	HD TV + Tailor Fix	2015-07-14 01:43:13 +03:00
Loudrob	87efdba167	More gifting.	2015-07-13 10:17:56 -04:00
Loudrob	c1654a3f42	fuck ur tabs	2015-07-12 20:17:17 -04:00
Loudrob	4e8fb45531	Current progress on gifting.	2015-07-12 15:42:55 -04:00
John	b14505435c	Add toon model into the detail panel	2015-07-10 22:25:09 +03:00
John	86c6598284	Hypno Glass	2015-07-09 21:23:01 +03:00
John Cote	da7ba5ce89	Convert prints to writeServerEvents in code redemption manager AI and fix typos	2015-07-08 07:47:01 -04:00
John	ac60242003	Add skelecog and waiter invasions to summon page	2015-07-07 21:16:55 +03:00
John	ec8ee69769	Add messages for CEO. TODO: Banquet Speech.	2015-07-07 02:39:55 +03:00
John	32a26abd79	RIP AccountDate + changed CREATED in Account to uint64 instead of string	2015-07-06 22:46:20 +03:00
John Cote	568a076266	Deprecate has_key and fix bugs	2015-07-05 21:53:42 -04:00
John Cote	7508de0d79	lol whoops	2015-07-05 21:12:17 -04:00
John Cote	468b1702d8	Convert range to xrange	2015-07-05 21:02:35 -04:00
John Cote	ad09d429fb	yay repo cleanup	2015-07-05 19:59:25 -04:00
John	9420973986	Laughing Man fix	2015-07-05 13:11:45 +03:00
Loudrob	3a29c8995f	Merge branch 'JawhnL5/nametags' ... Conflicts: toontown/building/DistributedKnockKnockDoor.py toontown/pets/Pet.py toontown/safezone/Playground.py toontown/town/Street.py	2015-07-03 14:52:24 -04:00
John	1c84579924	Fix trophy score	2015-07-03 18:11:03 +03:00
John	5dbf692bae	Fixed local toon's nametags	2015-07-03 17:52:30 +03:00
John	cf1785f7c7	Bank in inventory page	2015-07-03 00:16:47 +03:00
John	82d0bc2038	Can't use book while swimming anymore	2015-07-01 15:21:28 +03:00
John	2b02385e51	Swim run SFX	2015-07-01 15:12:45 +03:00
John	be683c8fb0	Merge branch 'news'	2015-06-30 22:07:08 +03:00
John	4911ad0607	Fix organic gags display	2015-06-30 20:11:30 +03:00
John	4990317c41	SOS head is now shown when you choose a NPC sos.	2015-06-30 17:51:50 +03:00
John	e4340eb131	Stuff that was bothering me	2015-06-29 21:54:28 +03:00
John	40875ea6f6	Knock Knock door toonups	2015-06-27 20:01:51 +03:00
John	ab10d5f05f	Swim Sound implemented	2015-06-27 18:14:04 +03:00
John Cote	48539188de	Some final nametag shit	2015-06-26 03:09:27 -04:00
John Cote	9b52f82419	UGH WHEN WILL THIS END	2015-06-26 00:32:17 -04:00
John	d15813630f	Calendar magic	2015-06-25 11:57:02 +03:00
John Cote	dab0ac32d5	More nametag shit	2015-06-24 15:08:15 -04:00
John Cote	fa24711bc8	More work	2015-06-24 14:09:51 -04:00
John Cote	c568a632f1	More work	2015-06-24 13:44:04 -04:00
John Cote	167c5c5736	Current work	2015-06-24 13:19:10 -04:00
John Cote	cadeff717d	Current work	2015-06-24 12:32:30 -04:00
John	784535541d	Tons of work.. but christmas/halloween are still not implemented properly. However fishing works now.	2015-06-24 16:49:20 +03:00
John Cote	d2b0d99175	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -04:00
John	2c8ac1add9	Scavenger hunts!! :D	2015-06-23 23:20:41 +03:00
John	7029f536c8	Holocaust HolidayManagerAI (newsmanager rewrite soon to come)	2015-06-21 22:46:17 +03:00
John	39b42edbda	They don't need more work	2015-06-21 22:33:39 +03:00
John	44edf68ff7	DBObject holocaust	2015-06-21 12:27:40 +03:00
John	5a76de3d72	Proper positions for everything above the head	2015-06-20 15:19:09 +03:00
John	c57ebf03ed	Cleanup	2015-06-20 12:24:08 +03:00
John	e0765526be	Remove setGM and gm name, now combined with setAdminAccess. TODO: disables	2015-06-18 22:26:42 +03:00
John	884e452e32	Reconsider toons only when switching true friends/speedchat	2015-06-18 17:02:51 +03:00
Loudrob	b05d274158	Misc Fixes (prepare your asshole for daniels commits)	2015-06-17 11:24:52 -04:00
John	f0c0c08719	DANIEL: Cleanup	2015-06-17 10:11:33 -04:00
John	a4708291ac	33% instead of 16%	2015-06-17 10:10:38 -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
John	8751f73779	DANIEL: More cleanup	2015-06-17 10:04:20 -04:00
John	78a7662ff4	Fix wedding cake pie	2015-06-17 10:01:55 -04:00
John	6b5226e9e3	Organic display	2015-06-17 09:58:54 -04:00
John	f42631b401	No XP cap	2015-06-17 09:58:43 -04:00
John	be659d24f7	DANIEL: Talkative tyler fix	2015-06-17 09:58:04 -04:00
John	704923f53a	DANIEL: Merits on inventory page	2015-06-17 09:50:29 -04:00
John	90a8e5a2f2	Don't hide laff meter based on full hp	2015-06-17 09:49:57 -04:00
John	8262d5afa4	Destroy head meter on toon destroy	2015-06-17 09:49:43 -04:00
John	e9842a8b65	Laff meter above head in bosses	2015-06-17 09:49:30 -04:00
John	def7ca4372	Max true friends + cleanup	2015-06-17 09:49:18 -04:00
John	7a9da93d39	DANIEL: Crash fixes	2015-06-17 09:47:43 -04:00
John	67f7c45f68	DANIEL: Chat color shit	2015-06-17 09:37:55 -04:00
John	e082fecf0b	DANIEL: Fix whispering	2015-06-17 09:35:54 -04:00
John	898d57dc1f	Fix ~ whitelist exploit, add True Friends and Speedchat Plus warnings.	2015-06-17 09:29:56 -04:00
John	702260b1b7	DANIEL: Cast member button shit	2015-06-17 09:23:45 -04:00
John	4e60722277	This was just debug	2015-06-17 09:21:58 -04:00
John	b72a755617	Unique toon identifier in avatar panel	2015-06-17 09:21:21 -04:00
John	7bad238cbe	DANIEL: New npc friends page	2015-06-17 09:20:54 -04:00
John	0c56b7c78d	DANIEL: True friends	2015-06-17 09:15:30 -04:00
John	338d83a907	DANIEL: Friends cleanup	2015-06-17 09:10:17 -04:00
John	6377cec192	Fix laff meter disappearing after using Painter Joey	2015-06-17 09:08:18 -04:00
John	93e0c04dce	DANIEL: db values cleanup	2015-06-17 09:08:02 -04:00
John	1749768a8d	DANIEL: TalkAssistant cleanup	2015-06-17 09:06:48 -04:00
John	b48fb01fb0	DANIEL: Work on whitelist	2015-06-17 09:01:28 -04:00