Commit graph

12 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
812164a696 Valentines Day 2015-06-25 21:43:32 +03:00
John Cote
fa24711bc8 More work 2015-06-24 14:09:51 -04:00
John
784535541d Tons of work.. but christmas/halloween are still not implemented properly. However fishing works now. 2015-06-24 16:49:20 +03:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
338d83a907 DANIEL: Friends cleanup 2015-06-17 09:10:17 -04:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
John
6ba9b8ef51 Starting work on news 2015-06-22 10:23:46 +03:00
Daniel
876868179c Some phase_3 cleanup 2015-03-09 22:47:59 +02:00
Daniel
c42511f670 Enable parties, fix party cost and fix party planner crash 2015-04-20 18:15:19 +03:00
Loudrob
02c7dc11e4 Initial commit 2015-03-03 17:10:12 -05:00