Commit graph

87 commits

Author SHA1 Message Date
John
e2f45d0a0a Bitches 2015-07-15 15:35:17 -04:00
Loudrob
cd56e91057 New NetMessenger 2015-07-12 12:48:58 -04:00
John
7b953dcb0e Bossbot Boss talks a lot more now 2015-07-09 13:51:51 +03:00
John
3c4770ebc6 CEO Boss Speech 2015-07-08 03:12:12 +03:00
John
ac60242003 Add skelecog and waiter invasions to summon page 2015-07-07 21:16:55 +03:00
John
ec8ee69769 Add messages for CEO. TODO: Banquet Speech. 2015-07-07 02:39:55 +03:00
John
cb532a3fc8 CJ talks more 2015-07-07 02:04:20 +03:00
John
112184e1fd Intermission music for CFO 2015-07-07 01:54:59 +03:00
John
4ca9255561 VP talks a lot more now 2015-07-07 00:47:56 +03:00
John Cote
568a076266 Deprecate has_key and fix bugs 2015-07-05 21:53:42 -04:00
John Cote
ad09d429fb yay repo cleanup 2015-07-05 19:59:25 -04:00
John Cote
0818742d44 Fix Boss Cog speech font. 2015-07-05 19:37:38 -04:00
John
fa8cda0e40 VP Cutscene 2015-07-04 15:22:04 +03:00
Loudrob
ebe6f9d29d Dan's Typo. 2015-07-04 07:51:23 -04:00
John
fc1a9d8368 Title text shown in boss battles (such as: Sellbot Towers - Rooftop) 2015-07-04 14:24:27 +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
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