Commit graph

72 commits

Author SHA1 Message Date
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
Loudrob
1716707f2d lazy 2015-07-03 13:14:21 -04:00
John
b38f8472a5 Fixed a bunch of issues at once 2015-07-03 17:46:21 +03:00
John
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
Master Voltage
35bbe535c1 nobody wants this. ever. 2015-06-29 22:55:16 -04: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
48539188de Some final nametag shit 2015-06-26 03:09:27 -04:00
John Cote
9b52f82419 UGH WHEN WILL THIS END 2015-06-26 00:32:17 -04:00
John Cote
dd45d7d7be YET MORE WORK. ALMOST DONE. 2015-06-25 23:33:15 -04:00
John Cote
167c5c5736 Current work 2015-06-24 13:19:10 -04:00
John
784535541d Tons of work.. but christmas/halloween are still not implemented properly. However fishing works now. 2015-06-24 16:49:20 +03:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
74429800e7 Battle fix 2015-06-21 22:38:00 +03:00
John
39b42edbda They don't need more work 2015-06-21 22:33:39 +03:00
John
f0c0c08719 DANIEL: Cleanup 2015-06-17 10:11:33 -04:00
John
468c192c14 Add tickets unite and make cog icons a bit smaller in the merits unite 2015-06-17 10:09:53 -04: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
9416b70e91 10% chance for a Silly Surge 2015-06-17 10:00:09 -04:00
John
10a451c883 Summon between 1000 and 3000 cogs 2015-06-17 09:51:19 -04:00
John
e9842a8b65 Laff meter above head in bosses 2015-06-17 09:49:30 -04:00
John
5a0d981185 Remove CFO staff event 2015-06-17 09:22:26 -04:00
John
d5fec41850 Show revive postfix properly 2015-06-17 08:28:12 -04:00
John
d92c28de27 Remove single cog summon, add Field Office cog summon, add V2 invasion cog summon, add Cog name to V2 invasion bulletins. 2015-06-17 08:14:19 -04:00
John
0f53845b05 DANIEL: Cogdo Tasks 2015-06-17 08:07:26 -04:00
John
b75336c8d6 Proper Cog Boss tasks (+ add AnyBoss task) 2015-06-17 08:01:06 -04:00
John
63b34432a2 Add CJ and CEO tasks, need to fix tasks tho. 2015-06-17 08:00:25 -04:00
John
dd3867b46c Better nametag wrap for cogs 2015-06-16 19:20:40 -04:00
Loudrob
e702145334 DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11' 2015-06-16 19:13:24 -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
8a01138fc6 Less dan. 2015-06-11 08:33:28 -04:00
Zach
fa284fe558 fixed boss crash 2015-05-31 14:18:47 -05:00
John Cote
3436e6a8e4 Less hacky suitA hands fix 2015-05-28 14:57:11 -04:00
John Cote
437571aefb suitA Cogs now have their proper hand colors
And with this I'd like to point out that this is technically a hack fix
since it's just not using the preloaded models whilst everything else is
2015-05-25 20:01:38 -04:00
John
9a4af9c686 Remove Welcome Valley 2015-05-24 17:21:40 +03: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
7f3c321490 Add Re-Org and finish Throw Book Cog attacks 2015-05-10 22:46:41 -04:00
John Cote
de561c6fc3 add this back 2015-05-10 16:48:14 -04:00
DenialMC
effdeab749 Remove TTI library, empty AwardManager, SillyMeterMgr, unused Award Manager strings 2015-05-10 20:43:10 +03:00
John Cote
d597e25e60 Cleanup some files 2015-05-09 13:27:08 -04:00
DenialMC
d4d5e61941 RIP Achievements, we are gonna have Top Toons tho 2015-04-29 10:49:58 +03:00
DenialMC
b2bab83cbb So much Jizzney removing that Hitler toke his life 2015-04-25 10:26:27 +03: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