Poodletooth-iLand/toontown/town
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
..
__init__.py switch to remote 2015-05-18 22:11:33 -04:00
BRStreet.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
BRTownLoader.py switch to remote 2015-05-18 22:11:33 -04:00
DDStreet.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
DDTownLoader.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
DGStreet.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
DGTownLoader.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
DLStreet.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
DLTownLoader.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
MMStreet.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
MMTownLoader.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
Street.py Merge branch 'JawhnL5/nametags' 2015-07-03 14:52:24 -04:00
TownBattle.py SOS head is now shown when you choose a NPC sos. 2015-06-30 17:51:50 +03:00
TownBattleAttackPanel.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TownBattleChooseAvatarPanel.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TownBattleCogPanel.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TownBattleSOSPanel.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TownBattleSOSPetInfoPanel.py Pet mood is now attached to nametag instead of pet 2015-07-02 21:35:04 +03:00
TownBattleSOSPetSearchPanel.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TownBattleToonPanel.py Merge branch 'news' 2015-06-30 22:07:08 +03:00
TownBattleWaitPanel.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TownLoader.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TTStreet.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
TTTownLoader.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
TutorialStreet.py switch to remote 2015-05-18 22:11:33 -04:00
TutorialTownLoader.py switch to remote 2015-05-18 22:11:33 -04:00