Commit graph

109 commits

Author SHA1 Message Date
John Cote
02e452b594 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-23 16:30:06 -04:00
John Cote
14ff727052 correct delivery times 2015-07-23 16:29:56 -04:00
Loudrob
c6db0b82d8 fuck dicks 2015-07-23 16:17:43 -04: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
John
6ce7485ef4 Loudrob pls 2015-07-23 12:59:17 +03:00
John Cote
4411cb805b gtfo has_key and range 2015-07-22 01:45:01 -04:00
Loudrob
1236e38d62 Current garden progress. 2015-07-20 15:53:53 -04:00
John
7be88f4d33 Tank items should have delivery date 2015-07-18 01:36:45 +03:00
John
207f397e32 Fix trunk 2015-07-18 01:09:01 +03:00
John
24aefa8408 Nametag styles are sent now 2015-07-18 00:39:11 +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
John
98347f5b7f Accessory gender equality (Clothing equality is harder and will be done later cause of 63) 2015-07-17 20:30:29 +03:00
John
18fb9b1924 Sorry nacib 2015-07-17 19:48:30 +03:00
John
50297ca489 Trunks 2015-07-17 17:51:43 +03:00
John
feba8e73c0 Add trunks to houses 2015-07-17 16:51:45 +03:00
John
96d78ae33d Lock friends list for 1.5 seconds after loading a friend + show text when player is sending gifts too fast. 2015-07-17 15:54:12 +03:00
John
f3ca3df3c0 Fix family member display name in the mailbox 2015-07-17 15:42:04 +03:00
John
81e339d9e9 Preparation for next commit (sry have to git reset) 2015-07-17 15:40:14 +03:00
John
0d3f31971e X on order + mailbox sync + grammar 2015-07-17 15:29:08 +03:00
John
5a4dc305d1 Fix Loudrob's stuff 2015-07-17 15:04:59 +03:00
John
c21c7d53fd Sorry loudrob 2015-07-17 14:55:14 +03:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
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