Commit graph

560 commits

Author SHA1 Message Date
Zach
8bf8cf5f55 GARDENING, BITCHES 2015-05-24 18:23:54 -05:00
Master Jumblespeed
8fb39a1d49 uberfixes 2015-05-23 20:58:38 -04:00
John Cote
adafe84346 Clean 2015-05-23 01:05:43 -04:00
John Cote
1fbd0602dc Organize the repo a bit more 2015-05-22 23:47:35 -04:00
Master Jumblespeed
baaf4e787b fix clientservices + automatic name approval 2015-05-21 20:52:40 -04:00
Loudrob
820732c776 No more pro lackers who pass the limit. 2015-05-21 19:45:40 -04:00
Master Jumblespeed
6f93be4677 fixes 2015-05-18 22:28:54 -04:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
John Cote
8f7978052c Fix Silly Street crash 2015-05-18 00:28:51 -04:00
John Cote
badea7d47e These need some more work 2015-05-17 22:46:24 -04:00
John Cote
76a8190ed7 Cleanup config files, add a bool to enable/disable language selector 2015-05-17 02:04:51 -04:00
John Cote
e7f17e5299 Fix Toon deletion bug 2015-05-17 01:37:00 -04:00
John Cote
0247ec5daf Remove this 2015-05-17 01:11:46 -04:00
John Cote
a195cbe230 Remove skid colors 2015-05-17 01:11:05 -04:00
John Cote
5d55436cec Revert "Fix article names"
This reverts commit 8dea0edf21.
2015-05-17 00:57:15 -04:00
John Cote
aba9368632 Revert "Some shticker book cleanup, add Speedchat Plus and True Friends to shticker book, but we really need a OptionsPage rewrite."
This reverts commit 0d5b0cbee9.
2015-05-17 00:56:44 -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
John Cote
834e0f4385 More name changing
god fucking damn voltage
2015-05-16 23:00:56 -04:00
Master Voltage
b23c33c957 i committed them rename edits k 2015-05-16 21:04:41 -04:00
Loudrob
1d0d5fc2fe Revert "I fucked this up"
This reverts commit 74abc6ac57.
2015-05-16 14:38:34 -04:00
Loudrob
c1e1f5164a Decorations should only be used on their correct holidays pls. 2015-05-16 14:34:31 -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
87a77a8740 Fix minigame speedchat crash 2015-05-16 12:40:45 +03:00
DenialMC
bd7488dd49 Fix special tab 2015-05-16 12:19:31 +03:00
DenialMC
0d5b0cbee9 Some shticker book cleanup, add Speedchat Plus and True Friends to shticker book, but we really need a OptionsPage rewrite. 2015-05-16 12:09:03 +03:00
Master Voltage
6c3682bd75 i is good engrish now 2015-05-15 19:41:19 -04:00
John Cote
0bc41b75f9 how dare you use tabs voltage 2015-05-15 19:22:19 -04:00
Master Voltage
6cc8c2a7ba added more phrases k 2015-05-15 19:09:45 -04:00
DenialMC
8dea0edf21 Fix article names 2015-05-15 23:16:46 +03:00
DenialMC
3461d090ed What if I like gay porn 2015-05-15 22:43:59 +03:00
DenialMC
c866a4a52f No more accessory, clothing, furniture item gender discrimination! (except for skirts) 2015-05-15 22:37:41 +03:00
Loudrob
568eb60cca what if i like environ 2015-05-15 08:27:32 -04:00
Master Voltage
2dfc68ed8b Revert "Zach stop breaking shit too k"
This reverts commit 7fa0bf6d73.
2015-05-14 16:13:41 -04:00
Master Voltage
7fa0bf6d73 Zach stop breaking shit too k 2015-05-14 16:12:19 -04:00
DenialMC
8d33330192 New version number. 2015-05-14 20:54:08 +03:00
DenialMC
f784a15e1d You no longer need to wait any days to buy the items in the special menu.. and Loud, we start with 10000 beans not 15000!! 2015-05-14 20:34:00 +03:00
Loudrob
a2acb60412 y no purchase pls 2015-05-14 08:04:30 -04:00
Loudrob
c189e278ad No more terrorism. 2015-05-13 19:54:47 -04:00
DenialMC
cc781f595e fuck y'all 2015-05-14 00:22:58 +03:00
DenialMC
74abc6ac57 I fucked this up 2015-05-13 21:42:21 +03:00
DenialMC
26781efc6c All holiday decorations and activities 2015-05-13 21:36:11 +03:00
DenialMC
5b8a0428cb Perhaps this is a better solution 2015-05-13 20:40:06 +03:00
DenialMC
2649fc5256 Why was that even there!! + 5 more unique pets every day 2015-05-13 20:30:03 +03:00
DenialMC
067fb04dbd Fix new seed generation every day 2015-05-13 20:12:04 +03:00
DenialMC
db9dacb624 Import cleanup 2015-05-13 20:02:48 +03:00
DenialMC
694122266e Killed cpickle air_cancer, unused flagAv method, useless PetDCImports class (WTF!) 2015-05-13 19:54:42 +03:00
DenialMC
fb07a16d6c Fix pet friend inviting 2015-05-13 19:26:32 +03:00
DenialMC
6479913865 Crashed piano easter egg (I left the cream disabled cause it's gay) 2015-05-13 18:58:33 +03:00
DenialMC
e4f3e4a810 No disney chars in the name accepted screen 2015-05-13 18:48:02 +03:00
DenialMC
1c2548283b Renamed Secrets to True Friends, finish removing, remove Secrets button from friends list (it's only going to be on the toon avatar panel), fix 30000 jb bank, fix treasure chest GUI 2015-05-13 15:49:17 +03:00
DenialMC
8cbdbc1628 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-13 14:45:21 +03:00
DenialMC
c030f3be23 DistributedFindFour compile fix 2015-05-13 14:45:12 +03:00
Loudrob
64aafa769c Merge branch 'master' of https://gitlab.com/ToontownUnited/src
Conflicts:
	otp/distributed/DCClassImports.py
2015-05-13 07:43:36 -04:00
Loudrob
9d54f4f88a Murdered TTI's promotion system. 2015-05-13 07:41:49 -04:00
DenialMC
509a9697e6 True Friends holocausted until I make the new system tomorrow, using the panel 2015-05-13 14:04:03 +03:00
DenialMC
36bb543af6 Upstream 2015-05-13 14:00:52 +03:00
John Cote
7e227afa55 this is better k 2015-05-12 17:49:30 -04:00
John Cote
044381e312 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-12 17:02:50 -04:00
Zach
26f5addbe8 gardens have begun 2015-05-12 16:02:38 -05:00
John Cote
a402169eab fixed jor el cam crash again don't revert pls k 2015-05-12 17:02:35 -04:00
Zach
2400f44ff8 oops. now its done 2015-05-12 15:58:12 -05:00
Zach
ab3876ff0d DistributedGardenAI is done 2015-05-12 15:52:38 -05:00
Zach
37fad887da fixed the fish sale at estate 2015-05-12 14:46:35 -05:00
Zach
37097d0645 Revert "treasurechest timing"
This reverts commit e7d32197b9.
2015-05-12 13:30:10 -05:00
Zach
9271489041 LaffShopGui cleanup 2015-05-12 13:11:27 -05:00
Zach
cfd7383ded jor-el cleanup 2015-05-12 12:49:33 -05:00
Zach
8e8a194dfa john's emote cleanup 2015-05-12 12:47:58 -05:00
Zach
e7d32197b9 treasurechest timing 2015-05-12 12:42:20 -05:00
Zach
861909b881 an even more amazing GUI 2015-05-12 03:10:49 -05:00
Zach
b491ff1cfe Revert "No tussling zone."
This reverts commit 1e1a7e25fc.
2015-05-12 00:12:55 -05:00
Zach
eacdc7f4d3 um who tf: part 2 2015-05-12 00:12:08 -05:00
Zach
81e54370ed um who tf 2015-05-12 00:11:34 -05:00
Zach
ab43bd1afe a WAY better DistributedNPCLaffRestock: client, AI and GUI 2015-05-12 00:06:23 -05:00
John Cote
36e553a941 Fix Jor El Cam crash 2015-05-11 23:37:24 -04:00
John Cote
0c4d6feffa Add Cigar Smoke Cog attack 2015-05-11 22:50:12 -04:00
Loudrob
1e1a7e25fc No tussling zone. 2015-05-11 20:39:10 -04:00
John Cote
7a5bd20859 Correct Treasure Chest H and collision tube. 2015-05-11 18:16:12 -04:00
Zach
1cedf121b1 jor-el fix 2015-05-11 15:57:44 -05:00
DenialMC
989f3f89ef Revert "Correct Treasure Chest H"
This reverts commit e845fea8fa.
2015-05-11 23:45:16 +03:00
DenialMC
e845fea8fa Correct Treasure Chest H 2015-05-11 23:43:14 +03:00
DenialMC
b253e3edda Add laff restock toons to each HQ 2015-05-11 23:36:31 +03:00
DenialMC
2d055f2dea PDB must be crucified 2015-05-11 22:58:11 +03:00
John Cote
267310adc7 File cleanup and some fixes. 2015-05-11 15:05:59 -04:00
DenialMC
85406a5a52 Preparations 2015-05-11 20:06:27 +03:00
DenialMC
08417e7a55 2 more fish targets in the estate 2015-05-11 19:23:04 +03:00
DenialMC
cbf82d4a5d Laff Restock NPC (isn't anywhere in the game yet) 2015-05-11 19:21:07 +03:00
DenialMC
3e61bc9501 Treasure Chest is now destroyed properly 2015-05-11 19:18:42 +03:00
DenialMC
afdd660152 Better position for treasure chest 2015-05-11 18:11:35 +03:00
DenialMC
ef2ccf2bfe Base Treasure Chest (no rental yet) 2015-05-11 17:54:45 +03:00
DenialMC
17a352197b john plz 2015-05-11 15:39:00 +03:00
John Cote
3f83a25f3f Cleanup some code and fix Fireworks. 2015-05-11 03:12:24 -04:00
John Cote
17fc247f39 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-11 01:12:23 -04:00
John Cote
1ddb2d0a51 Toon firing Cog now says "You're Fired!" 2015-05-11 01:12:09 -04:00
Zach
e4da40fb59 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 22:53:54 -05:00
Zach
d4974e8d54 Jor-El Cam 2015-05-10 22:53:28 -05:00
John Cote
7f3c321490 Add Re-Org and finish Throw Book Cog attacks 2015-05-10 22:46:41 -04:00
John Cote
22a7a1d353 Add ThrowBook Cog attack
Assigned only to Big Wig.
2015-05-10 20:54:19 -04:00
Zach
31379d34d5 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 18:58:57 -05:00