Commit graph

525 commits

Author SHA1 Message Date
DenialMC
85406a5a52 Preparations 2015-05-11 20:06:27 +03:00
DenialMC
08417e7a55 2 more fish targets in the estate 2015-05-11 19:23:04 +03:00
DenialMC
cbf82d4a5d Laff Restock NPC (isn't anywhere in the game yet) 2015-05-11 19:21:07 +03:00
DenialMC
3e61bc9501 Treasure Chest is now destroyed properly 2015-05-11 19:18:42 +03:00
DenialMC
afdd660152 Better position for treasure chest 2015-05-11 18:11:35 +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
3f83a25f3f Cleanup some code and fix Fireworks. 2015-05-11 03:12:24 -04:00
John Cote
17fc247f39 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-11 01:12:23 -04:00
John Cote
1ddb2d0a51 Toon firing Cog now says "You're Fired!" 2015-05-11 01:12:09 -04:00
Zach
e4da40fb59 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 22:53:54 -05:00
Zach
d4974e8d54 Jor-El Cam 2015-05-10 22:53:28 -05:00
John Cote
7f3c321490 Add Re-Org and finish Throw Book Cog attacks 2015-05-10 22:46:41 -04:00
John Cote
22a7a1d353 Add ThrowBook Cog attack
Assigned only to Big Wig.
2015-05-10 20:54:19 -04:00
Zach
31379d34d5 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 18:58:57 -05:00
Zach
e1ccaa674f cannons thing 2015-05-10 18:58:31 -05:00
DenialMC
bd25086f69 Add silly meter code and make codes case insensitive 2015-05-11 01:09:48 +03:00
John Cote
de561c6fc3 add this back 2015-05-10 16:48:14 -04:00
DenialMC
41d1fda2c2 Silly Meter is now done! 2015-05-10 23:05:09 +03:00
DenialMC
83e859ae4c Add base.localAvatar check to lerpCam and add createTalkSequence 2015-05-10 22:39:47 +03:00
DenialMC
32cb6371ac Revert "removed it. sry. k"
This reverts commit 74ac72d5b3.
2015-05-10 22:37:01 +03:00
DenialMC
b0fffa92e4 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""""""""
This reverts commit dedd654453.
2015-05-10 22:36:44 +03:00
Zach
cbd35a95ac Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 14:26:41 -05:00
Zach
74ac72d5b3 removed it. sry. k 2015-05-10 14:26:19 -05:00
Loudrob
4ad535659f Increased items on-order limit. 2015-05-10 15:19:56 -04:00
Zach
dedd654453 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""""""""
This reverts commit 3e0fb6b605.
2015-05-10 14:01:44 -05:00
DenialMC
5bfbeebfae Toon Hall has been literated! 2015-05-10 21:36:04 +03:00
DenialMC
d0fbe172e2 Silly Meter with magic word! Scientists are still missing though. 2015-05-10 21:24:32 +03: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
John Cote
70e2f91ea1 cleanup 2015-05-10 12:20:39 -04:00
DenialMC
3e0fb6b605 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""""""
This reverts commit 8a8e2da72b.
2015-05-10 18:01:22 +03:00
Zach
8a8e2da72b Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""""""
This reverts commit 2910d2ba4e.
2015-05-10 09:04:43 -05:00
DenialMC
2910d2ba4e Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""""
This reverts commit 28114c2864.
2015-05-10 17:04:08 +03:00
Zach
28114c2864 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""""
This reverts commit a0b4c24fde.
2015-05-10 08:59:53 -05:00
DenialMC
a0b4c24fde Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""""
This reverts commit b5dec798f7.
2015-05-10 16:58:45 +03:00
Zach
b5dec798f7 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""""
This reverts commit 6a503eba9f.
2015-05-10 08:57:52 -05:00
DenialMC
6a503eba9f Revert "Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel"""""""
This reverts commit 48cecb8859.
2015-05-10 16:49:52 +03:00
Zach
48cecb8859 Revert "Revert "Revert "Revert "Revert "Revert "fuck daniel""""""
This reverts commit 70cf0ba883.
2015-05-10 08:48:03 -05:00
DenialMC
70cf0ba883 Revert "Revert "Revert "Revert "Revert "fuck daniel"""""
This reverts commit 45d11d7116.
2015-05-10 16:45:00 +03:00
Zach
45d11d7116 Revert "Revert "Revert "Revert "fuck daniel""""
This reverts commit 474adbccc0.
2015-05-10 08:43:57 -05:00
Zach
4d9ffefedf Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 08:43:24 -05:00
Zach
d67de6ca4e fixed loud 2015-05-10 08:42:55 -05:00
DenialMC
474adbccc0 Revert "Revert "Revert "fuck daniel"""
This reverts commit 3668fa58b0.
2015-05-10 16:42:05 +03:00
Zach
3668fa58b0 Revert "Revert "fuck daniel""
This reverts commit 4b64f5e4a4.
2015-05-10 08:37:21 -05:00
Loudrob
91c0a1a477 daniel u skrub 2015-05-10 09:35:18 -04:00
DenialMC
4b64f5e4a4 Revert "fuck daniel"
This reverts commit 783ed71a41.
2015-05-10 16:32:02 +03:00
DenialMC
10421a802c Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-10 16:31:32 +03:00
DenialMC
663d3a6ed3 Fucking go die in a fire + added Unavailable to TTLocalizer 2015-05-10 16:31:15 +03:00
Zach
783ed71a41 fuck daniel 2015-05-10 08:26:52 -05:00
Zach
278294a454 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 08:06:51 -05:00
DenialMC
4be52eb5aa Skrublordism 2015-05-10 16:06:43 +03:00
Zach
1d8f4bea81 sry loud 2015-05-10 08:06:19 -05: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
Zach
55d06848e6 gardening AIs again 2015-05-10 07:10:32 -05:00
Zach
32fa7ca56c Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-10 07:01:13 -05:00
Zach
ec9072a0f9 more gardening AIs 2015-05-10 07:00:38 -05:00
DenialMC
f9d5707018 Donald NPC in Donalds Dock 2015-05-10 14:56:49 +03:00
Zach
c1a45bcb06 gardening AIs 2015-05-10 06:47:03 -05:00
Zach
747bcd898b rage emote 2015-05-10 06:25:02 -05:00
Zach
ad4eab559f chat balloons 2015-05-10 05:51:55 -05:00
John Cote
7a498feefd Possible crash fix 2015-05-09 13:42:23 -04:00
John Cote
d597e25e60 Cleanup some files 2015-05-09 13:27:08 -04:00
John Cote
6b4329d263 Fixed pet trick data in battle. 2015-05-09 12:52:12 -04:00
John Cote
0c5fb238cb cogs will now walk after exploding 2015-05-09 12:25:46 -04:00
John Cote
460587cbd7 Cleanup and typo fix. 2015-05-09 03:04:51 -04:00
John Cote
4fa3762300 funny farm stuff 2015-05-09 02:34:19 -04:00
John Cote
ab3072fb84 Pets will work in battle now. 2015-05-09 02:21:07 -04:00
John Cote
6bd6420254 Some pet file edits 2015-05-09 01:23:58 -04:00
John Cote
fc3606d658 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-07 20:39:23 -04:00
John Cote
37c14808ba Small edits 2015-05-07 20:39:04 -04:00
Loudrob
8743df7ec6 Better Sellbot HQ drop points. 2015-05-07 17:32:53 -04:00
Loudrob
330cfb7b4b Fixed cog level gui. 2015-05-06 18:15:07 -04:00
Loudrob
f8a7e32d7b Will be tested when the time cums. 2015-05-06 15:48:32 -04:00
DenialMC
17dfe7a1b2 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-06 21:04:24 +03:00
DenialMC
cbc94f56bb Added a bunch of new decoration and games, but those games dont work 2015-05-06 21:04:18 +03:00
Loudrob
a96e9e8910 Added v2.0 and skelecog to cog level gui. 2015-05-06 13:19:29 -04:00
Loudrob
1e248a081a ARGManager for future purposes. 2015-05-06 13:17:08 -04:00
DenialMC
d75887e862 Stuff, remove unused Brutal Leg Factory (somebody renamed it to MegaCorp) 2015-05-06 11:39:48 +03:00
DenialMC
a38bea2fdc If only we had a Panda3D repo.. 2015-05-06 10:47:43 +03:00
DenialMC
5e45804b51 Ain't anybody got time fo dis 2015-05-06 10:44:56 +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
John Cote
16f2f39160 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-05 19:29:13 -04:00
John Cote
52abb45514 New loading screen.
Unfinished, maybe in future add gears/gags to loading screen for the matching areas and some other misc. tweaks. Also, we need new background artwork for the Toon and Cog areas.
2015-05-05 19:28:55 -04:00
Loudrob
f814b63c08 Added year field, and appropriate message for month, day and year code rejection. 2015-05-05 18:10:39 -04:00
Loudrob
712e41a369 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-05 16:26:57 -04:00
Loudrob
48f474c423 Magic word to remove redeemed code. 2015-05-05 16:25:45 -04:00
DenialMC
b5cd121dca Quests, minigames 2015-05-05 23:04:40 +03:00
DenialMC
dd0b4fdbbe Fixed Tug-o-War, removed Trolley Tracks and temp minigame AI 2015-05-05 21:43:30 +03:00
DenialMC
2f528c1aa6 No one liked you anyways, Pairing Game 2015-05-05 18:13:10 +03:00
Loudrob
c623f806cc Bug report button k. 2015-05-03 12:38:18 -04:00
Loudrob
8c7498d548 Merge branch 'rental-items'
Conflicts:
	config/release/dev.prc
	otp/distributed/DCClassImports.py
	toontown/estate/DistributedEstateAI.py
2015-05-03 09:10:19 -04:00
Loudrob
ba84f8da09 Ready to be merged and fixed by the rest of you nigrars aswell. 2015-05-03 09:07:33 -04:00
Zach
dcc4621456 DistributedPicnicTable cleanupDelayDeletes 2015-05-02 19:11:26 -05:00
Zach
cbf9c8451d DistributedPicnicTable 2015-05-02 19:00:49 -05:00
Zach
758ca8188a fixed OZHoodAI 2015-05-02 18:47:45 -05:00
Loudrob
d5875dd5c0 Revert "OZHoodAI"
This reverts commit bd4c2209d4.
2015-05-02 17:50:43 -04:00
Zach
bd4c2209d4 OZHoodAI 2015-05-02 16:47:49 -05:00
John Cote
a06cb1c757 fix the cog golf courses k 2015-05-02 11:01:08 -04:00
Zach
99830ee5a7 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-05-02 01:59:25 -05:00
Zach
8d90246edf GET REKT M8! 420 YOLO SWAG 360 CROSSMAP NOSCOPE 2015-05-02 01:58:49 -05:00
John Cote
38dfc863af so many spaces ugh 2015-04-30 20:10:54 -04:00
Loudrob
21e1d98e76 Garden Game Widescreen. 2015-04-30 18:59:22 -04:00
Zach
0f06855621 teleport transition and npc transition update 2015-04-30 01:27:17 -05:00
Zach
31e5ed5f7e Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-04-29 22:45:49 -05:00
Zach
fd52a8a820 kickass transition 2015-04-29 22:45:13 -05:00
John Cote
a226523ef2 Cleanup Voltage's last commit. 2015-04-29 19:16:59 -04:00
Master Voltage
47bfb6210c Zach stop breaking the beautiful track shop k 2015-04-29 18:27:02 -04:00
Loudrob
2a429014b4 Someone else work on this fugly dna shit in OZHoodAI 2015-04-29 18:22:38 -04:00
Loudrob
95eba74b1c No funny farm. 2015-04-29 08:25:31 -04:00
Loudrob
abccde1cfb Began work. 2015-04-29 07:48:29 -04:00
DenialMC
0a0f8bfa3b Remove Polar Bear manager (Dr Surlee from TTR) 2015-04-29 11:36:27 +03:00
John Cote
20309174ee Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-29 04:15:18 -04:00
John Cote
4be89cbfb3 Cleanup toontown/estate 2015-04-29 04:12:56 -04:00
DenialMC
d4d5e61941 RIP Achievements, we are gonna have Top Toons tho 2015-04-29 10:49:58 +03:00
John Cote
1ed2a72334 yeah 2015-04-29 00:24:50 -04:00
John Cote
cf61baa1b2 Slight toontown/uberdog cleanup 2015-04-29 00:16:01 -04:00
John Cote
e90c943e2b toontown/achievements cleanup 2015-04-29 00:09:06 -04:00
John Cote
59a6e2ece1 toontown/ai cleanup 2015-04-29 00:01:52 -04:00
John Cote
a71ed6fc7b Add some more Cogdo AI that may be useful later on 2015-04-28 23:26:53 -04:00
John Cote
d49c95731c Remove prototype flying game 2015-04-28 23:01:52 -04:00
John Cote
3bc9a90157 More LBFO widescreen 2015-04-28 22:24:57 -04:00
Loudrob
ab0a57822d Get rid of multiple file support. 2015-04-28 20:07:36 -04:00
John Cote
2234c4486e More Cogdo edits 2015-04-28 16:52:16 -04:00
John Cote
d746a9cd13 yeah 2015-04-28 14:39:08 -04:00
Loudrob
518a9c6e0c shit 2015-04-28 08:36:01 -04:00
John Cote
b870c27184 Some Cogdo edits 2015-04-28 03:07:50 -04:00
John Cote
40a74a02eb Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-28 00:25:12 -04:00
John Cote
985b2a345b Pet file cleanup 2015-04-28 00:24:58 -04:00
Zach
1918e5db37 battle debug 2015-04-27 21:01:58 -05:00
John Cote
cc33dee614 Cleanup many Cogdo files. 2015-04-27 19:51:51 -04:00
DenialMC
e7b0cb751a Animated Props fix 2015-04-28 00:30:05 +03:00
Loudrob
b437fa90f0 Readd system administrator accessLevel 2015-04-27 07:35:09 -04:00
John Cote
52553e5bf9 Fix the party spawn title text. 2015-04-26 18:19:01 -04:00
DenialMC
4a1ac56d02 Remove access level 700 2015-04-26 19:06:49 +03:00
DenialMC
0412c60083 Cogdo tasks 2015-04-25 15:11:06 +03:00
DenialMC
587e734ba2 TimeManager cleanup and add death on game exit in cog battle 2015-04-25 14:18:50 +03:00
DenialMC
b2bab83cbb So much Jizzney removing that Hitler toke his life 2015-04-25 10:26:27 +03:00
DenialMC
578ee39c60 Some random stuff 2015-04-25 08:11:01 +03:00
DenialMC
c6c4b978a8 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-04-24 16:36:29 +03:00
DenialMC
ac224306b2 Singing removed 2015-04-24 16:36:03 +03:00
Zach
475e4f37f7 Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-04-23 21:08:12 -05:00
Zach
eec533a48b GroupManager updates 2015-04-23 21:07:17 -05:00
DenialMC
dca35c221b Stuff 2015-04-24 01:18:16 +03:00
DenialMC
f27d6392db Holeycaust - more preparations 2015-04-23 20:55:47 +03:00
DenialMC
c3ac8aff07 More holocaust 2015-04-23 01:17:51 +03:00
DenialMC
b2f2e96716 Removed guilds 2015-04-23 00:47:13 +03:00
Loudrob
2c4cbbb025 Boolean to turn these little assholes off. 2015-04-22 07:40:47 -04:00
Zach
4b5c0e29be Merge branch 'master' of gitlab.com:ToontownUnited/src 2015-04-21 22:33:18 -05:00
Zach
04dd4548e6 GroupManagerAI crash fix 2015-04-21 22:31:41 -05:00