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
..
ai	Merge branch 'news'	2015-06-30 22:07:08 +03:00
avatar	Merge branch 'JawhnL5/nametags'	2015-07-03 14:52:24 -04:00
chat	Merge pull request #46 from stevetts/master	2015-06-24 14:42:26 -04:00
distributed	Merge branch 'JawhnL5/nametags'	2015-07-03 14:52:24 -04:00
friends	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -04:00
level	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -04:00
margins	Fix Ambulance Chaser nametags in the margin	2015-07-03 18:04:17 +03:00
namepanel	Change from pandac.PandaModules to panda3d.core in some files	2015-06-23 19:11:48 -04:00
nametag	Fix loudrob's issue	2015-07-03 18:28:18 +03:00
otpbase	Merge branch 'news'	2015-06-30 22:07:08 +03:00
otpgui	Thank you RDB and the P3D team	2015-06-17 20:18:11 +03:00
settings	switch to remote	2015-05-18 22:11:33 -04:00
speedchat	Merge branch 'news'	2015-06-30 22:07:08 +03:00
__init__.py	switch to remote	2015-05-18 22:11:33 -04:00