224 commits

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