Commit graph

407 commits

Author SHA1 Message Date
DenialMC
b6cf9c8f22 Clean up more options page, add strings to the localizer, add new strings to the more options page, add cogLevel settings properly. 2015-04-04 13:14:39 +03:00
DenialMC
73dbf43edb Consider holiday when setting Laughing Man head by DNA 2015-04-04 12:56:55 +03:00
DenialMC
b4af78209c Add Laughing Man holiday end (everybody loses their head), add Laughing Man to DNA instead of explicitly showing it, add ~dna laughingman [0/1] 2015-04-04 12:50:42 +03:00
DenialMC
b7654d438d Convert all tabs to spaces 2015-04-04 11:31:28 +03:00
DenialMC
edbd2d0584 Add force generate laughing man function and use it for Magic Kitty 2015-04-04 11:26:39 +03:00
DenialMC
99c29e64a4 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-04-04 11:21:09 +03:00
DenialMC
e0df87ac48 Holiday stuff - cleanup, add Laughing Man holiday (everybody gets Laughing Man heads, including NPCs), add ~startHoliday and ~endHoliday magic word, clean up Laughing Man effect, remove Secret NPC 2015-04-04 11:20:42 +03:00
Nigger
50bbe79aac Minor tweaks to cog invasions, preparing for v3 cogs and the other cogdo types 2015-04-04 03:30:05 -04:00
DenialMC
7065e2b06f Fix loading 2015-04-04 07:57:23 +03:00
DenialMC
acfdd18629 Put QuestScripts and SequenceList into the code 2015-04-02 17:02:01 +03:00
Loudrob
233dbd4ba9 sequence asslist and chathoes 2015-04-02 08:23:24 -04:00
Loudrob
c8f5d19c11 Revert "Added staff chat channels."
This reverts commit c72e45fbc4.
2015-04-01 16:30:08 -04:00
Loudrob
b5c8ba3fcb Revert "oo[pssieisss"
This reverts commit 260e5af56f.
2015-04-01 16:29:52 -04:00
Loudrob
010c075265 Revert "Made it not crash uberdog lel"
This reverts commit 72b6ef5afd.
2015-04-01 16:29:34 -04:00
Loudrob
61bc7a974d ok 2015-04-01 08:23:03 -04:00
Loudrob
72b6ef5afd Made it not crash uberdog lel 2015-04-01 07:39:59 -04:00
Loudrob
d251898a11 Another one. 2015-04-01 06:51:39 -04:00
Loudrob
976de78682 Removed some of the TTI-ish features from Loading Screen and added globals for new street. 2015-03-31 23:07:13 -04:00
Loudrob
a2a1ea6fa7 Started Rock-A-Bye road stuff. 2015-03-31 19:12:18 -04:00
Loudrob
260e5af56f oo[pssieisss 2015-03-31 08:16:01 -04:00
Loudrob
c72e45fbc4 Added staff chat channels. 2015-03-31 07:59:36 -04:00
Loudrob
5b1136a11b No more fugly cog level gui. 2015-03-30 18:57:42 -04:00
Daniel
9a9683bc20 Fix track shop 2015-03-30 20:29:53 +03:00
Loudrob
47361ccb04 Some pet stuff. 2015-03-29 18:16:26 -04:00
Loudrob
4e50e8a485 Improved scale of cog heads in Level Gui. 2015-03-29 16:55:15 -04:00
Loudrob
682cc001f2 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-29 15:06:16 -04:00
Loudrob
72cd51bf93 Added Cog Level Gui, time to polish it... 2015-03-29 15:05:19 -04:00
Daniel
e837ad96f4 Remove Trap Cat SOS 2015-03-29 21:27:49 +03:00
Daniel
48998e45ce Remove classic chars and add Match Blinky minigame 2015-03-29 20:45:32 +03:00
Daniel
983eb61b68 Fix pet shop 2015-03-29 19:46:50 +03:00
Loudrob
35abc0b1c3 Fix 2015-03-29 12:19:47 -04:00
Loudrob
9b755ed2a7 New record is supposed to be orange. 2015-03-29 12:08:31 -04:00
Loudrob
13a06febcf Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-29 11:58:46 -04:00
Loudrob
c79f5498e1 Revert "Potential street teleport fix"
This reverts commit e0ea00b3bd.
2015-03-29 11:55:35 -04:00
Daniel
f38f910638 Upstream update 2015-03-29 18:41:02 +03:00
Daniel
e0ea00b3bd Potential street teleport fix 2015-03-29 17:36:54 +03:00
Daniel
4881a40bc0 Curse you Loudrob 2015-03-29 17:17:34 +03:00
Daniel
aeca29a278 Fix server connecting 2015-03-29 16:35:45 +03:00
Loudrob
5358614551 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-29 09:10:46 -04:00
Loudrob
bd5133514d Merge branch 'cogdo' 2015-03-29 09:08:13 -04:00
Loudrob
64845859ff Began work on emblem items, we don't really need these urgently. 2015-03-29 09:06:13 -04:00
Daniel
887ab8443f More killing 2015-03-29 14:59:51 +03:00
Daniel
6726d7e589 Merge branch 'master' of http://gitlab.com/toontown-created/src 2015-03-29 14:39:32 +03:00
Daniel
9a58ff9568 Remove some Disney shit 2015-03-29 14:38:52 +03:00
Daniel
d1b9ec2621 Fix flying game timer 2015-03-29 14:06:26 +03:00
Daniel
c768b80e60 Fix SOS movie 2015-03-29 11:34:11 +03:00
Daniel
1347aa2a99 Few movie fixes 2015-03-29 11:04:53 +03:00
Loudrob
67c5f4b728 Made this line less cancerous... 2015-03-28 18:06:45 -04:00
Wilee999
4991efc4c3 ChatGlobals: added red whispers and orange for boarding groups 2015-03-28 14:12:32 -07:00
Wilee999
7d322d4d34 DistributedTagGame: fixed... 2015-03-28 13:08:51 -07:00
Daniel
ed72ba279d Cogdo graphic fixes 2015-03-28 21:21:39 +02:00
Wilee999
0ac90fcc8a DistributedTagGame: forgot to add The Burrrgh 2015-03-28 18:40:24 +00:00
Wilee999
1d7b082758 DistributedTagGame: added MML and DG tag arenas (randomizer) 2015-03-28 18:38:13 +00:00
Loudrob
00c2bf3db8 Cogdos 95% done! Time for Daniel to bring in the iron! 2015-03-28 13:31:51 -04:00
Loudrob
8374e30b74 Great progress indeed. 2015-03-27 19:25:31 -04:00
Loudrob
83b204098c More Cogdo stuff. 2015-03-26 22:48:23 -04:00
Loudrob
bced66317b Began work on Cogdos. 2015-03-26 20:09:32 -04:00
Loudrob
4a787248e9 Slightly buffed high level cogs, slightly nerfed sound and toon up. 2015-03-24 07:58:53 -04:00
Loudrob
4855f1c3b9 Rental items 95% done. 2015-03-23 16:28:42 -04:00
Daniel
5199150ed4 Catalog gifting: Load friends 2015-03-23 16:15:27 +02:00
Daniel
970c945fda Allow first time players to choose if they want to do the Toontorial 2015-03-23 15:25:18 +02:00
Daniel
c0f7d83b00 Prevent crashes 2015-03-23 15:02:20 +02:00
Daniel
6ef7223997 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-23 14:58:20 +02:00
Daniel
28fcb317f5 I'm so inefficient today 2015-03-23 14:58:05 +02:00
Loudrob
fbbaf9c4e3 Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-23 08:57:28 -04:00
Loudrob
0f24fb0ffd RENTALS: Began work on rentals. 2015-03-23 08:56:48 -04:00
Daniel
c2797e4260 Fixed Clara 2015-03-23 14:49:12 +02:00
Daniel
22ca07fa7b I just pulled a TTF 2015-03-23 14:25:17 +02:00
Daniel
4aff992837 Oops.. fixed 2015-03-23 14:21:12 +02:00
Daniel
db0e37d784 RIP arrows 2015-03-23 14:19:31 +02:00
Daniel
a987c05e5c Merge branch 'master' of https://gitlab.com/toontown-created/src 2015-03-23 14:16:35 +02:00
Daniel
44d5ef5a18 Toontorial update!
#1 Fixed giving gags at start of toontorial
#2 Don't force toontorial skip
#3 Properly show tutorial reward scene
#4 Remove Japanese bullshit
#5 Fix Clara - she now shows the preview for all gag tracks
#6 Fix Localizer - they don't lie anymore - You have no gags! Duh I have.
#7 Fix Flunky task.
2015-03-23 14:16:25 +02:00
Loudrob
2178afb292 Accessory Delivery: Was this so difficult? 2015-03-23 07:51:32 -04:00
Daniel
9bd970ab00 Lil Oldman 2015-03-23 10:42:20 +02:00
Daniel
e588890876 Fix track choice tasks (TODO: Lil Oldman) 2015-03-23 10:14:45 +02:00
Daniel
5d7451e0eb Add icon to track shop 2015-03-23 01:18:12 +02:00
Daniel
8a82353eb9 TrackShop cleanup 2015-03-23 00:51:07 +02:00
Daniel
aa5fee87dc Added track shop in makeatoon - still have to make it give the player gags by default. 2015-03-23 00:44:12 +02:00
Daniel
6ed9a8b04e Rework Tutorial Tom's movie 2015-03-22 15:58:17 +02:00
Daniel
9d4324a4cb Fix parse_dcimports and remove CpuInfoMgr 2015-03-22 13:55:35 +02:00
Daniel
4552036c59 Remove testing menu from Speedchat. 2015-03-22 13:47:15 +02:00
Daniel
7171f49e3b A bit of a launcher cleanup, retired ClientStartRemoteDB (we are gonna supply play token directly), and instead of environ, we are now supplying server and token with argparse. 2015-03-22 13:34:07 +02:00
Loudrob
e0a4dc5333 fix a retarded typo 2015-03-18 16:51:45 -04:00
Loudrob
7abbbf0ffb TWEAK: Adjusted SBHQ Camera position. 2015-03-18 16:49:39 -04:00
Loudrob
5ee2c86eab MW: Fixed unlimitedGags 2015-03-18 12:51:52 -04:00
Loudrob
02b867ab4b Tweaks: SBHQ Cameras, and merged otp.dc and toon.dc into the same file. 2015-03-18 12:05:03 -04:00
Loudrob
76457187d1 DNA: Fix tutorial door. 2015-03-17 12:40:16 -04:00
Loudrob
a503e92deb fix button hiding pls k 2015-03-17 09:41:23 -04:00
Daniel
b373541292 Fix inventory 2015-03-16 17:29:29 +00:00
Loudrob
8e070a2231 Feature: Implemented MML Piano Marry-Go-Round 2015-03-16 09:41:50 -04:00
Loudrob
d252a5cd03 Damn syntax error. 2015-03-15 16:36:32 -04:00
Loudrob
07d342711e Re-add dual resources support. 2015-03-15 16:11:46 -04:00
loblao
e06dde7709 DNA: Finish C++ reader implementation 2015-03-15 13:26:22 -03:00
loblao
d975331905 Fix AI random crash 2015-03-15 12:33:33 -03:00
loblao
3c41567f52 OTP: Remove spam 2015-03-15 12:32:31 -03:00
loblao
b0c440a951 Fix injector hanging 2015-03-15 12:24:57 -03:00
g0dfrey
f343539ac7 black shirt 2015-03-15 04:46:39 -05:00
g0dfrey
c1e0e8bf61 blak stuff 2015-03-15 04:44:38 -05:00
Loudrob
b3fd5e37ae 95% Done implementing C++ DNA Reader 2015-03-14 19:23:50 -04:00
Daniel
f04bb95b95 Start work on pets 2015-03-15 00:15:24 +02:00
Loudrob
40ada7cdf1 Fix screenshot name detection. 2015-03-13 20:33:54 -04:00
Zach
9ea697b1cb trees and boxes 2015-03-13 18:52:45 -05:00
Zach
bf46f64382 daniel and loud, look at the current error 2015-03-13 16:18:59 -05:00
Loudrob
ec2a67ed60 Fixed Gnarly Knobs mistakes. 2015-03-13 15:00:22 -04:00
g0dfrey
2e2f577ba3 no message 2015-03-13 13:43:49 -05:00
g0dfrey
d7464ec761 gf 2015-03-13 13:02:47 -05:00
Daniel
780de39b8e Load language MF files 2015-03-13 19:57:49 +02:00
g0dfrey
0e5f7116bb kei 2015-03-13 12:46:16 -05:00
Daniel
603fa38aec Add language selector in choose-a-toon 2015-03-13 19:14:04 +02:00
Daniel
528817b1d3 Merge branch 'master' of https://gitlab.com/toontownunited/src 2015-03-13 17:02:23 +02:00
Daniel
b9a80c14c4 Start work on language support 2015-03-13 17:02:14 +02:00
Zach
a5fcaa8426 gardening stuff 2015-03-12 22:06:36 -05:00
Zach
662acabe1f Merge branch 'master' of gitlab.com:toontownunited/src 2015-03-12 21:41:31 -05:00
Zach
556db6b6b6 gardens generate correctly :) 2015-03-12 21:12:43 -05:00
Loudrob
8864582ced Revert "fuck you daniel, and fixed snapshot length and added some rental item shit that i cant test because of daniel"
This reverts commit 8fcd496874.
2015-03-12 19:10:42 -04:00
Daniel
3789e8eba4 sry zach 2015-03-12 22:31:18 +02:00
Daniel
77d5099e99 im a nigger 2015-03-12 22:08:24 +02:00
Daniel
83633b734f Fix Zach's crash 2015-03-12 22:07:41 +02:00
Loudrob
8fcd496874 fuck you daniel, and fixed snapshot length and added some rental item shit that i cant test because of daniel 2015-03-12 08:12:48 -04:00
Daniel
c2d2a68364 Renamed to Toontown United 2015-03-11 00:36:03 +02:00
Daniel
697d56a7f4 Remove Disney's ingame news 2015-03-11 00:22:16 +02:00
Daniel
c4a392fbcc Remove singing notes 2015-03-10 23:20:35 +02:00
Daniel
fa1c3d0c0b Remove velvet rope 2015-03-10 00:14:20 +02:00
Daniel
d7279b7778 Revert "Removed AccountDate and velvet rope"
This reverts commit d3a352f395.
2015-03-10 00:11:27 +02:00
Daniel
d3a352f395 Removed AccountDate and velvet rope 2015-03-10 00:08:36 +02:00
Zach
f772456727 gardening stuff 2015-03-09 17:02:16 -05:00
Daniel
876868179c Some phase_3 cleanup 2015-03-09 22:47:59 +02:00
Daniel
26c85cdded Get fucking fucked, Loyalty items!! 2015-03-09 21:23:28 +02:00
Daniel
7fe35ebb38 Oops, forgot this one 2015-03-09 19:34:39 +02:00
Daniel
139f562964 Merge branch 'master' of http://gitlab.com/toontown-unlimited/src 2015-03-09 19:33:38 +02:00
Daniel
1256f21e0b Implement TTR's catalog 2015-03-09 19:33:29 +02:00
Zach
e80e586b55 force teleport on shard 2015-03-08 21:15:13 -05:00
Zach
fd720c4ebd ShardPage update 2015-03-08 20:49:47 -05:00
Daniel
25bb468501 Merge branch 'master' of http://gitlab.com/toontown-unlimited/src 2015-03-09 01:06:13 +02:00
Daniel
9d49b038e5 Fix glove NPC crash 2015-03-09 01:06:02 +02:00
Loudrob
588d9691ca wtf 2015-03-08 18:15:05 -04:00
Daniel
9d2c6797e6 Reduced text size 2015-03-08 15:30:47 +02:00
Daniel
348d9a5475 Feel free to choose! 2015-03-08 15:23:14 +02:00
Daniel
441698fc2d Minor commit 2015-03-08 15:08:57 +02:00
Daniel
d80da06200 Fix sleep task 2015-03-08 15:07:29 +02:00
Daniel
1c6b541311 Merge branch 'master' of http://gitlab.com/toontown-unlimited/src 2015-03-08 15:01:23 +02:00
Daniel
2afe7135e6 Added GUI for glove NPC :D 2015-03-08 15:01:05 +02:00
Zach
c99492ee81 GroupManagerUD thing 2015-03-08 05:47:49 -05:00
Zach
44fe794599 finished GroupManager client, AIs, and ShardPage 2015-03-08 05:22:51 -05:00
Loudrob
8ba24f287e Merge branch 'master' of https://gitlab.com/toontown-unlimited/src 2015-03-07 20:08:06 -05:00
Loudrob
5bc386c801 Added all CodeRedemption imports, and set correct date for weed. 2015-03-07 20:07:17 -05:00
Zach
94c1b92776 gardening stuff 2015-03-07 18:31:55 -06:00
Daniel
af794b64d8 Added gardening redemption code. 2015-03-07 23:46:24 +02:00
Loudrob
7dc4f20f98 Merge branch 'master' of https://gitlab.com/toontown-unlimited/src 2015-03-07 10:13:07 -05:00
Loudrob
99a034ea65 Change nametags back to the way they were. 2015-03-07 10:10:31 -05:00
Daniel
8be20d92b9 Merge branch 'master' of http://gitlab.com/toontown-unlimited/src 2015-03-07 17:02:00 +02:00
Daniel
31f80a48a0 Add basic glove NPC, we need a GUI though. 2015-03-07 17:01:47 +02:00
Loudrob
613e3983d3 Merge branch 'master' of https://gitlab.com/toontown-unlimited/src 2015-03-07 09:54:07 -05:00
Loudrob
585b1e3df4 Finished weed shirt. 2015-03-07 09:52:40 -05:00
Daniel
b6a44f49b6 Remove Yin and Yang localization and update DC hash 2015-03-07 15:31:11 +02:00
Daniel
8c20235947 Bye Yin and Yang 2015-03-07 15:29:52 +02:00
Daniel
bf279ca444 r u a happy nigger now? 2015-03-07 14:57:43 +02:00
Zach
5b71c8da6c TLS safety statement 2015-03-07 04:47:04 -06:00
Zach
25388538cf TLR fix 2015-03-07 03:06:53 -06:00
Zach
e52dbdb2ff merge thing 2015-03-07 02:56:06 -06:00
Daniel
edd78503d1 ty loudrob and .gitignore update 2015-03-07 10:32:15 +02:00
Zach
1c9c92f444 new shard page 2015-03-07 02:24:33 -06:00
Daniel
308a1ac563 Oops, wrong delivery time check! 2015-03-07 08:10:27 +00:00
Wilee999
2815df8203 GameTutorials: use ttr 2015-12-31 19:01:51 -08:00
Zach
0007b149c1 Merge branch 'master' of gitlab.com:toontown-unlimited/src 2015-03-06 06:09:15 -06:00
Zach
c5b3c0de09 added injector 2015-03-06 06:08:02 -06:00
Loudrob
c76dcab057 Made CFO back to the way it was. 2015-03-06 06:25:05 -05:00
Loudrob
7e6e89f7e8 TTU related whitelist words. 2015-03-05 19:49:40 -05:00
Zach
b0ee41b558 dual resources compatibility and shard page update 2015-03-05 16:48:24 -06:00
Loudrob
8eb2b7bb82 Added Zach's shard page, and apparently he doesn't want his resources anymore. 2015-03-05 07:08:28 -05:00
Loudrob
7ca72d45e2 Merge branch 'master' of https://gitlab.com/toontown-unlimited/src 2015-03-05 07:02:30 -05:00
Loudrob
a602783dd8 Nametag: Improved scaling by distance. 2015-03-05 06:59:28 -05:00
Loudrob
ee7dedcf46 Added Zach's want-uplevel-res 2015-03-04 22:28:56 -05:00
Daniel
e4f8004a81 Remove unused security and whitelist manager 2015-03-04 22:20:10 +02:00
Daniel
3e660c2fa6 Add new whitelist loading system 2015-03-04 20:24:11 +02:00
Daniel
a81e40be30 Remove QuickLauncher and UserFunnel 2015-03-04 19:06:27 +02:00
Daniel
0d1400006f Removed DownloadWatcher and LoadingBlocker 2015-03-04 18:39:07 +02:00
Daniel
9f29fb2011 Remove LeaveToPayDialog and a few Disney launchers 2015-03-04 18:31:27 +02:00
Daniel
702d65198d Fix catalog crash 2015-03-04 18:21:34 +02:00
Daniel
0d9949b86a RIP SpeedchatRelay - not used.
Signed-off-by: Daniel <denialmc@outlook.com>
2015-03-04 17:58:50 +02:00
Loudrob
0ba41e2396 Remove the old brutal stuff. 2015-03-04 06:13:17 -05:00
Loudrob
1459efc86f Added Zach's teleport button fixes. 2015-03-04 05:47:44 -05:00
Loudrob
5727c4355b Added Zach's getPos, CatalogGUI and furniture fixes. 2015-03-04 05:45:35 -05:00
Loudrob
de77765d44 Added Zach's megacorp. 2015-03-04 05:42:16 -05:00
Loudrob
9be3e7f13b Added Zach's gloves. 2015-03-04 05:35:36 -05:00
Loudrob
b033ab02e4 Added Crimson, Emerald, and Bronze toon colors. 2015-03-03 19:39:18 -05:00
Loudrob
08ca47f23d Ah, almost forgot. Don't change it unless you create a new system for it yourself. 2015-03-03 17:14:57 -05:00
Loudrob
02c7dc11e4 Initial commit 2015-03-03 17:10:12 -05:00
Wilee999
9ed7402631 picnic: use ttr's checker boards 1980-01-01 18:56:35 -08:00
Wilee999
a7e57a8694 TTCodeRedemptionMgrAI: added temp expiration date, renamed back to weed 2015-03-06 18:49:31 -08:00
Wilee999
98a79288fc cogdo: stuff 2015-03-06 18:46:05 -08:00
Loudrob
639a8d953c CodeRedemption: Added notice, and added all catalog item imports. 2015-03-06 21:13:52 -05:00
Daniel
e9ffbadbd6 Upgrade the code redemption system - you can't use the same code twice anymore and expiration dates are added. 2015-04-20 02:58:09 +03:00
Daniel
1951b91907 Fix code redemption 2015-03-07 00:44:34 +02:00
Daniel
375996d34c Merge branch 'master' of http://gitlab.com/toontown-unlimited/src 2015-03-07 00:19:55 +02:00
Daniel
e598558eb1 Safeguard code redemption 2015-03-07 00:19:39 +02:00
Daniel
f20e720479 Fix jellybean reward and fireworks 2015-04-20 18:50:02 +03:00
Daniel
c42511f670 Enable parties, fix party cost and fix party planner crash 2015-04-20 18:15:19 +03:00
Daniel
8e0724a553 Revert "Removed CpuInfoMgr and DataStoreManager unused stubs"
This reverts commit 85207c4f8b.
2015-04-20 17:56:38 +03:00
Daniel
85207c4f8b Removed CpuInfoMgr and DataStoreManager unused stubs 2015-04-20 17:39:17 +03:00
Daniel
6db0c8c70f Removed unused code redemption file 2015-04-20 17:31:10 +03:00
Daniel
f5e41df8f8 Implement code redemption! Woo! 2015-04-20 17:29:11 +03:00
Daniel
a0e61b23b6 Add weed shirt 2015-04-20 17:28:35 +03:00
Loudrob
3820b89b3e merge my ass conflicts 2015-03-06 16:25:43 -05:00
Loudrob
5d445f8a15 Added Garden Drop game. 2015-03-06 16:24:29 -05:00
Daniel
7fb60eb86a Merge branch 'master' of http://gitlab.com/toontown-unlimited/src 2015-03-06 15:37:33 +02:00
Daniel
5d2399b8a2 Add new emotes to loading screen 2015-03-06 15:36:42 +02:00