Commit graph

249 commits

Author SHA1 Message Date
John
f28c65d32b Match Jaymo 2015-07-18 01:21:43 +03:00
John
a17151ef96 You can now buy any nametag style, the game will store it. Changeable in the shticker book! 2015-07-18 00:25:20 +03:00
Loudrob
c76b2ca2c8 Easy Promotion Papers 2015-07-17 14:01:50 -04:00
John
d5dc2c9d50 PotentialAvatar cleanup 2015-07-17 19:05:29 +03:00
John
50297ca489 Trunks 2015-07-17 17:51:43 +03:00
John
81e339d9e9 Preparation for next commit (sry have to git reset) 2015-07-17 15:40:14 +03:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
dfcd7c2124 Gift duplication fixed. 2015-07-14 14:35:15 -04:00
Master Voltage
1d48a7fa28 praise nacib 2015-07-14 10:40:11 -04:00
Loudrob
7f1d4b8e18 Merge branch 'master' into features/ttn 2015-07-14 06:38:49 -04:00
John
5b2f6ce816 The rounds effective for lure now shows on the battle inventory screen 2015-07-14 13:01:45 +03:00
John
a6b0aeaaff HD TV + Tailor Fix 2015-07-14 01:43:13 +03:00
Loudrob
87efdba167 More gifting. 2015-07-13 10:17:56 -04:00
Loudrob
c1654a3f42 fuck ur tabs 2015-07-12 20:17:17 -04:00
Loudrob
4e8fb45531 Current progress on gifting. 2015-07-12 15:42:55 -04:00
John
b14505435c Add toon model into the detail panel 2015-07-10 22:25:09 +03:00
John
86c6598284 Hypno Glass 2015-07-09 21:23:01 +03:00
John Cote
da7ba5ce89 Convert prints to writeServerEvents in code redemption manager AI and fix typos 2015-07-08 07:47:01 -04:00
John
ac60242003 Add skelecog and waiter invasions to summon page 2015-07-07 21:16:55 +03:00
John
ec8ee69769 Add messages for CEO. TODO: Banquet Speech. 2015-07-07 02:39:55 +03:00
John
32a26abd79 RIP AccountDate + changed CREATED in Account to uint64 instead of string 2015-07-06 22:46:20 +03:00
John Cote
568a076266 Deprecate has_key and fix bugs 2015-07-05 21:53:42 -04:00
John Cote
7508de0d79 lol whoops 2015-07-05 21:12:17 -04:00
John Cote
468b1702d8 Convert range to xrange 2015-07-05 21:02:35 -04:00
John Cote
ad09d429fb yay repo cleanup 2015-07-05 19:59:25 -04:00
John
9420973986 Laughing Man fix 2015-07-05 13:11:45 +03:00
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
1c84579924 Fix trophy score 2015-07-03 18:11:03 +03:00
John
5dbf692bae Fixed local toon's nametags 2015-07-03 17:52:30 +03:00
John
cf1785f7c7 Bank in inventory page 2015-07-03 00:16:47 +03:00
John
82d0bc2038 Can't use book while swimming anymore 2015-07-01 15:21:28 +03:00
John
2b02385e51 Swim run SFX 2015-07-01 15:12:45 +03:00
John
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
4911ad0607 Fix organic gags display 2015-06-30 20:11:30 +03:00
John
4990317c41 SOS head is now shown when you choose a NPC sos. 2015-06-30 17:51:50 +03:00
John
e4340eb131 Stuff that was bothering me 2015-06-29 21:54:28 +03:00
John
40875ea6f6 Knock Knock door toonups 2015-06-27 20:01:51 +03:00
John
ab10d5f05f Swim Sound implemented 2015-06-27 18:14:04 +03:00
John Cote
48539188de Some final nametag shit 2015-06-26 03:09:27 -04:00
John Cote
9b52f82419 UGH WHEN WILL THIS END 2015-06-26 00:32:17 -04:00
John
d15813630f Calendar magic 2015-06-25 11:57:02 +03:00
John Cote
dab0ac32d5 More nametag shit 2015-06-24 15:08:15 -04:00
John Cote
fa24711bc8 More work 2015-06-24 14:09:51 -04:00
John Cote
c568a632f1 More work 2015-06-24 13:44:04 -04:00
John Cote
167c5c5736 Current work 2015-06-24 13:19:10 -04:00
John Cote
cadeff717d Current work 2015-06-24 12:32:30 -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
2c8ac1add9 Scavenger hunts!! :D 2015-06-23 23:20:41 +03:00
John
7029f536c8 Holocaust HolidayManagerAI (newsmanager rewrite soon to come) 2015-06-21 22:46:17 +03:00