Commit graph

8 commits

Author SHA1 Message Date
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
40875ea6f6 Knock Knock door toonups 2015-06-27 20:01:51 +03:00
John Cote
e8a57d7251 More work 2015-06-25 14:51:27 -04:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04: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
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
Loudrob
02c7dc11e4 Initial commit 2015-03-03 17:10:12 -05:00