Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-25 12:42:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions
1082 commits 6 branches 0 tags 524 MiB
Commit graph

884 commits

Author SHA1 Message Date
Master Voltage
b8b9891c1e disabled garden drop k 2015-05-25 14:03:51 -04:00
John Cote
0d8319be38 Parties will work now k 2015-05-25 13:42:55 -04:00
John Cote
85b8923d35 Add back Zach's fixes 2015-05-25 13:31:34 -04:00
John Cote
913f29b745 Fix party bugs 
but def not all
 2015-05-25 13:27:32 -04:00
Zach
bca7063344 gui sliders for audio 2015-05-25 06:50:59 -05:00
Zach
023cbc6acb jukebox at estate 2015-05-25 05:17:14 -05:00
John Cote
aa51d3d448 Add DLLs back and fix ARGManager crash 2015-05-25 02:38:20 -04:00
John Cote
9e389b985d Temporarily place logo on every loading screen 
This will be reverted once we get more detailed background art.
Currently, the loading screen is rather empty and boring.
 2015-05-25 01:20:35 -04:00
John Cote
64160f9aa9 Revert "Fixing Scratch Glitch" 
This reverts commit 4e91128ab8.
 2015-05-25 01:14:46 -04:00
Zach
7a7bdc1b16 Merge branch 'master' of github.com:stevetts/tts_src 2015-05-24 23:34:21 -05:00
Zach
fcc048ac12 removed teleport anim 2015-05-24 23:33:52 -05:00
Zach
eea2c7ee08 chat balloon anim changed 2015-05-24 23:22:53 -05:00
John Cote
3be3fcc10f Revert some whisper color changes 2015-05-25 00:20:15 -04:00
Xavier
ae614c372f Undo 2015-05-24 22:26:28 -04:00
Xavier
b315e0e5d8 Changed labels of TP to HQs 2015-05-24 22:24:39 -04:00
Xavier
4e91128ab8 Fixing Scratch Glitch 
Timer change might help.
 2015-05-24 21:01:13 -04:00
Zach
0f622cfe27 fixed bug 2015-05-24 18:56:45 -05: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
John
ea14534efb Unicode chat warning 2015-05-24 19:04:49 +03:00
John
c100370140 Splash Effect fix 2015-05-24 18:03:46 +03:00
John
9a4af9c686 Remove Welcome Valley 2015-05-24 17:21:40 +03: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
Zach
e1ccaa674f cannons thing 2015-05-10 18:58:31 -05:00
DenialMC
bd25086f69 Add silly meter code and make codes case insensitive 2015-05-11 01:09:48 +03:00
John Cote
de561c6fc3 add this back 2015-05-10 16:48:14 -04:00
DenialMC
41d1fda2c2 Silly Meter is now done! 2015-05-10 23:05:09 +03:00
DenialMC
83e859ae4c Add base.localAvatar check to lerpCam and add createTalkSequence 2015-05-10 22:39:47 +03:00
DenialMC
32cb6371ac Revert "removed it. sry. k" 
This reverts commit 74ac72d5b3.
 2015-05-10 22:37:01 +03:00
DenialMC
b0fffa92e4 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""""""""" 
This reverts commit dedd654453.
 2015-05-10 22:36:44 +03:00
Zach
cbd35a95ac Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 14:26:41 -05:00
Zach
74ac72d5b3 removed it. sry. k 2015-05-10 14:26:19 -05:00
Loudrob
4ad535659f Increased items on-order limit. 2015-05-10 15:19:56 -04:00
Zach
dedd654453 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""""""" 
This reverts commit 3e0fb6b605.
 2015-05-10 14:01:44 -05:00
DenialMC
5bfbeebfae Toon Hall has been literated! 2015-05-10 21:36:04 +03:00
DenialMC
d0fbe172e2 Silly Meter with magic word! Scientists are still missing though. 2015-05-10 21:24:32 +03:00
DenialMC
effdeab749 Remove TTI library, empty AwardManager, SillyMeterMgr, unused Award Manager strings 2015-05-10 20:43:10 +03:00
DenialMC
5d3e6a2f66 Photo Game holocaust 2015-05-10 20:07:09 +03:00
John Cote
70e2f91ea1 cleanup 2015-05-10 12:20:39 -04:00
DenialMC
3e0fb6b605 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""""""" 
This reverts commit 8a8e2da72b.
 2015-05-10 18:01:22 +03:00
Zach
8a8e2da72b Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""""" 
This reverts commit 2910d2ba4e.
 2015-05-10 09:04:43 -05:00
DenialMC
2910d2ba4e Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""""" 
This reverts commit 28114c2864.
 2015-05-10 17:04:08 +03:00
Zach
28114c2864 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""" 
This reverts commit a0b4c24fde.
 2015-05-10 08:59:53 -05:00
DenialMC
a0b4c24fde Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""" 
This reverts commit b5dec798f7.
 2015-05-10 16:58:45 +03:00
Zach
b5dec798f7 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""" 
This reverts commit 6a503eba9f.
 2015-05-10 08:57:52 -05:00
DenialMC
6a503eba9f Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""" 
This reverts commit 48cecb8859.
 2015-05-10 16:49:52 +03:00
Zach
48cecb8859 Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""" 
This reverts commit 70cf0ba883.
 2015-05-10 08:48:03 -05:00
DenialMC
70cf0ba883 Revert "Revert "Revert "Revert "Revert "fuck daniel""""" 
This reverts commit 45d11d7116.
 2015-05-10 16:45:00 +03:00
Zach
45d11d7116 Revert "Revert "Revert "Revert "fuck daniel"""" 
This reverts commit 474adbccc0.
 2015-05-10 08:43:57 -05:00
Zach
4d9ffefedf Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 08:43:24 -05:00
Zach
d67de6ca4e fixed loud 2015-05-10 08:42:55 -05:00
DenialMC
474adbccc0 Revert "Revert "Revert "fuck daniel""" 
This reverts commit 3668fa58b0.
 2015-05-10 16:42:05 +03:00
Zach
3668fa58b0 Revert "Revert "fuck daniel"" 
This reverts commit 4b64f5e4a4.
 2015-05-10 08:37:21 -05:00
Loudrob
91c0a1a477 daniel u skrub 2015-05-10 09:35:18 -04:00
DenialMC
4b64f5e4a4 Revert "fuck daniel" 
This reverts commit 783ed71a41.
 2015-05-10 16:32:02 +03:00
DenialMC
10421a802c Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-10 16:31:32 +03:00
DenialMC
663d3a6ed3 Fucking go die in a fire + added Unavailable to TTLocalizer 2015-05-10 16:31:15 +03:00
Zach
783ed71a41 fuck daniel 2015-05-10 08:26:52 -05:00
Zach
278294a454 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 08:06:51 -05:00
DenialMC
4be52eb5aa Skrublordism 2015-05-10 16:06:43 +03:00
Zach
1d8f4bea81 sry loud 2015-05-10 08:06:19 -05:00
DenialMC
36400d6e51 Rename config options, enable photo game, enable game tables, remove config options for live updates, long pattern games, resistance disables, enable estate day night, remove election leftovers, remove goonsEnabled leftovers, shorten estate nights, remove Dance resistance message. 2015-05-10 15:31:46 +03:00
Zach
55d06848e6 gardening AIs again 2015-05-10 07:10:32 -05:00
Zach
32fa7ca56c Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 07:01:13 -05:00
Zach
ec9072a0f9 more gardening AIs 2015-05-10 07:00:38 -05:00
DenialMC
f9d5707018 Donald NPC in Donalds Dock 2015-05-10 14:56:49 +03:00
Zach
c1a45bcb06 gardening AIs 2015-05-10 06:47:03 -05:00
Zach
747bcd898b rage emote 2015-05-10 06:25:02 -05:00
Zach
ad4eab559f chat balloons 2015-05-10 05:51:55 -05:00
John Cote
7a498feefd Possible crash fix 2015-05-09 13:42:23 -04:00
John Cote
d597e25e60 Cleanup some files 2015-05-09 13:27:08 -04:00
John Cote
6b4329d263 Fixed pet trick data in battle. 2015-05-09 12:52:12 -04:00
John Cote
0c5fb238cb cogs will now walk after exploding 2015-05-09 12:25:46 -04:00
John Cote
460587cbd7 Cleanup and typo fix. 2015-05-09 03:04:51 -04:00
John Cote
4fa3762300 funny farm stuff 2015-05-09 02:34:19 -04:00
John Cote
ab3072fb84 Pets will work in battle now. 2015-05-09 02:21:07 -04:00
John Cote
6bd6420254 Some pet file edits 2015-05-09 01:23:58 -04:00
John Cote
fc3606d658 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-07 20:39:23 -04:00
John Cote
37c14808ba Small edits 2015-05-07 20:39:04 -04:00
Loudrob
8743df7ec6 Better Sellbot HQ drop points. 2015-05-07 17:32:53 -04:00
Loudrob
330cfb7b4b Fixed cog level gui. 2015-05-06 18:15:07 -04:00
Loudrob
f8a7e32d7b Will be tested when the time cums. 2015-05-06 15:48:32 -04:00
DenialMC
17dfe7a1b2 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-06 21:04:24 +03:00
DenialMC
cbc94f56bb Added a bunch of new decoration and games, but those games dont work 2015-05-06 21:04:18 +03:00
Loudrob
a96e9e8910 Added v2.0 and skelecog to cog level gui. 2015-05-06 13:19:29 -04:00
Loudrob
1e248a081a ARGManager for future purposes. 2015-05-06 13:17:08 -04:00
DenialMC
d75887e862 Stuff, remove unused Brutal Leg Factory (somebody renamed it to MegaCorp) 2015-05-06 11:39:48 +03:00
DenialMC
a38bea2fdc If only we had a Panda3D repo.. 2015-05-06 10:47:43 +03:00
DenialMC
5e45804b51 Ain't anybody got time fo dis 2015-05-06 10:44:56 +03:00
DenialMC
a617cf7252 Fix logout, add notice to Bug Report site, add bug report site to ToontownGlobals. 2015-05-06 10:36:27 +03:00
John Cote
16f2f39160 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-05 19:29:13 -04:00
John Cote
52abb45514 New loading screen. 
Unfinished, maybe in future add gears/gags to loading screen for the matching areas and some other misc. tweaks. Also, we need new background artwork for the Toon and Cog areas.
 2015-05-05 19:28:55 -04:00
Loudrob
f814b63c08 Added year field, and appropriate message for month, day and year code rejection. 2015-05-05 18:10:39 -04:00
Loudrob
712e41a369 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-05 16:26:57 -04:00
Loudrob
48f474c423 Magic word to remove redeemed code. 2015-05-05 16:25:45 -04:00
DenialMC
b5cd121dca Quests, minigames 2015-05-05 23:04:40 +03:00
DenialMC
dd0b4fdbbe Fixed Tug-o-War, removed Trolley Tracks and temp minigame AI 2015-05-05 21:43:30 +03:00
DenialMC
2f528c1aa6 No one liked you anyways, Pairing Game 2015-05-05 18:13:10 +03:00
Loudrob
c623f806cc Bug report button k. 2015-05-03 12:38:18 -04:00
Loudrob
8c7498d548 Merge branch 'rental-items' 
Conflicts:
	config/release/dev.prc
	otp/distributed/DCClassImports.py
	toontown/estate/DistributedEstateAI.py
 2015-05-03 09:10:19 -04:00
Loudrob
ba84f8da09 Ready to be merged and fixed by the rest of you nigrars aswell. 2015-05-03 09:07:33 -04:00
Zach
dcc4621456 DistributedPicnicTable cleanupDelayDeletes 2015-05-02 19:11:26 -05:00
Zach
cbf9c8451d DistributedPicnicTable 2015-05-02 19:00:49 -05:00
Zach
758ca8188a fixed OZHoodAI 2015-05-02 18:47:45 -05:00
Loudrob
d5875dd5c0 Revert "OZHoodAI" 
This reverts commit bd4c2209d4.
 2015-05-02 17:50:43 -04:00
Zach
bd4c2209d4 OZHoodAI 2015-05-02 16:47:49 -05:00
John Cote
a06cb1c757 fix the cog golf courses k 2015-05-02 11:01:08 -04:00
Zach
99830ee5a7 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-02 01:59:25 -05:00
Zach
8d90246edf GET REKT M8! 420 YOLO SWAG 360 CROSSMAP NOSCOPE 2015-05-02 01:58:49 -05:00
John Cote
38dfc863af so many spaces ugh 2015-04-30 20:10:54 -04:00
Loudrob
21e1d98e76 Garden Game Widescreen. 2015-04-30 18:59:22 -04:00
Zach
0f06855621 teleport transition and npc transition update 2015-04-30 01:27:17 -05:00
Zach
31e5ed5f7e Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-04-29 22:45:49 -05:00
Zach
fd52a8a820 kickass transition 2015-04-29 22:45:13 -05:00
John Cote
a226523ef2 Cleanup Voltage's last commit. 2015-04-29 19:16:59 -04:00
Master Voltage
47bfb6210c Zach stop breaking the beautiful track shop k 2015-04-29 18:27:02 -04:00
Loudrob
2a429014b4 Someone else work on this fugly dna shit in OZHoodAI 2015-04-29 18:22:38 -04:00
Loudrob
95eba74b1c No funny farm. 2015-04-29 08:25:31 -04:00
Loudrob
abccde1cfb Began work. 2015-04-29 07:48:29 -04:00
DenialMC
0a0f8bfa3b Remove Polar Bear manager (Dr Surlee from TTR) 2015-04-29 11:36:27 +03:00
John Cote
20309174ee Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-29 04:15:18 -04:00
John Cote
4be89cbfb3 Cleanup toontown/estate 2015-04-29 04:12:56 -04:00
DenialMC
d4d5e61941 RIP Achievements, we are gonna have Top Toons tho 2015-04-29 10:49:58 +03:00
John Cote
1ed2a72334 yeah 2015-04-29 00:24:50 -04:00
John Cote
cf61baa1b2 Slight toontown/uberdog cleanup 2015-04-29 00:16:01 -04:00
John Cote
e90c943e2b toontown/achievements cleanup 2015-04-29 00:09:06 -04:00
John Cote
59a6e2ece1 toontown/ai cleanup 2015-04-29 00:01:52 -04:00
John Cote
a71ed6fc7b Add some more Cogdo AI that may be useful later on 2015-04-28 23:26:53 -04:00
John Cote
d49c95731c Remove prototype flying game 2015-04-28 23:01:52 -04:00
John Cote
3bc9a90157 More LBFO widescreen 2015-04-28 22:24:57 -04:00
Loudrob
ab0a57822d Get rid of multiple file support. 2015-04-28 20:07:36 -04:00
John Cote
2234c4486e More Cogdo edits 2015-04-28 16:52:16 -04:00
John Cote
d746a9cd13 yeah 2015-04-28 14:39:08 -04:00
Loudrob
518a9c6e0c shit 2015-04-28 08:36:01 -04:00
John Cote
b870c27184 Some Cogdo edits 2015-04-28 03:07:50 -04:00
John Cote
40a74a02eb Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-28 00:25:12 -04:00
John Cote
985b2a345b Pet file cleanup 2015-04-28 00:24:58 -04:00
Zach
1918e5db37 battle debug 2015-04-27 21:01:58 -05:00
John Cote
cc33dee614 Cleanup many Cogdo files. 2015-04-27 19:51:51 -04:00
DenialMC
e7b0cb751a Animated Props fix 2015-04-28 00:30:05 +03:00
Loudrob
b437fa90f0 Readd system administrator accessLevel 2015-04-27 07:35:09 -04:00
John Cote
52553e5bf9 Fix the party spawn title text. 2015-04-26 18:19:01 -04:00
DenialMC
4a1ac56d02 Remove access level 700 2015-04-26 19:06:49 +03:00
DenialMC
0412c60083 Cogdo tasks 2015-04-25 15:11:06 +03:00
DenialMC
587e734ba2 TimeManager cleanup and add death on game exit in cog battle 2015-04-25 14:18:50 +03:00
DenialMC
b2bab83cbb So much Jizzney removing that Hitler toke his life 2015-04-25 10:26:27 +03:00
DenialMC
578ee39c60 Some random stuff 2015-04-25 08:11:01 +03:00
DenialMC
c6c4b978a8 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-24 16:36:29 +03:00
DenialMC
ac224306b2 Singing removed 2015-04-24 16:36:03 +03:00
Zach
475e4f37f7 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-04-23 21:08:12 -05:00
Zach
eec533a48b GroupManager updates 2015-04-23 21:07:17 -05:00
DenialMC
dca35c221b Stuff 2015-04-24 01:18:16 +03:00
DenialMC
f27d6392db Holeycaust - more preparations 2015-04-23 20:55:47 +03:00
DenialMC
c3ac8aff07 More holocaust 2015-04-23 01:17:51 +03:00
DenialMC
b2f2e96716 Removed guilds 2015-04-23 00:47:13 +03:00
Loudrob
2c4cbbb025 Boolean to turn these little assholes off. 2015-04-22 07:40:47 -04:00
Zach
4b5c0e29be Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-04-21 22:33:18 -05:00
Zach
04dd4548e6 GroupManagerAI crash fix 2015-04-21 22:31:41 -05:00
Loudrob
342105302b I like the name extra better. 2015-04-21 18:20:07 -04:00
Zach
56f312a1d7 TrackShop gui and air_cache fix 2015-04-21 13:44:10 -05:00
DenialMC
52fdf6070c No comment 2015-04-20 18:49:00 +03:00
DenialMC
1ff86c076d Start on Fish Bingo 2015-04-19 02:01:14 +03:00
DenialMC
1364ee1021 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-19 01:54:45 +03:00
DenialMC
adbf8bead5 Remove some cancer clothes 2015-04-19 01:53:53 +03:00
DenialMC
c956878118 Remove racism 2015-04-19 01:52:33 +03:00
DenialMC
8a431f83a4 Remove fire difficulty 2015-04-17 11:35:50 +03:00
DenialMC
aa011d98a3 Added gu editor and removed unused debug lines from injector 2015-04-10 20:06:17 +03:00
DenialMC
7d82aedce8 Removed hydrant sounds 2015-04-10 16:34:44 +03:00
DenialMC
41521624cf Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-10 15:36:53 +03:00
DenialMC
b691a2e441 Fishing just got slapped by my big cock 2015-04-10 15:36:43 +03:00
Loudrob
1ceab36e9b fix daniels bank gui 2015-04-10 07:50:25 -04:00
DenialMC
f8d82e356d Give people teleport access to the HQ when they get their last suit 2015-04-10 14:45:08 +03:00
DenialMC
fa78289835 Add config option to give SOS cards 2015-04-10 14:08:35 +03:00
DenialMC
d0daa44f93 Fix some TTI cancer 2015-04-10 13:59:19 +03:00
DenialMC
8d8c131bad Animated props AI 2015-04-10 11:59:34 +03:00
DenialMC
4cfa6e89e7 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-10 11:26:12 +03:00
DenialMC
9cf6ba6194 Added logo in ToonInterior 2015-04-10 11:25:53 +03:00
Loudrob
e40c8561a9 Can lose parts in the VP. 2015-04-09 18:54:38 -04:00
DenialMC
168ae65d1e Animated Props client 2015-04-09 20:17:24 +03:00
DenialMC
8797c149a7 Implement unused accessories from To-Do list, change friendship decline message 2015-04-09 17:22:31 +03:00
DenialMC
ce5d6e125a Special arrow color option 2015-04-09 17:05:57 +03:00
DenialMC
78ab9750d9 Random stuff 2015-04-09 16:46:52 +03:00
DenialMC
eab3fb5e93 Remove ProductPrefix, don't remove parts after losing boss, change parts back to 17-14-12-10, don't give parts after mint/country club/district attorney, add back Cashbot, Lawbot, Bossbot quests 2015-04-09 15:22:34 +03:00
DenialMC
64322c9768 Bye street signs 2015-04-09 14:39:58 +03:00
John
7b3ded4f3f April Toons Week (doodles talk, low gravity in Estate, speedchat menu) added! 2015-04-09 14:05:29 +03:00
John
7b2fea85bb Black Cat Day implemented on every 13th 2015-06-22 13:10:54 +03:00
John
6ba9b8ef51 Starting work on news 2015-06-22 10:23:46 +03:00
DenialMC
510e70df2d Tweak: Outdoor Zone teleport access like Goofy's Speedway 2015-04-08 23:01:00 +03:00
DenialMC
c823ff41e6 Revert "We don't need this" 
This reverts commit e9729a2ba6.
 2015-04-08 22:34:30 +03:00
DenialMC
e9729a2ba6 We don't need this 2015-04-08 20:28:00 +03:00
DenialMC
4a01e12091 Fix rescheduling 2015-04-08 20:22:13 +03:00
DenialMC
16dfbb003b More stuff 2015-04-08 20:19:02 +03:00
DenialMC
7b9174b692 Fixes 2015-04-08 20:09:38 +03:00
DenialMC
f4598d9141 Fix for developer account database 2015-04-08 19:45:10 +03:00
DenialMC
3ce32fe9d5 Reporting! 2015-04-08 19:43:28 +03:00
DenialMC
71f72ef913 Um why did I do this? 2015-04-08 15:35:45 +03:00
DenialMC
5d875cb022 Exponential increase for Bank GUI 2015-04-08 15:34:13 +03:00
DenialMC
d8e5a75f19 Don't add banks to the attic 2015-04-08 15:26:11 +03:00
DenialMC
1299a5317e gay 2015-04-08 15:13:40 +03:00
DenialMC
f9f0616466 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-08 15:07:27 +03:00
DenialMC
dd9f513515 More fixes and set the bank prices 2015-04-08 15:07:11 +03:00
Loudrob
b28bb2824a for testing purposes 2015-04-08 08:05:00 -04:00
DenialMC
88416e6ec1 Hot fix 2015-04-08 14:59:32 +03:00
DenialMC
4ef9b360bd Dumm dumm dumm.. the Bank Update 2015-04-08 14:51:59 +03:00
DenialMC
d36f957694 TutorialForceAcknowledge, DownloadForceAcknowledge and the huge launcher is exterminated. 2015-04-08 11:56:49 +03:00
DenialMC
977da9210f Forgot to remove this 2015-04-08 00:18:46 +03:00
DenialMC
45b9e2972b isPaid and getGameAccess holocausted 2015-04-08 00:15:58 +03:00
DenialMC
bc14a3dd9c Holocaust 2015-04-07 22:56:58 +03:00
DenialMC
7cfa2866b9 Some more true friends work (commited before git reset) 2015-04-07 22:31:53 +03:00
DenialMC
55c8214743 Disney pls 2015-04-07 21:51:54 +03:00
DenialMC
3ec488f39c Ignoring! 2015-04-07 21:43:25 +03:00
DenialMC
9568591627 Flippy will now turn you into a black cat on October 31 2015-04-07 17:55:39 +03:00
DenialMC
04233eb9f3 Revert "Holocausted Welcome Valley" 
This reverts commit ad91b21823.
 2015-04-07 17:19:50 +03:00
DenialMC
ad91b21823 Holocausted Welcome Valley 2015-04-07 16:30:49 +03:00
Loudrob
bae578b5d7 Time to start over boys!!!!! 2015-04-06 18:53:47 -04:00
Loudrob
eeacd947b8 ass 2015-04-06 18:32:39 -04:00
Loudrob
5c3ae8a0ba Revert "daniel and loud, look at the current error" 
This reverts commit bf46f64382.
 2015-04-06 18:20:07 -04:00
Loudrob
10da5ad398 Revert "trees and boxes" 
This reverts commit 9ea697b1cb.
 2015-04-06 18:19:51 -04:00
DenialMC
9d042186b7 Do more true friends stuff (Please, fix async Denial) 2015-04-06 21:53:06 +03:00
DenialMC
170718fc80 True Friends done (almost). Still have to actually do the chat part. 2015-04-06 20:49:22 +03:00
DenialMC
4e470c4ee0 Start on true friends 2015-04-06 15:48:06 +03:00
DenialMC
11913788e9 Holocaust - prepare for chat update 2015-04-06 12:32:54 +03:00
DenialMC
f1f427a3e8 Add banning with new login system 2015-04-05 18:28:08 +03:00
DenialMC
5539bf7ca9 Fixed Make-A-Toon warping, fix names, add phallic and phallus to blacklist 2015-04-05 17:32:34 +03:00
DenialMC
0e9e48ceff Add blacklist and fix bugs 2015-04-05 16:54:24 +03:00
DenialMC
2a2e325a92 Implement name accepting using login server 2015-04-05 16:29:32 +03:00
DenialMC
3eb20db6da Add a proper key 2015-04-05 13:51:59 +03:00
DenialMC
8a401c4687 Add new Remote DB with login server! TO-DO: Name system 2015-04-05 13:49:09 +03:00
DenialMC
6436cb9f0f Code Redemption cleanup 2015-04-04 13:29:27 +03:00
DenialMC
b6cf9c8f22 Clean up more options page, add strings to the localizer, add new strings to the more options page, add cogLevel settings properly. 2015-04-04 13:14:39 +03:00
DenialMC
73dbf43edb Consider holiday when setting Laughing Man head by DNA 2015-04-04 12:56:55 +03:00
DenialMC
b4af78209c Add Laughing Man holiday end (everybody loses their head), add Laughing Man to DNA instead of explicitly showing it, add ~dna laughingman [0/1] 2015-04-04 12:50:42 +03:00
DenialMC
b7654d438d Convert all tabs to spaces 2015-04-04 11:31:28 +03:00
DenialMC
edbd2d0584 Add force generate laughing man function and use it for Magic Kitty 2015-04-04 11:26:39 +03:00
DenialMC
99c29e64a4 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-04-04 11:21:09 +03:00
DenialMC
e0df87ac48 Holiday stuff - cleanup, add Laughing Man holiday (everybody gets Laughing Man heads, including NPCs), add ~startHoliday and ~endHoliday magic word, clean up Laughing Man effect, remove Secret NPC 2015-04-04 11:20:42 +03:00
Nigger
50bbe79aac Minor tweaks to cog invasions, preparing for v3 cogs and the other cogdo types 2015-04-04 03:30:05 -04:00
DenialMC
7065e2b06f Fix loading 2015-04-04 07:57:23 +03:00
DenialMC
acfdd18629 Put QuestScripts and SequenceList into the code 2015-04-02 17:02:01 +03:00
Loudrob
233dbd4ba9 sequence asslist and chathoes 2015-04-02 08:23:24 -04:00
Loudrob
c8f5d19c11 Revert "Added staff chat channels." 
This reverts commit c72e45fbc4.
 2015-04-01 16:30:08 -04:00
Loudrob
b5c8ba3fcb Revert "oo[pssieisss" 
This reverts commit 260e5af56f.
 2015-04-01 16:29:52 -04:00
Loudrob
010c075265 Revert "Made it not crash uberdog lel" 
This reverts commit 72b6ef5afd.
 2015-04-01 16:29:34 -04:00
Loudrob
61bc7a974d ok 2015-04-01 08:23:03 -04:00
Loudrob
72b6ef5afd Made it not crash uberdog lel 2015-04-01 07:39:59 -04:00
Loudrob
d251898a11 Another one. 2015-04-01 06:51:39 -04:00
Loudrob
976de78682 Removed some of the TTI-ish features from Loading Screen and added globals for new street. 2015-03-31 23:07:13 -04:00
Loudrob
a2a1ea6fa7 Started Rock-A-Bye road stuff. 2015-03-31 19:12:18 -04:00
Loudrob
260e5af56f oo[pssieisss 2015-03-31 08:16:01 -04:00
Loudrob
c72e45fbc4 Added staff chat channels. 2015-03-31 07:59:36 -04:00
Loudrob
5b1136a11b No more fugly cog level gui. 2015-03-30 18:57:42 -04:00
Daniel
9a9683bc20 Fix track shop 2015-03-30 20:29:53 +03:00
Loudrob
47361ccb04 Some pet stuff. 2015-03-29 18:16:26 -04:00
Loudrob
4e50e8a485 Improved scale of cog heads in Level Gui. 2015-03-29 16:55:15 -04:00
Loudrob
682cc001f2 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-29 15:06:16 -04:00
Loudrob
72cd51bf93 Added Cog Level Gui, time to polish it... 2015-03-29 15:05:19 -04:00
Daniel
e837ad96f4 Remove Trap Cat SOS 2015-03-29 21:27:49 +03:00
Daniel
48998e45ce Remove classic chars and add Match Blinky minigame 2015-03-29 20:45:32 +03:00
Daniel
983eb61b68 Fix pet shop 2015-03-29 19:46:50 +03:00
Loudrob
35abc0b1c3 Fix 2015-03-29 12:19:47 -04:00
Loudrob
9b755ed2a7 New record is supposed to be orange. 2015-03-29 12:08:31 -04:00
Loudrob
13a06febcf Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-29 11:58:46 -04:00
Loudrob
c79f5498e1 Revert "Potential street teleport fix" 
This reverts commit e0ea00b3bd.
 2015-03-29 11:55:35 -04:00
Daniel
f38f910638 Upstream update 2015-03-29 18:41:02 +03:00
Daniel
e0ea00b3bd Potential street teleport fix 2015-03-29 17:36:54 +03:00
Daniel
4881a40bc0 Curse you Loudrob 2015-03-29 17:17:34 +03:00
Daniel
aeca29a278 Fix server connecting 2015-03-29 16:35:45 +03:00
Loudrob
5358614551 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-29 09:10:46 -04:00
Loudrob
bd5133514d Merge branch 'cogdo' 2015-03-29 09:08:13 -04:00
Loudrob
64845859ff Began work on emblem items, we don't really need these urgently. 2015-03-29 09:06:13 -04:00
Daniel
887ab8443f More killing 2015-03-29 14:59:51 +03:00
Daniel
6726d7e589 Merge branch 'master' of http://gitlab.com/toontown-created/src 2015-03-29 14:39:32 +03:00
Daniel
9a58ff9568 Remove some Disney shit 2015-03-29 14:38:52 +03:00
Daniel
d1b9ec2621 Fix flying game timer 2015-03-29 14:06:26 +03:00
Daniel
c768b80e60 Fix SOS movie 2015-03-29 11:34:11 +03:00
Daniel
1347aa2a99 Few movie fixes 2015-03-29 11:04:53 +03:00
Loudrob
67c5f4b728 Made this line less cancerous... 2015-03-28 18:06:45 -04:00
Wilee999
4991efc4c3 ChatGlobals: added red whispers and orange for boarding groups 2015-03-28 14:12:32 -07:00
Wilee999
7d322d4d34 DistributedTagGame: fixed... 2015-03-28 13:08:51 -07:00
Daniel
ed72ba279d Cogdo graphic fixes 2015-03-28 21:21:39 +02:00
Wilee999
0ac90fcc8a DistributedTagGame: forgot to add The Burrrgh 2015-03-28 18:40:24 +00:00
Wilee999
1d7b082758 DistributedTagGame: added MML and DG tag arenas (randomizer) 2015-03-28 18:38:13 +00:00
Loudrob
00c2bf3db8 Cogdos 95% done! Time for Daniel to bring in the iron! 2015-03-28 13:31:51 -04:00
Loudrob
8374e30b74 Great progress indeed. 2015-03-27 19:25:31 -04:00
Loudrob
83b204098c More Cogdo stuff. 2015-03-26 22:48:23 -04:00
Loudrob
bced66317b Began work on Cogdos. 2015-03-26 20:09:32 -04:00
Loudrob
4a787248e9 Slightly buffed high level cogs, slightly nerfed sound and toon up. 2015-03-24 07:58:53 -04:00
Loudrob
4855f1c3b9 Rental items 95% done. 2015-03-23 16:28:42 -04:00
Daniel
5199150ed4 Catalog gifting: Load friends 2015-03-23 16:15:27 +02:00
Daniel
970c945fda Allow first time players to choose if they want to do the Toontorial 2015-03-23 15:25:18 +02:00
Daniel
c0f7d83b00 Prevent crashes 2015-03-23 15:02:20 +02:00
Daniel
6ef7223997 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-23 14:58:20 +02:00
Daniel
28fcb317f5 I'm so inefficient today 2015-03-23 14:58:05 +02:00
Loudrob
fbbaf9c4e3 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-23 08:57:28 -04:00
Loudrob
0f24fb0ffd RENTALS: Began work on rentals. 2015-03-23 08:56:48 -04:00
Daniel
c2797e4260 Fixed Clara 2015-03-23 14:49:12 +02:00
Daniel
22ca07fa7b I just pulled a TTF 2015-03-23 14:25:17 +02:00
Daniel
4aff992837 Oops.. fixed 2015-03-23 14:21:12 +02:00
Daniel
db0e37d784 RIP arrows 2015-03-23 14:19:31 +02:00
Daniel
a987c05e5c Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-23 14:16:35 +02:00
Daniel
44d5ef5a18 Toontorial update! 
#1 Fixed giving gags at start of toontorial
#2 Don't force toontorial skip
#3 Properly show tutorial reward scene
#4 Remove Japanese bullshit
#5 Fix Clara - she now shows the preview for all gag tracks
#6 Fix Localizer - they don't lie anymore - You have no gags! Duh I have.
#7 Fix Flunky task.
 2015-03-23 14:16:25 +02:00
Loudrob
2178afb292 Accessory Delivery: Was this so difficult? 2015-03-23 07:51:32 -04:00