Commit graph

151 commits

Author SHA1 Message Date
John
4a0ac70835 Preferred district 2015-08-07 17:36:58 +03:00
John
d4557e69fa Group Manager 2015-08-01 17:08:37 +03:00
John
d5dc2c9d50 PotentialAvatar cleanup 2015-07-17 19:05:29 +03: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
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
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
d15813630f Calendar magic 2015-06-25 11:57:02 +03:00
John Cote
167c5c5736 Current work 2015-06-24 13:19:10 -04:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
7352c9df43 ~disableGM , ~enableGM + anybody can use magic words (but ppl are kicked) 2015-06-20 15:42:38 +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
John
f0c0c08719 DANIEL: Cleanup 2015-06-17 10:11:33 -04:00
John
54125c5b65 Default identifyFriend method in OTP 2015-06-17 09:38:25 -04:00
John
e52d47367c (kill me) DANIEL: Friends list cleanup 2015-06-17 09:27:53 -04:00
John
7b8e48df78 We don't need a ClsendTracker 2015-06-17 09:10:58 -04:00
John
338d83a907 DANIEL: Friends cleanup 2015-06-17 09:10:17 -04:00
Loudrob
e702145334 DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11' 2015-06-16 19:13:24 -04: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
John Cote
0d198f9f5d Cleanup 2015-06-05 01:05:01 -04:00
loblao
0b2107c04d CSM: new tokens + holocaust dc imports 2015-05-31 17:08:46 -03:00
Zach
d962bd6ea0 removed track shop 2015-05-30 10:06:50 -05:00
Zach
e3832ffac7 lobby manager 2015-05-30 09:01:18 -05:00
Zach
0425544dfc cog hq doors and lobbies 2015-05-27 08:07:12 -05:00
Zach
3056946f04 laff restock npc's suits fixed 2015-05-27 02:08:39 -05:00
Zach
f0ac25e0f9 rental suits 2015-05-26 17:57:35 -05:00
Zach
d5595c3a74 added collisions to pillow and new tunnel 2015-05-25 13:12:27 -05:00
Zach
023cbc6acb jukebox at estate 2015-05-25 05:17:14 -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
9a4af9c686 Remove Welcome Valley 2015-05-24 17:21:40 +03:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
John Cote
449237e764 fix this shit 2015-05-17 00:52:45 -04:00
John Cote
35b064a59e Some revert k 2015-05-17 00:52:07 -04:00
Master Voltage
b23c33c957 i committed them rename edits k 2015-05-16 21:04:41 -04:00
Loudrob
c1e1f5164a Decorations should only be used on their correct holidays pls. 2015-05-16 14:34:31 -04:00
DenialMC
0f4521a19e Initial work on gifting (still broken right now), and sry zach 2015-05-16 13:23:30 +03: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
Loudrob
69cf793189 Fix bank. 2015-05-13 18:48:13 -04:00
DenialMC
26781efc6c All holiday decorations and activities 2015-05-13 21:36:11 +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
18b5e46084 DC imports 2015-05-13 14:04:57 +03: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