Poodletooth-iLand/toontown/shtiker
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
CogPageGlobals.py switch to remote 2015-05-18 22:11:33 -04:00
DeleteManager.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
DeleteManagerAI.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
DisguisePage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
DisplaySettingsDialog.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
EventsPage.py Revert "Spring cleaning" 2015-06-16 20:26:44 +03:00
FishPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
GardenPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
GolfPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
GroupPage.py Cleanup GroupPage.py 2015-05-26 22:21:38 -04:00
InventoryPage.py Fix bank money display 2015-07-03 17:09:04 +03:00
KartPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
MapPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
NewbiePurchaseManager.py switch to remote 2015-05-18 22:11:33 -04:00
NewbiePurchaseManagerAI.py switch to remote 2015-05-18 22:11:33 -04:00
NPCFriendPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
OptionsPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
PhotoAlbumPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
PurchaseManager.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
PurchaseManagerAI.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
PurchaseManagerConstants.py switch to remote 2015-05-18 22:11:33 -04:00
QuestPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
ShardPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
ShtikerBook.py Current work 2015-06-24 13:19:10 -04:00
ShtikerPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
SuitPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
SummonCogDialog.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TIPPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
TrackPage.py Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00