86 commits

Author	SHA1	Message	Date
John	603dad00cb	Merge branch 'master' into features/ttn	2015-07-16 15:53:32 +03:00
John	88dca5c838	House fix	2015-07-16 15:53:19 +03:00
Loudrob	02444d4026	family 2 pls	2015-07-16 08:41:54 -04:00
Loudrob	6868fa1267	Merge branch 'master' into features/ttn	2015-07-14 20:49:28 -04:00
jp187187	9c349e5e42	dont fire me ;) added the 100inch cog screen	2015-07-14 17:42:29 -07:00
Loudrob	7f1d4b8e18	Merge branch 'master' into features/ttn	2015-07-14 06:38:49 -04:00
John	d9d1d66f37	Pro fix	2015-07-14 01:53:57 +03:00
John	a6b0aeaaff	HD TV + Tailor Fix	2015-07-14 01:43:13 +03:00
John	b7d8cd0a3a	Fix offline gifting	2015-07-13 18:13:17 +03:00
Loudrob	87efdba167	More gifting.	2015-07-13 10:17:56 -04:00
Loudrob	e4f432858e	it's supposed to be like this	2015-07-12 19:16:38 -04:00
Loudrob	4e8fb45531	Current progress on gifting.	2015-07-12 15:42:55 -04:00
Loudrob	c8919bf0aa	Fix buttons hiding behind catalog screen.	2015-07-12 13:44:01 -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	15d096f44d	Fix	2015-07-08 15:47:52 +03:00
John	6d1cf1ae43	Video player!	2015-07-08 15:30:25 +03:00
John	3ca278f940	Fix pet scales	2015-07-07 14:15:10 +03:00
John	85461c0107	Fix cattlelog button updating	2015-07-07 13:58:45 +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	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
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	cbec66d244	Remove Techno/Trench font	2015-07-02 21:20:43 +03:00
John Cote	7cf799814c	Deprecate CatalogChatBalloon and edit CatalogScreen for new tags	2015-06-25 19:38:35 -04:00
John Cote	d2b0d99175	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -04:00
Loudrob	49764e5163	Instant delivery for tanks.	2015-06-19 08:46:13 -04:00
John	7a9da93d39	DANIEL: Crash fixes	2015-06-17 09:47:43 -04:00
John	3e97752dff	DANIEL: Nametag color shit	2015-06-17 09:25:20 -04:00
John	7c0ba851c7	Proper TV	2015-06-17 09:19:53 -04:00
John	848293a3b9	TV	2015-06-17 09:19:41 -04:00
John	1b2c00f7a1	DANIEL: Beginning of chat stuff	2015-06-17 08:45:55 -04:00
John	a65952bb67	DANIEL: New catalog year shit	2015-06-17 08:21:11 -04:00
John	6bfb28c36f	Add tank item to cattlelog	2015-06-17 08:15:28 -04:00
John	400aac42b7	More nametags	2015-06-17 08:12:59 -04:00
John	a1fd036cf0	PBN Tag	2015-06-17 08:12:28 -04:00
John	8c47aa0fd0	Added PBN nametag font	2015-06-17 08:08:34 -04:00
John	755c9afc6a	Fix house in cattlelog	2015-06-17 08:08:15 -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	2d37860963	Patch by John L: Fix AI crash caused by CatalogGenerator	2015-06-04 14:40:55 -04:00
Zach	f25ad9caf8	merge fix and my bs devs fix	2015-05-24 18:42:26 -05:00
Zach	8bf8cf5f55	GARDENING, BITCHES	2015-05-24 18:23:54 -05:00
Master Jumblespeed	d882959bfa	switch to remote	2015-05-18 22:11:33 -04:00
John Cote	88606b3876	Revert "No more accessory, clothing, furniture item gender discrimination! (except for skirts)" ... This reverts commit c866a4a52f.	2015-05-17 00:52:14 -04:00
John Cote	35b064a59e	Some revert k	2015-05-17 00:52:07 -04:00
DenialMC	a03c70c0e6	Replace ugly method with beautiful	2015-05-16 14:03:46 +03:00
DenialMC	0f4521a19e	Initial work on gifting (still broken right now), and sry zach	2015-05-16 13:23:30 +03:00
DenialMC	bd7488dd49	Fix special tab	2015-05-16 12:19:31 +03:00