Commit graph

66 commits

Author SHA1 Message Date
John
0c04d9d876 Remove Gag Accuracy tasks 2015-07-04 15:41:15 +03:00
John
915eff2373 Don't print out attacks everytime 2015-07-04 14:26:20 +03:00
Loudrob
3a29c8995f Merge branch 'JawhnL5/nametags'
Conflicts:
	toontown/building/DistributedKnockKnockDoor.py
	toontown/pets/Pet.py
	toontown/safezone/Playground.py
	toontown/town/Street.py
2015-07-03 14:52:24 -04:00
John
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
3660d305cd NewsManager setInvasionStatus 2015-06-30 21:50:15 +03:00
John
4990317c41 SOS head is now shown when you choose a NPC sos. 2015-06-30 17:51:50 +03:00
John
c04b4967fb Fix Zach's doors, fix immortal mode, fix unlimited gags, add new CJ cutscene. 2015-06-29 16:35:22 +03:00
John Cote
9b52f82419 UGH WHEN WILL THIS END 2015-06-26 00:32:17 -04:00
John Cote
e8a57d7251 More work 2015-06-25 14:51:27 -04:00
John Cote
dab0ac32d5 More nametag shit 2015-06-24 15:08:15 -04:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
7029f536c8 Holocaust HolidayManagerAI (newsmanager rewrite soon to come) 2015-06-21 22:46:17 +03:00
John
39b42edbda They don't need more work 2015-06-21 22:33:39 +03:00
John
44edf68ff7 DBObject holocaust 2015-06-21 12:27:40 +03:00
John
6c94355d39 FOV slider + add other sliders into TTLocalizer 2015-06-18 16:53:50 +03:00
John
6d24fb4390 Add merits unite which restocks 16.66% of the total merits required (meaning it needs a bit more than 6 unites to restock fully, even for BIg Cheese 23300 promotions.) 2015-06-17 10:08:57 -04:00
John
887fa8abda MovieCamera unused cleanup + red admin nametags instead of purple 2015-06-17 10:06:22 -04:00
John
8c0eed8214 DANIEL: "Toon has went sad" 2015-06-17 10:06:05 -04:00
John
8751f73779 DANIEL: More cleanup 2015-06-17 10:04:20 -04:00
John
78a7662ff4 Fix wedding cake pie 2015-06-17 10:01:55 -04:00
John
f42631b401 No XP cap 2015-06-17 09:58:43 -04:00
John
b4633d65ad Add a bunch of obsolete tasks, cleanup FriendInviter and fix v2.0 with townbattle GUI 2015-06-17 08:15:05 -04:00
John
b75336c8d6 Proper Cog Boss tasks (+ add AnyBoss task) 2015-06-17 08:01:06 -04:00
John
20d8727825 Thank you Joey and the TTR team 2015-06-17 08:00:42 -04:00
John
63b34432a2 Add CJ and CEO tasks, need to fix tasks tho. 2015-06-17 08:00:25 -04:00
John
35b646c4e6 Revert "Spring cleaning"
This reverts commit 1e4bad8c6b.
2015-06-16 20:26:44 +03:00
John Cote
1e4bad8c6b Spring cleaning 2015-06-15 20:56:12 -04:00
Loudrob
1303af5a13 Revert "Slightly buffed high level cogs, slightly nerfed sound and toon up."
This reverts commit 4a787248e9.
2015-05-30 13:45:20 -04:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
John Cote
badea7d47e These need some more work 2015-05-17 22:46:24 -04: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
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