Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions
1500 commits 6 branches 0 tags 524 MiB
Commit graph

341 commits

Author SHA1 Message Date
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
a6b0aeaaff HD TV + Tailor Fix 2015-07-14 01:43:13 +03:00
Loudrob
87efdba167 More gifting. 2015-07-13 10:17:56 -04:00
Loudrob
c1654a3f42 fuck ur tabs 2015-07-12 20:17:17 -04:00
Loudrob
4e8fb45531 Current progress on gifting. 2015-07-12 15:42:55 -04: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 Cote
da7ba5ce89 Convert prints to writeServerEvents in code redemption manager AI and fix typos 2015-07-08 07:47:01 -04:00
John
ac60242003 Add skelecog and waiter invasions to summon page 2015-07-07 21:16:55 +03:00
John
ec8ee69769 Add messages for CEO. TODO: Banquet Speech. 2015-07-07 02:39:55 +03:00
John
32a26abd79 RIP AccountDate + changed CREATED in Account to uint64 instead of string 2015-07-06 22:46:20 +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
ad09d429fb yay repo cleanup 2015-07-05 19:59:25 -04:00
John
9420973986 Laughing Man fix 2015-07-05 13:11:45 +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
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
cf1785f7c7 Bank in inventory page 2015-07-03 00:16:47 +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
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
4911ad0607 Fix organic gags display 2015-06-30 20:11:30 +03:00
John
4990317c41 SOS head is now shown when you choose a NPC sos. 2015-06-30 17:51:50 +03:00
John
e4340eb131 Stuff that was bothering me 2015-06-29 21:54:28 +03:00
John
40875ea6f6 Knock Knock door toonups 2015-06-27 20:01:51 +03:00
John
ab10d5f05f Swim Sound implemented 2015-06-27 18:14:04 +03: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
d15813630f Calendar magic 2015-06-25 11:57:02 +03: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
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
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
2c8ac1add9 Scavenger hunts!! :D 2015-06-23 23:20:41 +03:00
John
7029f536c8 Holocaust HolidayManagerAI (newsmanager rewrite soon to come) 2015-06-21 22:46:17 +03:00
John
39b42edbda They don't need more work 2015-06-21 22:33:39 +03:00
John
44edf68ff7 DBObject holocaust 2015-06-21 12:27:40 +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
e0765526be Remove setGM and gm name, now combined with setAdminAccess. TODO: disables 2015-06-18 22:26:42 +03:00
John
884e452e32 Reconsider toons only when switching true friends/speedchat 2015-06-18 17:02:51 +03:00
Loudrob
b05d274158 Misc Fixes (prepare your asshole for daniels commits) 2015-06-17 11:24:52 -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
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
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
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
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
7a9da93d39 DANIEL: Crash fixes 2015-06-17 09:47:43 -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
898d57dc1f Fix ~ whitelist exploit, add True Friends and Speedchat Plus warnings. 2015-06-17 09:29:56 -04:00
John
702260b1b7 DANIEL: Cast member button shit 2015-06-17 09:23:45 -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
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
a6e7fb9d83 Darn, this was necessary after all. 2015-06-17 08:29:22 -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
f1ffdc9a1e DANIEL: Proper toonKilledCogs method 2015-06-17 08:24:00 -04:00
John
6bfb28c36f Add tank item to cattlelog 2015-06-17 08:15:28 -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
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
81728b339a DANIEL: Better glove NPC 2015-06-16 19:41:34 -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
Loudrob
8a01138fc6 Less dan. 2015-06-11 08:33:28 -04:00
Zach
990dcd0d5f lel 2015-06-02 22:55:38 -05:00
Zach
9033861dfb pillow gravity 2015-06-01 16:14:34 -05:00
Zach
3056946f04 laff restock npc's suits fixed 2015-05-27 02:08:39 -05: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
Zach
fcc048ac12 removed teleport anim 2015-05-24 23:33:52 -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
John Cote
1fbd0602dc Organize the repo a bit more 2015-05-22 23:47:35 -04:00
Loudrob
820732c776 No more pro lackers who pass the limit. 2015-05-21 19:45:40 -04:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
John Cote
badea7d47e These need some more work 2015-05-17 22:46:24 -04:00
John Cote
a195cbe230 Remove skid colors 2015-05-17 01:11:05 -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
DenialMC
0f4521a19e Initial work on gifting (still broken right now), and sry zach 2015-05-16 13:23:30 +03:00
Loudrob
a2acb60412 y no purchase pls 2015-05-14 08:04:30 -04:00
DenialMC
cc781f595e fuck y'all 2015-05-14 00:22:58 +03:00
DenialMC
2649fc5256 Why was that even there!! + 5 more unique pets every day 2015-05-13 20:30:03 +03:00
DenialMC
694122266e Killed cpickle air_cancer, unused flagAv method, useless PetDCImports class (WTF!) 2015-05-13 19:54:42 +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
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
Zach
9271489041 LaffShopGui cleanup 2015-05-12 13:11:27 -05:00
Zach
8e8a194dfa john's emote cleanup 2015-05-12 12:47:58 -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
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
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
cbf82d4a5d Laff Restock NPC (isn't anywhere in the game yet) 2015-05-11 19:21:07 +03: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
Zach
74ac72d5b3 removed it. sry. k 2015-05-10 14:26:19 -05:00
DenialMC
663d3a6ed3 Fucking go die in a fire + added Unavailable to TTLocalizer 2015-05-10 16:31:15 +03:00
DenialMC
4be52eb5aa Skrublordism 2015-05-10 16:06:43 +03: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
DenialMC
f9d5707018 Donald NPC in Donalds Dock 2015-05-10 14:56:49 +03:00
Zach
747bcd898b rage emote 2015-05-10 06:25:02 -05:00
DenialMC
cbc94f56bb Added a bunch of new decoration and games, but those games dont work 2015-05-06 21:04:18 +03:00
DenialMC
5e45804b51 Ain't anybody got time fo dis 2015-05-06 10:44:56 +03:00
Loudrob
48f474c423 Magic word to remove redeemed code. 2015-05-05 16:25:45 -04:00
Loudrob
c623f806cc Bug report button k. 2015-05-03 12:38:18 -04:00