Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions
1492 commits 6 branches 0 tags 524 MiB
Commit graph

1189 commits

Author SHA1 Message Date
John Cote
99bd20b9da Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 12:20:29 -04:00
John Cote
f71a9124cc nice 2015-07-22 12:20:18 -04:00
Loudrob
b49683ccd9 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 11:14:09 -04:00
Loudrob
01b7437514 Phone quest. 2015-07-22 11:12:00 -04:00
John Cote
86b825a1f0 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 11:03:42 -04:00
John Cote
713babe566 Fish Bingo in estates 
Same schedule.
 2015-07-22 11:03:30 -04:00
Loudrob
e4e2b17e47 Forgot this, lel 2015-07-22 11:02:56 -04:00
Loudrob
773a1d2f43 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 10:52:12 -04:00
Loudrob
d1694f3d70 nice 2015-07-22 10:49:36 -04:00
John Cote
ec388033c1 Implement Fish Bingo 
Every Wednesday and Saturday!
 2015-07-22 10:47:02 -04:00
John Cote
99e37a7f8a fix toon deletion 2015-07-22 09:47:10 -04:00
John Cote
4b2e6c05d6 edit DistributedToonStatuary 2015-07-22 02:46:55 -04:00
John Cote
baeb2f38f4 move the pet model down a bit 
so it's closer to TTO.
 2015-07-22 02:27:51 -04:00
John Cote
c5af613514 We don't need all these useless imports. 2015-07-22 02:21:04 -04:00
John Cote
e2501c2832 bye bye velvetRoped 2015-07-22 02:08:34 -04:00
John Cote
4411cb805b gtfo has_key and range 2015-07-22 01:45:01 -04:00
Loudrob
c042107c4d maxGarden 2015-07-21 23:41:50 -04:00
Loudrob
f772fd8e27 Treasure planner 2015-07-21 14:38:59 -04:00
John Cote
b044f98305 More gardening GUI widescreen 2015-07-21 14:32:19 -04:00
John Cote
d0ff9ff635 widescreen gardening gui 2015-07-21 14:12:56 -04:00
John Cote
47845a2865 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-21 12:21:30 -04:00
John Cote
3de77cb7b0 Fix an error with plating statuary. 2015-07-21 12:21:20 -04:00
Loudrob
ba42dcb7d8 Top Toons: More appropriate 2015-07-21 12:04:01 -04:00
Loudrob
a06c6a7543 Flower sell fix 2015-07-21 10:34:55 -04:00
John Cote
3d8d023af9 hot keyerror fix 2015-07-21 10:04:58 -04:00
Loudrob
41d8b63ec2 wtf this fixed it cool 2015-07-21 09:08:00 -04:00
Loudrob
43b138e338 gtfo has_key 2015-07-20 19:02:13 -04:00
Loudrob
1236e38d62 Current garden progress. 2015-07-20 15:53:53 -04:00
Loudrob
c93fec2f19 Top Toons 2015-07-20 13:16:39 -04:00
Loudrob
cf319c587b useless 2015-07-20 09:25:21 -04:00
Loudrob
7cb50fc828 Mongo 2015-07-18 12:57:36 -04:00
Loudrob
7505459b59 Newer pet manager. 2015-07-18 12:17:05 -04:00
John
2c451321b2 nametags: Removed a few unused nametags, added boardinggroup and battlesos color, fixed toon statue selection GUI, doodles now have green nametags. 2015-07-18 15:25:47 +03:00
John
071d59f4d0 Leaderboard fix + ~race finish magic word 2015-07-18 11:21:53 +03:00
John
18f600b593 RIP Pillows 2015-07-18 03:00:24 +03:00
John
ba8df1addf Merge branch 'master' into features/ttn 2015-07-18 02:42:40 +03:00
Master Jumblespeed
ad680a934c csmud: fix name approval with developer db 2015-07-17 19:39:20 -04:00
John
95f67faab5 Stuff 2015-07-18 02:28:36 +03:00
John
0be23c6abe Show name of nametag while choosing 2015-07-18 01:41:22 +03:00
John
7be88f4d33 Tank items should have delivery date 2015-07-18 01:36:45 +03:00
John
f28c65d32b Match Jaymo 2015-07-18 01:21:43 +03:00
John
207f397e32 Fix trunk 2015-07-18 01:09:01 +03:00
John
24aefa8408 Nametag styles are sent now 2015-07-18 00:39:11 +03:00
John
a17151ef96 You can now buy any nametag style, the game will store it. Changeable in the shticker book! 2015-07-18 00:25:20 +03:00
Loudrob
72e4dc11ad Somebody come up with quests for EPP 2015-07-17 16:07:43 -04:00
Loudrob
c76b2ca2c8 Easy Promotion Papers 2015-07-17 14:01:50 -04:00
John
98347f5b7f Accessory gender equality (Clothing equality is harder and will be done later cause of 63) 2015-07-17 20:30:29 +03:00
John
18fb9b1924 Sorry nacib 2015-07-17 19:48:30 +03:00
John
d5dc2c9d50 PotentialAvatar cleanup 2015-07-17 19:05:29 +03:00
John
d2834a6f65 Fix phone's 63 and nick 2015-07-17 18:36:33 +03:00
John
cc91c43036 Fix 63 or nick 2015-07-17 18:08:49 +03:00
John
50297ca489 Trunks 2015-07-17 17:51:43 +03:00
Loudrob
2de7c4d6ca Merge branch 'features/ttn' of https://github.com/stevetts/tts_src into features/ttn 2015-07-17 10:30:54 -04:00
Loudrob
a20de77143 Disable this for now. 2015-07-17 10:29:56 -04:00
John
fea04b73e7 Give girls girl furniture 2015-07-17 17:24:21 +03:00
John
feba8e73c0 Add trunks to houses 2015-07-17 16:51:45 +03:00
John
96d78ae33d Lock friends list for 1.5 seconds after loading a friend + show text when player is sending gifts too fast. 2015-07-17 15:54:12 +03:00
John
f3ca3df3c0 Fix family member display name in the mailbox 2015-07-17 15:42:04 +03:00
John
81e339d9e9 Preparation for next commit (sry have to git reset) 2015-07-17 15:40:14 +03:00
John
0d3f31971e X on order + mailbox sync + grammar 2015-07-17 15:29:08 +03:00
John
5a4dc305d1 Fix Loudrob's stuff 2015-07-17 15:04:59 +03:00
John
c21c7d53fd Sorry loudrob 2015-07-17 14:55:14 +03:00
Loudrob
e25c163d48 Merge branch 'master' into features/ttn 2015-07-17 07:53:22 -04:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
a89e89f99a Chat Offense 2015-07-16 14:14:00 -04:00
jp187187
359e52ed11 Fix Jukeboxes for estates parties and no conflict with TV 
loop needs int not float and time is float and loop was set to
getMusicRepeatTimes(length) this is time not loop
 2015-07-16 08:12:20 -07:00
Loudrob
ae40f21034 Better phone scale. 2015-07-16 09:26:34 -04:00
John
603dad00cb Merge branch 'master' into features/ttn 2015-07-16 15:53:32 +03:00
John
88dca5c838 House fix 2015-07-16 15:53:19 +03:00
Loudrob
02444d4026 family 2 pls 2015-07-16 08:41:54 -04:00
John
b014a7d568 Revert "Added back ~unlimitedgags" 
This reverts commit 68907397a7.
 2015-07-16 14:02:37 +03:00
John
e2f45d0a0a Bitches 2015-07-15 15:35:17 -04:00
John
d9048ffd76 Bitches 2015-07-15 21:55:49 +03:00
Loudrob
6868fa1267 Merge branch 'master' into features/ttn 2015-07-14 20:49:28 -04:00
jp187187
9c349e5e42 dont fire me ;) added the 100inch cog screen 2015-07-14 17:42:29 -07:00
jp187187
68907397a7 Added back ~unlimitedgags 2015-07-14 11:38:58 -07:00
Loudrob
dfcd7c2124 Gift duplication fixed. 2015-07-14 14:35:15 -04:00
Master Voltage
1d48a7fa28 praise nacib 2015-07-14 10:40:11 -04:00
Loudrob
7f1d4b8e18 Merge branch 'master' into features/ttn 2015-07-14 06:38:49 -04:00
John
5b2f6ce816 The rounds effective for lure now shows on the battle inventory screen 2015-07-14 13:01:45 +03:00
John
d9d1d66f37 Pro fix 2015-07-14 01:53:57 +03:00
John
a6b0aeaaff HD TV + Tailor Fix 2015-07-14 01:43:13 +03:00
Loudrob
6ac39df62a District Reset Prevention. 2015-07-13 13:04:39 -04:00
John
b7d8cd0a3a Fix offline gifting 2015-07-13 18:13:17 +03:00
Loudrob
87efdba167 More gifting. 2015-07-13 10:17:56 -04:00
Loudrob
8ad6894fb5 another fix 2015-07-13 07:13:05 -04:00
Loudrob
c1654a3f42 fuck ur tabs 2015-07-12 20:17:17 -04:00
Loudrob
e4f432858e it's supposed to be like this 2015-07-12 19:16:38 -04:00
Loudrob
4e8fb45531 Current progress on gifting. 2015-07-12 15:42:55 -04:00
Loudrob
c8919bf0aa Fix buttons hiding behind catalog screen. 2015-07-12 13:44:01 -04:00
Loudrob
cb9b4f8d09 Typo. 2015-07-12 12:51:05 -04:00
Loudrob
cd56e91057 New NetMessenger 2015-07-12 12:48:58 -04:00
John
92b3eac364 Rounds a lure takes is shown in battle 2015-07-11 22:36:58 +03:00
John
b14505435c Add toon model into the detail panel 2015-07-10 22:25:09 +03:00
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
ff5e8c9852 Extra Options Page properly unloads now 2015-07-09 17:38:22 +03:00
John
f6744b92d2 Battles dont take forever to join 2015-07-09 16:47:39 +03:00
John
7b953dcb0e Bossbot Boss talks a lot more now 2015-07-09 13:51:51 +03:00
John
0d8027a382 fuck you and your fucking family if you do this again i will slit your fucking throat you fucking cocksucker nigger jew bunny 2015-07-09 13:08:06 +03:00
John
15d096f44d Fix 2015-07-08 15:47:52 +03:00
John
6d1cf1ae43 Video player! 2015-07-08 15:30:25 +03:00
John Cote
43c45cc285 Set Cast GUI as a background so laff meter doesn't appear behind it. 2015-07-08 08:24:41 -04: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 Cote
da7ba5ce89 Convert prints to writeServerEvents in code redemption manager AI and fix typos 2015-07-08 07:47:01 -04:00
John Cote
8825da791e Merge branch 'master' of https://github.com/stevetts/tts_src 2015-07-08 06:54:41 -04:00
John Cote
de03f7b619 Implement a better v2.0 death sequence. 2015-07-08 06:54:31 -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
3ca278f940 Fix pet scales 2015-07-07 14:15:10 +03:00
John
85461c0107 Fix cattlelog button updating 2015-07-07 13:58:45 +03:00
John
02fb386ed5 Fix a few bugs - jukebox's still broken 2015-07-07 13:37:24 +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
112184e1fd Intermission music for CFO 2015-07-07 01:54:59 +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
32a26abd79 RIP AccountDate + changed CREATED in Account to uint64 instead of string 2015-07-06 22:46:20 +03:00
John
66600531fb There you go loudrob 2015-07-06 22:13:54 +03:00
John
394e232b6d Boss Taunts when releasing cogs 2015-07-06 21:20:32 +03:00
John Cote
568a076266 Deprecate has_key and fix bugs 2015-07-05 21:53:42 -04:00
John Cote
7508de0d79 lol whoops 2015-07-05 21:12:17 -04:00
John Cote
468b1702d8 Convert range to xrange 2015-07-05 21:02:35 -04:00
John Cote
f3c82a3c4a Fix this 2015-07-05 20:03:23 -04:00
John Cote
ad09d429fb yay repo cleanup 2015-07-05 19:59:25 -04:00
John
3f55a00f0e Merge branch 'master' of https://github.com/stevetts/tts_src 2015-07-06 02:39:35 +03:00
John
e31154ffc6 Cashbot Treasury Vault 2015-07-06 02:39:08 +03:00
John Cote
0818742d44 Fix Boss Cog speech font. 2015-07-05 19:37:38 -04:00
John Cote
b6de2337d5 Cleanup 2015-07-05 19:16:44 -04:00
John Cote
7ef9d669b5 Remove old TTI nametag files 2015-07-05 19:03:55 -04:00
John
9420973986 Laughing Man fix 2015-07-05 13:11:45 +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
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
915eff2373 Don't print out attacks everytime 2015-07-04 14:26:20 +03:00
John
fc1a9d8368 Title text shown in boss battles (such as: Sellbot Towers - Rooftop) 2015-07-04 14:24:27 +03:00
John
3b93cd6596 Fix pick a name button 2015-07-04 11:38:44 +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
1c84579924 Fix trophy score 2015-07-03 18:11:03 +03:00
John
5dbf692bae Fixed local toon's nametags 2015-07-03 17:52:30 +03:00
John
b38f8472a5 Fixed a bunch of issues at once 2015-07-03 17:46:21 +03:00
John
485eaa83ec Fix bank money display 2015-07-03 17:09:04 +03:00
John
1ca717a236 Fix lawbot cogdo crash 2015-07-03 01:31:53 +03:00
John
cf1785f7c7 Bank in inventory page 2015-07-03 00:16:47 +03:00
John
91d0730e03 Pet mood is now attached to nametag instead of pet 2015-07-02 21:35:04 +03:00
John
cbec66d244 Remove Techno/Trench font 2015-07-02 21:20:43 +03:00
John
ff8eade3a5 Hide drop shadow for Donald 2015-07-02 19:16:23 +03:00
John
bd580fdf2e Don't start fireworks on AI start 2015-07-02 17:04:31 +03:00
John
82d0bc2038 Can't use book while swimming anymore 2015-07-01 15:21:28 +03:00
John
2b02385e51 Swim run SFX 2015-07-01 15:12:45 +03:00
John
b726175902 Donalds Dock water fixed 2015-07-01 14:50:47 +03:00
John
e24791c307 Water color is dependent on water depth 2015-07-01 14:49:07 +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
244fc5f057 Unique ID allocator holocausted 2015-06-30 20:55:38 +03:00
John
4911ad0607 Fix organic gags display 2015-06-30 20:11:30 +03:00
John
6bb4ea0dbe ToontownTimer callback support 2015-06-30 20:11:20 +03:00
John
4990317c41 SOS head is now shown when you choose a NPC sos. 2015-06-30 17:51:50 +03:00
John
2463b5cff8 Music Tempo now changes in the races like in TTO 2015-06-30 12:30:03 +03:00
Master Voltage
35bbe535c1 nobody wants this. ever. 2015-06-29 22:55:16 -04:00
John
26bee34ec1 You can stomp moles now 2015-06-30 01:01:50 +03:00
John
e4340eb131 Stuff that was bothering me 2015-06-29 21:54:28 +03:00
John
2b4fc260dc Fix every boarding group 2015-06-29 20:53:01 +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
11122c2486 RIP unused animated props 2015-06-27 18:56:35 +03:00
John
ab10d5f05f Swim Sound implemented 2015-06-27 18:14:04 +03:00
John Cote
5c2b7f4554 Another fix 2015-06-26 15:44:51 -04:00
Loudrob
6eaaed8056 Another fix and Dan's nametag scaling. 2015-06-26 09:19:43 -04: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
5cc0d8f27a More nametag translation 2015-06-25 22:59:13 -04:00
John Cote
d109dd2a16 toontown\coghq is fully converted 2015-06-25 22:12:22 -04:00
John Cote
46cb2afda6 This is really getting boring... 2015-06-25 21:10:16 -04:00
John Cote
7cf799814c Deprecate CatalogChatBalloon and edit CatalogScreen for new tags 2015-06-25 19:38:35 -04:00
John Cote
e8a57d7251 More work 2015-06-25 14:51:27 -04: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
144856d30a Calendar fix 2015-06-25 13:04:26 +03:00
John
d15813630f Calendar magic 2015-06-25 11:57:02 +03:00
John
aa35346472 https://www.youtube.com/watch?v=AibtyCAhyQE 2015-06-25 01:33:09 +03:00
John
a837ae9701 Interactive props!! 2015-06-25 01:00:15 +03:00
John Cote
ac15b0e4b5 Merge pull request #47 from stevetts/master 
Merge current master
 2015-06-24 17:52:53 -04:00
John Cote
06181378ef Fix Make-A-Toon 2015-06-24 15:35:03 -04:00
John Cote
dab0ac32d5 More nametag shit 2015-06-24 15:08:15 -04:00
John Cote
fa24711bc8 More work 2015-06-24 14:09:51 -04:00
John Cote
c568a632f1 More work 2015-06-24 13:44:04 -04:00
John Cote
167c5c5736 Current work 2015-06-24 13:19:10 -04:00
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