Commit graph

36 commits

Author SHA1 Message Date
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
36bb543af6 Upstream 2015-05-13 14:00:52 +03:00
John Cote
0c4d6feffa Add Cigar Smoke Cog attack 2015-05-11 22:50:12 -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
17a352197b john plz 2015-05-11 15:39:00 +03:00
John Cote
1ddb2d0a51 Toon firing Cog now says "You're Fired!" 2015-05-11 01:12:09 -04: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
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
ab3072fb84 Pets will work in battle now. 2015-05-09 02:21:07 -04:00
Zach
1918e5db37 battle debug 2015-04-27 21:01:58 -05:00
DenialMC
e7b0cb751a Animated Props fix 2015-04-28 00:30:05 +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
Loudrob
2c4cbbb025 Boolean to turn these little assholes off. 2015-04-22 07:40:47 -04:00
DenialMC
52fdf6070c No comment 2015-04-20 18:49:00 +03:00
DenialMC
8a431f83a4 Remove fire difficulty 2015-04-17 11:35:50 +03:00
DenialMC
168ae65d1e Animated Props client 2015-04-09 20:17:24 +03:00
DenialMC
45b9e2972b isPaid and getGameAccess holocausted 2015-04-08 00:15:58 +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
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
edbd2d0584 Add force generate laughing man function and use it for Magic Kitty 2015-04-04 11:26:39 +03:00
Loudrob
61bc7a974d ok 2015-04-01 08:23:03 -04:00
Daniel
e837ad96f4 Remove Trap Cat SOS 2015-03-29 21:27:49 +03:00
Daniel
f38f910638 Upstream update 2015-03-29 18:41:02 +03:00
Daniel
4881a40bc0 Curse you Loudrob 2015-03-29 17:17:34 +03:00
Loudrob
4a787248e9 Slightly buffed high level cogs, slightly nerfed sound and toon up. 2015-03-24 07:58:53 -04: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
a503e92deb fix button hiding pls k 2015-03-17 09:41:23 -04:00
Loudrob
02c7dc11e4 Initial commit 2015-03-03 17:10:12 -05:00