Commit graph

667 commits

Author SHA1 Message Date
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
18b5e46084 DC imports 2015-05-13 14:04:57 +03: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
2f301cfb7e does this even do anything? 2015-05-12 12:43:29 -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
Loudrob
2a403f28cc New astron k. 2015-05-11 19:24:38 -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
John Cote
c2920fae26 Fix parse_dcimports.bat 2015-05-11 16:13:24 -04:00
John Cote
0d8920fa1c Newlines pls 2015-05-11 16:05:49 -04:00
John Cote
a4ffd6c04b Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-11 16:03:12 -04:00
John Cote
188405a7db Cleanup the repo a bit and remove unneeded files. 2015-05-11 16:02:53 -04: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