Commit graph

37 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
244fc5f057 Unique ID allocator holocausted 2015-06-30 20:55:38 +03:00
John Cote
48539188de Some final nametag shit 2015-06-26 03:09:27 -04:00
John Cote
5cc0d8f27a More nametag translation 2015-06-25 22:59:13 -04:00
John
812164a696 Valentines Day 2015-06-25 21:43:32 +03:00
John
144856d30a Calendar fix 2015-06-25 13:04:26 +03:00
John
d15813630f Calendar magic 2015-06-25 11:57:02 +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
5a76de3d72 Proper positions for everything above the head 2015-06-20 15:19:09 +03:00
John
e0765526be Remove setGM and gm name, now combined with setAdminAccess. TODO: disables 2015-06-18 22:26:42 +03:00
John
338d83a907 DANIEL: Friends cleanup 2015-06-17 09:10:17 -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
John Cote
0d8319be38 Parties will work now k 2015-05-25 13:42:55 -04:00
John Cote
85b8923d35 Add back Zach's fixes 2015-05-25 13:31:34 -04:00
John Cote
913f29b745 Fix party bugs
but def not all
2015-05-25 13:27:32 -04:00
Zach
023cbc6acb jukebox at estate 2015-05-25 05:17:14 -05:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
John Cote
834e0f4385 More name changing
god fucking damn voltage
2015-05-16 23:00:56 -04:00
Loudrob
1d0d5fc2fe Revert "I fucked this up"
This reverts commit 74abc6ac57.
2015-05-16 14:38:34 -04:00
Loudrob
c1e1f5164a Decorations should only be used on their correct holidays pls. 2015-05-16 14:34:31 -04:00
DenialMC
74abc6ac57 I fucked this up 2015-05-13 21:42:21 +03:00
DenialMC
26781efc6c All holiday decorations and activities 2015-05-13 21:36:11 +03:00
Zach
e1ccaa674f cannons thing 2015-05-10 18:58:31 -05:00
DenialMC
cbc94f56bb Added a bunch of new decoration and games, but those games dont work 2015-05-06 21:04:18 +03:00
John Cote
52553e5bf9 Fix the party spawn title text. 2015-04-26 18:19:01 -04:00
DenialMC
b2bab83cbb So much Jizzney removing that Hitler toke his life 2015-04-25 10:26:27 +03:00
John
6ba9b8ef51 Starting work on news 2015-06-22 10:23:46 +03:00
DenialMC
d36f957694 TutorialForceAcknowledge, DownloadForceAcknowledge and the huge launcher is exterminated. 2015-04-08 11:56:49 +03:00
DenialMC
45b9e2972b isPaid and getGameAccess holocausted 2015-04-08 00:15:58 +03:00
DenialMC
b7654d438d Convert all tabs to spaces 2015-04-04 11:31:28 +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