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

735 commits

Author SHA1 Message Date
Loudrob
b11c4c75c5 k 2015-06-05 13:58: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
Conspirator
5c15478178 Merge pull request #35 from loblao/master 
New CSM Tokens and DC Imports
 2015-06-04 18:26:14 -04:00
John Cote
9050b1abff John L: GardenGlobals edit 2015-06-04 15:33:27 -04:00
John Cote
2d37860963 Patch by John L: Fix AI crash caused by CatalogGenerator 2015-06-04 14:40:55 -04:00
Zach
990dcd0d5f lel 2015-06-02 22:55:38 -05:00
John Cote
965708844c Bye bye content pack manager 2015-06-02 19:12:08 -04:00
Zach
9033861dfb pillow gravity 2015-06-01 16:14:34 -05:00
loblao
0b2107c04d CSM: new tokens + holocaust dc imports 2015-05-31 17:08:46 -03:00
Zach
fa284fe558 fixed boss crash 2015-05-31 14:18:47 -05: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
ce79646583 high grav method 2015-05-30 09:26:01 -05:00
Zach
e3832ffac7 lobby manager 2015-05-30 09:01:18 -05:00
Zach
2b8298856f gui removes correctly 2015-05-30 09:01:06 -05:00
Zach
81e104a80a 255 > 8 2015-05-30 07:56:05 -05:00
Zach
097ea4942f lobby manager and GUI update 2015-05-30 06:16:23 -05:00
Zach
e560829a14 created an awesome GUI editor 2015-05-29 21:49:55 -05:00
Zach
6bb564c2f5 removed star from gui 2015-05-29 16:59:23 -05:00
Zach
3ed02edc04 debug prints 2015-05-29 15:59:26 -05:00
Zach
7000d6a0a7 organized folders 2015-05-29 05:03:48 -05:00
Zach
3f37efea21 bouncing 2015-05-28 15:39:46 -05:00
Master Voltage
7d5739c442 this bugged me k 2015-05-28 16:27:08 -04:00
John Cote
3436e6a8e4 Less hacky suitA hands fix 2015-05-28 14:57:11 -04:00
Zach
0b8f650966 fixed doors 2015-05-27 14:47:33 -05:00
Zach
279c2913ec Merge branch 'master' of github.com:stevetts/tts_src 2015-05-27 08:07:32 -05:00
Zach
0425544dfc cog hq doors and lobbies 2015-05-27 08:07:12 -05:00
Zach
ac9b768270 fixed loading screen music volume 2015-05-27 03:46:48 -05:00
Zach
3056946f04 laff restock npc's suits fixed 2015-05-27 02:08:39 -05:00
John Cote
f86261ac97 Cleanup GroupPage.py 2015-05-26 22:21:38 -04:00
Xavier
12d80e79e7 Update for Zach 2015-05-26 21:37:20 -04:00
Osnapman
7613aaee79 zach c0de 2015-05-26 21:03:14 -04:00
Xavier
50a5fd545e Rename BoardingPage.py to GroupPage.py 2015-05-26 20:50:33 -04:00
Xavier
aaf8b849d8 Delete InvsionPage.py 2015-05-26 20:48:01 -04:00
Osnapman
5819f89fb9 Create BoardingPage.py 2015-05-26 20:45:58 -04:00
Xavier
48f2d47cb0 Rename 2015-05-26 20:45:06 -04:00
Xavier
5ef740b39f Create GroupInvsionPage.py 2015-05-26 20:24:03 -04:00
Zach
2545b2ba37 forgot these. also remove magic cat sos 2015-05-26 17:58:02 -05:00
Zach
f0ac25e0f9 rental suits 2015-05-26 17:57:35 -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
Xavier
e568d13f0c Final Fix I promise 2015-05-25 21:12:56 -04:00
Xavier
4d2cfe01fd Finally Fixed Language Selector 2015-05-25 21:06:00 -04:00
Xavier
b65375e482 Fixed text staying on screen 2015-05-25 20:56:50 -04:00
Xavier
00b94dc669 Replaced Brazilian with Portuguese 2015-05-25 20:28:49 -04:00
John Cote
437571aefb suitA Cogs now have their proper hand colors 
And with this I'd like to point out that this is technically a hack fix
since it's just not using the preloaded models whilst everything else is
 2015-05-25 20:01:38 -04:00
Xavier
1074f255f3 Added Brazilian and German 
For whenever we add the localizer
 2015-05-25 20:00:47 -04:00
John Cote
bf006b5617 bool for garden game k 2015-05-25 15:27:34 -04:00
John Cote
b9244aea2a Fix a traceback when exiting the game 2015-05-25 14:39:23 -04:00
Zach
d5595c3a74 added collisions to pillow and new tunnel 2015-05-25 13:12:27 -05:00
Master Voltage
b8b9891c1e disabled garden drop k 2015-05-25 14:03:51 -04:00
John Cote
0d8319be38 Parties will work now k 2015-05-25 13:42:55 -04:00
John Cote
85b8923d35 Add back Zach's fixes 2015-05-25 13:31:34 -04:00
John Cote
913f29b745 Fix party bugs 
but def not all
 2015-05-25 13:27:32 -04:00
Zach
bca7063344 gui sliders for audio 2015-05-25 06:50:59 -05:00
Zach
023cbc6acb jukebox at estate 2015-05-25 05:17:14 -05:00
John Cote
aa51d3d448 Add DLLs back and fix ARGManager crash 2015-05-25 02:38:20 -04:00
John Cote
9e389b985d Temporarily place logo on every loading screen 
This will be reverted once we get more detailed background art.
Currently, the loading screen is rather empty and boring.
 2015-05-25 01:20:35 -04:00
John Cote
64160f9aa9 Revert "Fixing Scratch Glitch" 
This reverts commit 4e91128ab8.
 2015-05-25 01:14:46 -04:00
Zach
7a7bdc1b16 Merge branch 'master' of github.com:stevetts/tts_src 2015-05-24 23:34:21 -05:00
Zach
fcc048ac12 removed teleport anim 2015-05-24 23:33:52 -05:00
Zach
eea2c7ee08 chat balloon anim changed 2015-05-24 23:22:53 -05:00
John Cote
3be3fcc10f Revert some whisper color changes 2015-05-25 00:20:15 -04:00
Xavier
ae614c372f Undo 2015-05-24 22:26:28 -04:00
Xavier
b315e0e5d8 Changed labels of TP to HQs 2015-05-24 22:24:39 -04:00
Xavier
4e91128ab8 Fixing Scratch Glitch 
Timer change might help.
 2015-05-24 21:01:13 -04:00
Zach
0f622cfe27 fixed bug 2015-05-24 18:56:45 -05:00
Zach
f25ad9caf8 merge fix and my bs devs fix 2015-05-24 18:42:26 -05:00
Zach
8bf8cf5f55 GARDENING, BITCHES 2015-05-24 18:23:54 -05:00
John
ea14534efb Unicode chat warning 2015-05-24 19:04:49 +03:00
John
c100370140 Splash Effect fix 2015-05-24 18:03:46 +03:00
John
9a4af9c686 Remove Welcome Valley 2015-05-24 17:21:40 +03:00
Master Jumblespeed
8fb39a1d49 uberfixes 2015-05-23 20:58:38 -04:00
John Cote
adafe84346 Clean 2015-05-23 01:05:43 -04:00
John Cote
1fbd0602dc Organize the repo a bit more 2015-05-22 23:47:35 -04:00
Master Jumblespeed
baaf4e787b fix clientservices + automatic name approval 2015-05-21 20:52:40 -04: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
8f7978052c Fix Silly Street crash 2015-05-18 00:28:51 -04:00
John Cote
badea7d47e These need some more work 2015-05-17 22:46:24 -04:00
John Cote
76a8190ed7 Cleanup config files, add a bool to enable/disable language selector 2015-05-17 02:04:51 -04:00
John Cote
e7f17e5299 Fix Toon deletion bug 2015-05-17 01:37:00 -04:00
John Cote
0247ec5daf Remove this 2015-05-17 01:11:46 -04:00
John Cote
a195cbe230 Remove skid colors 2015-05-17 01:11:05 -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
88606b3876 Revert "No more accessory, clothing, furniture item gender discrimination! (except for skirts)" 
This reverts commit c866a4a52f.
 2015-05-17 00:52:14 -04:00
John Cote
35b064a59e Some revert k 2015-05-17 00:52:07 -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
1d0d5fc2fe Revert "I fucked this up" 
This reverts commit 74abc6ac57.
 2015-05-16 14:38:34 -04:00
Loudrob
c1e1f5164a Decorations should only be used on their correct holidays pls. 2015-05-16 14:34:31 -04:00
DenialMC
a03c70c0e6 Replace ugly method with beautiful 2015-05-16 14:03:46 +03:00
DenialMC
0f4521a19e Initial work on gifting (still broken right now), and sry zach 2015-05-16 13:23:30 +03:00
DenialMC
87a77a8740 Fix minigame speedchat crash 2015-05-16 12:40:45 +03:00
DenialMC
bd7488dd49 Fix special tab 2015-05-16 12:19:31 +03: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
DenialMC
3461d090ed What if I like gay porn 2015-05-15 22:43:59 +03:00
DenialMC
c866a4a52f No more accessory, clothing, furniture item gender discrimination! (except for skirts) 2015-05-15 22:37:41 +03:00
Loudrob
568eb60cca what if i like environ 2015-05-15 08:27:32 -04: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
8d33330192 New version number. 2015-05-14 20:54:08 +03: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
Loudrob
a2acb60412 y no purchase pls 2015-05-14 08:04:30 -04:00
Loudrob
c189e278ad No more terrorism. 2015-05-13 19:54:47 -04:00
DenialMC
cc781f595e fuck y'all 2015-05-14 00:22:58 +03:00
DenialMC
74abc6ac57 I fucked this up 2015-05-13 21:42:21 +03:00
DenialMC
26781efc6c All holiday decorations and activities 2015-05-13 21:36:11 +03:00
DenialMC
5b8a0428cb Perhaps this is a better solution 2015-05-13 20:40:06 +03:00
DenialMC
2649fc5256 Why was that even there!! + 5 more unique pets every day 2015-05-13 20:30:03 +03:00
DenialMC
067fb04dbd Fix new seed generation every day 2015-05-13 20:12:04 +03:00
DenialMC
db9dacb624 Import cleanup 2015-05-13 20:02:48 +03:00
DenialMC
694122266e Killed cpickle air_cancer, unused flagAv method, useless PetDCImports class (WTF!) 2015-05-13 19:54:42 +03:00
DenialMC
fb07a16d6c Fix pet friend inviting 2015-05-13 19:26:32 +03:00
DenialMC
6479913865 Crashed piano easter egg (I left the cream disabled cause it's gay) 2015-05-13 18:58:33 +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
DenialMC
8cbdbc1628 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-13 14:45:21 +03:00
DenialMC
c030f3be23 DistributedFindFour compile fix 2015-05-13 14:45:12 +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
John Cote
7e227afa55 this is better k 2015-05-12 17:49:30 -04:00
John Cote
044381e312 Merge branch 'master' of https://gitlab.com/ToontownUnited/src 2015-05-12 17:02:50 -04:00
Zach
26f5addbe8 gardens have begun 2015-05-12 16:02:38 -05:00
John Cote
a402169eab fixed jor el cam crash again don't revert pls k 2015-05-12 17:02:35 -04:00
Zach
2400f44ff8 oops. now its done 2015-05-12 15:58:12 -05:00
Zach
ab3876ff0d DistributedGardenAI is done 2015-05-12 15:52:38 -05:00
Zach
37fad887da fixed the fish sale at estate 2015-05-12 14:46:35 -05:00
Zach
37097d0645 Revert "treasurechest timing" 
This reverts commit e7d32197b9.
 2015-05-12 13:30:10 -05:00
Zach
9271489041 LaffShopGui cleanup 2015-05-12 13:11:27 -05:00
Zach
cfd7383ded jor-el cleanup 2015-05-12 12:49:33 -05:00
Zach
8e8a194dfa john's emote cleanup 2015-05-12 12:47:58 -05:00
Zach
e7d32197b9 treasurechest timing 2015-05-12 12:42:20 -05:00
Zach
861909b881 an even more amazing GUI 2015-05-12 03:10:49 -05:00
Zach
b491ff1cfe Revert "No tussling zone." 
This reverts commit 1e1a7e25fc.
 2015-05-12 00:12:55 -05:00
Zach
eacdc7f4d3 um who tf: part 2 2015-05-12 00:12:08 -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
36e553a941 Fix Jor El Cam crash 2015-05-11 23:37:24 -04:00
John Cote
0c4d6feffa Add Cigar Smoke Cog attack 2015-05-11 22:50:12 -04:00
Loudrob
1e1a7e25fc No tussling zone. 2015-05-11 20:39:10 -04:00
John Cote
7a5bd20859 Correct Treasure Chest H and collision tube. 2015-05-11 18:16:12 -04:00
Zach
1cedf121b1 jor-el fix 2015-05-11 15:57:44 -05:00
DenialMC
989f3f89ef Revert "Correct Treasure Chest H" 
This reverts commit e845fea8fa.
 2015-05-11 23:45:16 +03:00
DenialMC
e845fea8fa Correct Treasure Chest H 2015-05-11 23:43:14 +03:00
DenialMC
b253e3edda Add laff restock toons to each HQ 2015-05-11 23:36:31 +03:00
DenialMC
2d055f2dea PDB must be crucified 2015-05-11 22:58:11 +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
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