Commit graph

350 commits

Author SHA1 Message Date
John
86c6598284 Hypno Glass 2015-07-09 21:23:01 +03:00
John
071ee08176 It is always available. 2015-07-09 17:43:52 +03:00
John Cote
059b7801cb ClientStart can screw off. 2015-07-08 08:15:51 -04:00
John Cote
d0c0054e89 Fix an issue w/ describeException not working. 2015-07-08 08:06:14 -04: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
e4d46fa992 Newbie Quests holocausted 2015-07-07 19:15:35 +03:00
John
0a3df8b2ea Fix music and sfx toggle 2015-07-07 13:27:23 +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
7d7686b900 Add messages for CFO 2015-07-07 01:49:02 +03:00
John
4ca9255561 VP talks a lot more now 2015-07-07 00:47:56 +03:00
John
394e232b6d Boss Taunts when releasing cogs 2015-07-06 21:20:32 +03:00
John Cote
468b1702d8 Convert range to xrange 2015-07-05 21:02:35 -04:00
John Cote
ad09d429fb yay repo cleanup 2015-07-05 19:59:25 -04:00
John
e31154ffc6 Cashbot Treasury Vault 2015-07-06 02:39:08 +03:00
Master Jumblespeed
6586760947 cleanup 2015-07-04 15:18:48 -04:00
Master Jumblespeed
49b26c4103 csmud: adjust remotedb 2015-07-04 15:13:29 -04:00
John
0c04d9d876 Remove Gag Accuracy tasks 2015-07-04 15:41:15 +03: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
cbec66d244 Remove Techno/Trench font 2015-07-02 21:20:43 +03: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
6bb4ea0dbe ToontownTimer callback support 2015-06-30 20:11:20 +03:00
John
3ff23f8656 Boarding parties fixed 2015-06-29 19:44:23 +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
40875ea6f6 Knock Knock door toonups 2015-06-27 20:01:51 +03:00
John
812164a696 Valentines Day 2015-06-25 21:43:32 +03:00
John
721a28d9cf Fireworks 2015-06-25 21:20:15 +03:00
John
d15813630f Calendar magic 2015-06-25 11:57:02 +03:00
John Cote
cadeff717d Current work 2015-06-24 12:32:30 -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
2c8ac1add9 Scavenger hunts!! :D 2015-06-23 23:20:41 +03:00
Master Voltage
c269969ab9 RockAByeRoad is kill 2015-06-23 11:06:00 -04:00
John
2b6ca4e5cd Create general EffectMgr for cheesy effects, implement getEndDate for holidays, and implement Ides of March 2015-06-23 15:27:14 +03:00
John
39b42edbda They don't need more work 2015-06-21 22:33:39 +03:00
John
539afab9fe Minigame skipping 2015-06-21 22:09:31 +03:00
John
ad7c327752 I can't believe how many times I removed trolley holiday/weekend 2015-06-21 11:16:48 +03:00
John
8b5f1d040e Stride 2015-06-20 15:51:55 +03:00
John
e0765526be Remove setGM and gm name, now combined with setAdminAccess. TODO: disables 2015-06-18 22:26:42 +03:00
John
6c94355d39 FOV slider + add other sliders into TTLocalizer 2015-06-18 16:53:50 +03:00
Loudrob
4a5f177318 Merge branch 'master' of https://github.com/stevetts/tts_src
Conflicts:
	toontown/toonbase/ToontownGlobals.py
2015-06-17 11:26:10 -04:00
Loudrob
b05d274158 Misc Fixes (prepare your asshole for daniels commits) 2015-06-17 11:24:52 -04:00
John
8004cb953c Where did this go 2015-06-17 18:18:06 +03: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
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
db17bbdc84 ChatGlobals cleanup 2015-06-17 10:00:36 -04:00
John
9416b70e91 10% chance for a Silly Surge 2015-06-17 10:00:09 -04:00
John
f42631b401 No XP cap 2015-06-17 09:58:43 -04:00
John
def7ca4372 Max true friends + cleanup 2015-06-17 09:49:18 -04:00
John
4cda455edc DANIEL: Leaderboards are done 8======D 2015-06-17 09:42:15 -04:00
John
9db517cfb3 DANIEL: Cycle through races shit 2015-06-17 09:40:24 -04:00
John
702260b1b7 DANIEL: Cast member button shit 2015-06-17 09:23:45 -04:00
John
b72a755617 Unique toon identifier in avatar panel 2015-06-17 09:21:21 -04:00
John
0c56b7c78d DANIEL: True friends 2015-06-17 09:15:30 -04:00
John
b48fb01fb0 DANIEL: Work on whitelist 2015-06-17 09:01:28 -04:00
John
aeed161e9a Misc stuff 2015-06-17 08:28:54 -04:00
John
d5fec41850 Show revive postfix properly 2015-06-17 08:28:12 -04:00
John
c3fa3bd3c3 DANIEL: Better cog panel text stuff 2015-06-17 08:27:38 -04:00
John
6bfb28c36f Add tank item to cattlelog 2015-06-17 08:15:28 -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
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
400aac42b7 More nametags 2015-06-17 08:12:59 -04:00
John
8c47aa0fd0 Added PBN nametag font 2015-06-17 08:08:34 -04:00
John
0f53845b05 DANIEL: Cogdo Tasks 2015-06-17 08:07:26 -04:00
John
167b42447b Added Beta Toontown after-tutorial tasks 2015-06-17 08:03:25 -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
6573d40c91 Tutorial fix 2015-06-17 07:59:40 -04:00
John Cote
f024e9b7a6 TTS will work on Panda3D 1.10.0 now... somewhat
The OTPDialog needs to be fixed k
2015-06-16 22:59:19 -04:00
John
81728b339a DANIEL: Better glove NPC 2015-06-16 19:41:34 -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
Master Voltage
25a5b8f625 future events for field offices - corrected 2015-06-13 12:25:28 -04:00
Master Voltage
ee4bd81564 Revert "things for future events with field offices"
This reverts commit b95ea6fe89.
2015-06-13 02:51:03 -04:00
Master Voltage
b95ea6fe89 things for future events with field offices 2015-06-13 01:07:33 -04:00
Loudrob
8a01138fc6 Less dan. 2015-06-11 08:33:28 -04:00
John Cote
f8cbcf6473 We use NiraiStart now, so we do not need ClientStartDist. 2015-06-05 20:41:31 -04:00
John Cote
fe825c8783 Cleanup 2 2015-06-05 01:32:41 -04:00
John Cote
9b5a92c449 Merge pull request #38 from stevetts/master
Merge
2015-06-05 01:06:47 -04:00
John Cote
0d198f9f5d Cleanup 2015-06-05 01:05:01 -04:00
Loudrob
585dff5132 Default account-server secret for remotedb. 2015-06-04 19:59:27 -04:00
John Cote
965708844c Bye bye content pack manager 2015-06-02 19:12:08 -04:00
loblao
0b2107c04d CSM: new tokens + holocaust dc imports 2015-05-31 17:08:46 -03: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
Zach
d962bd6ea0 removed track shop 2015-05-30 10:06:50 -05:00
Zach
7000d6a0a7 organized folders 2015-05-29 05:03:48 -05:00
Master Voltage
7d5739c442 this bugged me k 2015-05-28 16:27:08 -04:00
Zach
ac9b768270 fixed loading screen music volume 2015-05-27 03:46:48 -05:00
Zach
2545b2ba37 forgot these. also remove magic cat sos 2015-05-26 17:58:02 -05:00
Xavier
1813fd2f6a Final 2015-05-26 00:44:49 -04:00
Xavier
21fc265b20 Revert "Now heading to street name"
This reverts commit 039bff5da7.
2015-05-26 00:42:55 -04:00
Xavier
039bff5da7 Now heading to street name 2015-05-26 00:40:49 -04:00
John
9a4af9c686 Remove Welcome Valley 2015-05-24 17:21:40 +03:00
Loudrob
820732c776 No more pro lackers who pass the limit. 2015-05-21 19:45:40 -04:00
Master Jumblespeed
6f93be4677 fixes 2015-05-18 22:28:54 -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
John Cote
0247ec5daf Remove this 2015-05-17 01:11:46 -04:00
John Cote
5d55436cec Revert "Fix article names"
This reverts commit 8dea0edf21.
2015-05-17 00:57:15 -04:00
John Cote
aba9368632 Revert "Some shticker book cleanup, add Speedchat Plus and True Friends to shticker book, but we really need a OptionsPage rewrite."
This reverts commit 0d5b0cbee9.
2015-05-17 00:56:44 -04:00
John Cote
834e0f4385 More name changing
god fucking damn voltage
2015-05-16 23:00:56 -04:00
Master Voltage
b23c33c957 i committed them rename edits k 2015-05-16 21:04:41 -04:00
Loudrob
c1e1f5164a Decorations should only be used on their correct holidays pls. 2015-05-16 14:34:31 -04:00
DenialMC
0d5b0cbee9 Some shticker book cleanup, add Speedchat Plus and True Friends to shticker book, but we really need a OptionsPage rewrite. 2015-05-16 12:09:03 +03:00
Master Voltage
6c3682bd75 i is good engrish now 2015-05-15 19:41:19 -04:00
John Cote
0bc41b75f9 how dare you use tabs voltage 2015-05-15 19:22:19 -04:00
Master Voltage
6cc8c2a7ba added more phrases k 2015-05-15 19:09:45 -04:00
DenialMC
8dea0edf21 Fix article names 2015-05-15 23:16:46 +03:00
Master Voltage
2dfc68ed8b Revert "Zach stop breaking shit too k"
This reverts commit 7fa0bf6d73.
2015-05-14 16:13:41 -04:00
Master Voltage
7fa0bf6d73 Zach stop breaking shit too k 2015-05-14 16:12:19 -04:00
DenialMC
f784a15e1d You no longer need to wait any days to buy the items in the special menu.. and Loud, we start with 10000 beans not 15000!! 2015-05-14 20:34:00 +03:00
DenialMC
26781efc6c All holiday decorations and activities 2015-05-13 21:36:11 +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
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
Zach
37fad887da fixed the fish sale at estate 2015-05-12 14:46:35 -05:00
Zach
861909b881 an even more amazing GUI 2015-05-12 03:10:49 -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
0c4d6feffa Add Cigar Smoke Cog attack 2015-05-11 22:50:12 -04:00
DenialMC
b253e3edda Add laff restock toons to each HQ 2015-05-11 23:36:31 +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
cbf82d4a5d Laff Restock NPC (isn't anywhere in the game yet) 2015-05-11 19:21:07 +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
7f3c321490 Add Re-Org and finish Throw Book Cog attacks 2015-05-10 22:46:41 -04:00
DenialMC
41d1fda2c2 Silly Meter is now done! 2015-05-10 23:05:09 +03:00
Loudrob
4ad535659f Increased items on-order limit. 2015-05-10 15:19:56 -04: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
Loudrob
91c0a1a477 daniel u skrub 2015-05-10 09:35:18 -04:00
DenialMC
663d3a6ed3 Fucking go die in a fire + added Unavailable to TTLocalizer 2015-05-10 16:31:15 +03: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
DenialMC
f9d5707018 Donald NPC in Donalds Dock 2015-05-10 14:56:49 +03:00
John Cote
4fa3762300 funny farm stuff 2015-05-09 02:34:19 -04:00
John Cote
37c14808ba Small edits 2015-05-07 20:39:04 -04:00
DenialMC
cbc94f56bb Added a bunch of new decoration and games, but those games dont work 2015-05-06 21:04:18 +03:00
DenialMC
d75887e862 Stuff, remove unused Brutal Leg Factory (somebody renamed it to MegaCorp) 2015-05-06 11:39:48 +03:00
DenialMC
a617cf7252 Fix logout, add notice to Bug Report site, add bug report site to ToontownGlobals. 2015-05-06 10:36:27 +03:00