Commit graph

21 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
ab10d5f05f Swim Sound implemented 2015-06-27 18:14:04 +03:00
John Cote
c568a632f1 More work 2015-06-24 13:44:04 -04:00
John Cote
d2b0d99175 Change from pandac.PandaModules to panda3d.core in some files 2015-06-23 19:11:48 -04:00
John
6c94355d39 FOV slider + add other sliders into TTLocalizer 2015-06-18 16:53:50 +03:00
John
67f7c45f68 DANIEL: Chat color shit 2015-06-17 09:37:55 -04:00
John
8352d31504 These are useless 2015-06-17 09:10:33 -04:00
John
d9454000b4 Work on chat garbler 2015-06-17 08:46:14 -04:00
John
1b2c00f7a1 DANIEL: Beginning of chat stuff 2015-06-17 08:45:55 -04:00
John
35b646c4e6 Revert "Spring cleaning"
This reverts commit 1e4bad8c6b.
2015-06-16 20:26:44 +03:00
John Cote
1e4bad8c6b Spring cleaning 2015-06-15 20:56:12 -04:00
Zach
f25ad9caf8 merge fix and my bs devs fix 2015-05-24 18:42:26 -05:00
Zach
8bf8cf5f55 GARDENING, BITCHES 2015-05-24 18:23:54 -05:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
DenialMC
2d055f2dea PDB must be crucified 2015-05-11 22:58:11 +03:00
John Cote
aa8e8b6d09 Add back posCamera fix 2015-04-28 00:28:12 -04:00
John Cote
227595fc64 Revert "Fix a stupid Lerp crash for posCamera"
This reverts commit 0616cc4004.
2015-04-27 20:45:53 -04:00
John Cote
0616cc4004 Fix a stupid Lerp crash for posCamera 2015-04-27 20:41:45 -04:00
DenialMC
f27d6392db Holeycaust - more preparations 2015-04-23 20:55:47 +03:00
Loudrob
02c7dc11e4 Initial commit 2015-03-03 17:10:12 -05:00