Commit graph

843 commits

Author SHA1 Message Date
John Cote
cadeff717d Current work 2015-06-24 12:32:30 -04:00
John Cote
5044724410 Remove TTI nametag/chat/margin files 2015-06-24 11:21:50 -04:00
John
9c8e85b137 Well that didn't fix fishing. Here's a proper fix. 2015-06-24 16:54:09 +03: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
5d8aa6e86e Clean up and prepare for an upcoming commit 2015-06-24 01:58:49 -04:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
9ac374656d Ability to get back cheesy effect 2015-06-23 23:22:35 +03:00
John
2c8ac1add9 Scavenger hunts!! :D 2015-06-23 23:20:41 +03:00
Loudrob
8434bc8fce 10/10 voltage 2015-06-23 11:09:11 -04:00
Master Voltage
c269969ab9 RockAByeRoad is kill 2015-06-23 11:06:00 -04:00
John
44920579d1 Implement effect delay. 2015-06-23 15:55:15 +03:00
John
4ec772e549 Merge branch 'master' into news 2015-06-23 15:40:04 +03:00
John
b07316bb8e We don't need this 2015-06-23 15:39:10 +03:00
John
8c4f5b08f7 Remove ScavengerHuntTarget (not used in the game), remove debug print, use a list of speedchat indexes instead for effect mgr. 2015-06-23 15:36:18 +03: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
7029f536c8 Holocaust HolidayManagerAI (newsmanager rewrite soon to come) 2015-06-21 22:46:17 +03: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
539afab9fe Minigame skipping 2015-06-21 22:09:31 +03:00
John
44edf68ff7 DBObject holocaust 2015-06-21 12:27:40 +03:00
John
3c853dbc00 Some AI cleanup 2015-06-21 11:29:47 +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
5a76de3d72 Proper positions for everything above the head 2015-06-20 15:19:09 +03:00
John
c57ebf03ed Cleanup 2015-06-20 12:24:08 +03:00
John
a8fc4f513b Remove ARGManagerAI/UD, add unused knockknock sfx, change otp.dc and toon.dc in the other astron configs to stride.dc 2015-06-20 11:20:52 +03:00
Loudrob
49764e5163 Instant delivery for tanks. 2015-06-19 08:46:13 -04:00
John
f36f395054 Merge branch 'master' of https://github.com/stevetts/tts_src 2015-06-18 22:26:58 +03:00
John
e0765526be Remove setGM and gm name, now combined with setAdminAccess. TODO: disables 2015-06-18 22:26:42 +03:00
Loudrob
3c80ecc367 卐 House Door Flickering Fix 卐 2015-06-18 15:24:21 -04:00
John
67e76cea51 Fix FO z fighting and fix maze 2015-06-18 21:35:22 +03:00
John
9804328571 Fix building flickering 2015-06-18 21:22:54 +03:00
John
1213349611 Doors P3D 1.10.0 fix 2015-06-18 17:28:09 +03:00
John
bbea8f8541 No warning 2015-06-18 17:13:18 +03:00
John
884e452e32 Reconsider toons only when switching true friends/speedchat 2015-06-18 17:02:51 +03:00
John
6c94355d39 FOV slider + add other sliders into TTLocalizer 2015-06-18 16:53:50 +03:00
Loudrob
1a823356c4 NAMETAGS: Proper nametag opacity. 2015-06-18 09:44:09 -04:00
John
09f8e68410 Thank you RDB and the P3D team 2015-06-17 20:18:11 +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
8c37436706 Let's go to Toontown Central! 2015-06-17 10:12:03 -04:00
John
f0c0c08719 DANIEL: Cleanup 2015-06-17 10:11:33 -04:00
John
a4708291ac 33% instead of 16% 2015-06-17 10:10:38 -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
e9244755fa Less volume for fish jump + don't make them jump immediately on area join 2015-06-17 10:09:42 -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
4b2e373e45 DANIEL: GSHoodAI cleanup 2015-06-17 10:08:42 -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
0634d53718 DANIEL: Remove jor-el cam 2015-06-17 10:01:27 -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
d41ee44855 Smaller scale for cog type 2015-06-17 09:59:16 -04:00
John
6b5226e9e3 Organic display 2015-06-17 09:58:54 -04:00
John
f42631b401 No XP cap 2015-06-17 09:58:43 -04:00
John
be659d24f7 DANIEL: Talkative tyler fix 2015-06-17 09:58:04 -04:00
John
519a4fd111 Fix merit bars 2015-06-17 09:54:22 -04:00
John
5b7770abee DANIEL: ~quests add 2015-06-17 09:54:07 -04:00
John
10a451c883 Summon between 1000 and 3000 cogs 2015-06-17 09:51:19 -04:00
John
910fcfdc77 Decrease rarity of all fish! 2015-06-17 09:50:58 -04:00
John
704923f53a DANIEL: Merits on inventory page 2015-06-17 09:50:29 -04:00
John
90a8e5a2f2 Don't hide laff meter based on full hp 2015-06-17 09:49:57 -04:00
John
8262d5afa4 Destroy head meter on toon destroy 2015-06-17 09:49:43 -04:00
John
e9842a8b65 Laff meter above head in bosses 2015-06-17 09:49:30 -04:00
John
def7ca4372 Max true friends + cleanup 2015-06-17 09:49:18 -04:00
John
cb1ffd8c16 DANIEL: Remove true friends 2015-06-17 09:48:56 -04:00
John
7a9da93d39 DANIEL: Crash fixes 2015-06-17 09:47:43 -04:00
John
0aab15cb8c Only save database if necessary 2015-06-17 09:43:06 -04:00
John
1752544d9e DANIEL: Leaderboard cleanup 2015-06-17 09:42:52 -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
1e47509477 Initial work on goofy leaderboard 2015-06-17 09:38:43 -04:00
John
c47d1afe4c Faster flying gameplay 2015-06-17 09:38:13 -04:00
John
67f7c45f68 DANIEL: Chat color shit 2015-06-17 09:37:55 -04:00
John
e082fecf0b DANIEL: Fix whispering 2015-06-17 09:35:54 -04:00
John
ea03518ab3 Bit more revealing fog in races 2015-06-17 09:31:12 -04:00
John
898d57dc1f Fix ~ whitelist exploit, add True Friends and Speedchat Plus warnings. 2015-06-17 09:29:56 -04:00
John
e52d47367c (kill me) DANIEL: Friends list cleanup 2015-06-17 09:27:53 -04:00
John
3e97752dff DANIEL: Nametag color shit 2015-06-17 09:25:20 -04:00
John
702260b1b7 DANIEL: Cast member button shit 2015-06-17 09:23:45 -04:00
John
5a0d981185 Remove CFO staff event 2015-06-17 09:22:26 -04:00
John
4e60722277 This was just debug 2015-06-17 09:21:58 -04:00
John
b72a755617 Unique toon identifier in avatar panel 2015-06-17 09:21:21 -04:00
John
7bad238cbe DANIEL: New npc friends page 2015-06-17 09:20:54 -04:00
John
7c0ba851c7 Proper TV 2015-06-17 09:19:53 -04:00
John
848293a3b9 TV 2015-06-17 09:19:41 -04:00
John
0c56b7c78d DANIEL: True friends 2015-06-17 09:15:30 -04:00
John
338d83a907 DANIEL: Friends cleanup 2015-06-17 09:10:17 -04:00
John
6377cec192 Fix laff meter disappearing after using Painter Joey 2015-06-17 09:08:18 -04:00
John
93e0c04dce DANIEL: db values cleanup 2015-06-17 09:08:02 -04:00
John
1749768a8d DANIEL: TalkAssistant cleanup 2015-06-17 09:06:48 -04:00
John
b48fb01fb0 DANIEL: Work on whitelist 2015-06-17 09:01:28 -04:00
John
33f99305df DANIEL: Work on chat 2015-06-17 08:57:10 -04:00
John
d9454000b4 Work on chat garbler 2015-06-17 08:46:14 -04:00
John
1b2c00f7a1 DANIEL: Beginning of chat stuff 2015-06-17 08:45:55 -04:00
John
a6e7fb9d83 Darn, this was necessary after all. 2015-06-17 08:29:22 -04:00
John
bb46ba8049 Remove unused method 2015-06-17 08:29:06 -04:00
John
aeed161e9a Misc stuff 2015-06-17 08:28:54 -04:00
John
e3a76a4bbf Redirect to correct area if player goes sad in a cog battle 2015-06-17 08:28:33 -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
128430f0c6 Removed deprecated setChat 2015-06-17 08:26:06 -04:00
John
f1ffdc9a1e DANIEL: Proper toonKilledCogs method 2015-06-17 08:24:00 -04:00
John
1ff5f28056 Proper toonKilledCogs method 2015-06-17 08:23:04 -04:00
John
b5beee98a0 Fish now jumps out of the fishing targets once in a while 2015-06-17 08:21:42 -04:00
John
a65952bb67 DANIEL: New catalog year shit 2015-06-17 08:21:11 -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
3dd1d05573 Fixed phone sphere entering 2015-06-17 08:13:25 -04:00
John
400aac42b7 More nametags 2015-06-17 08:12:59 -04:00
John
a1fd036cf0 PBN Tag 2015-06-17 08:12:28 -04:00
John
8c47aa0fd0 Added PBN nametag font 2015-06-17 08:08:34 -04:00
John
755c9afc6a Fix house in cattlelog 2015-06-17 08:08:15 -04:00
John
0f53845b05 DANIEL: Cogdo Tasks 2015-06-17 08:07:26 -04:00
John
0ec27307e0 More debug removed 2015-06-17 08:04:26 -04:00
John
3f7c0610fa Debug removed 2015-06-17 08:04:12 -04:00
John
065f9125fd Fix cogdo tasks and add textures for it 2015-06-17 08:03:41 -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
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
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
fbfc094971 A bit of Speedchat cleanup 2015-06-16 19:50:09 -04:00
John
81728b339a DANIEL: Better glove NPC 2015-06-16 19:41:34 -04:00
John
a1b996ea49 DANIEL: Tag game 2015-06-16 19:25:35 -04:00
John
dd3867b46c Better nametag wrap for cogs 2015-06-16 19:20:40 -04:00
John
aa17733adf Ancient question of nametag scaling solved. 2015-06-16 19:19:18 -04:00
John
556040b210 Nametags 2015-06-16 19:18:55 -04:00
John
196de9056e Remove club house from front threes 2015-06-16 19:17:27 -04:00
Loudrob
e22248e742 Merge commit 'ea14534efb0dc67c86459c86d327b160111e3f60' 2015-06-16 19:14:25 -04:00
Loudrob
e702145334 DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11' 2015-06-16 19:13:24 -04:00
John
64b1f372a8 Splash Effect fix 2015-06-16 20:30:38 +03: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
5983452347 Better fix. 2015-06-11 15:47:45 -04:00
Loudrob
210a8f012e Toons can't destroy other toon's money. 2015-06-11 15:23:44 -04:00
Loudrob
5101a94e5a GARDENS: Needs to get done. 2015-06-11 13:48:13 -04:00
Loudrob
b29da23a0a Revert "John L: GardenGlobals edit"
This reverts commit 9050b1abff.
2015-06-11 13:08:24 -04:00
Loudrob
0412683301 Revert "Bye street signs"
This reverts commit 64322c9768.
2015-06-11 08:35:04 -04:00
Loudrob
8a01138fc6 Less dan. 2015-06-11 08:33:28 -04:00
John Cote
0da6a108e4 Some preparations for the Goofy Speedway leaderboard 2015-06-10 23:35:42 -04:00
John Cote
443233ad1d ButterflyAI cleanup
gg Disney and their unneeded imports
2015-06-10 22:35:16 -04:00