Commit graph

519 commits

Author SHA1 Message Date
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