Commit graph

1427 commits

Author SHA1 Message Date
John Cote
1739b7eb4f Merge branch 'features/ttn' of https://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-26 01:05:35 -04:00
John Cote
dce3a6ad39 get rid of this multiplier 2015-07-26 01:05:26 -04:00
Master Voltage
3294a5f6f9 oops 2015-07-26 00:19:37 -04:00
Master Voltage
2abec96acc changed invasion messages 2015-07-26 00:17:55 -04:00
Master Voltage
894d05fd7b thx fooster 2015-07-25 23:58:24 -04:00
John Cote
7d4b810f03 fuck the phone 2015-07-25 20:56:30 -04:00
John
95649ed20a Fix 2015-07-25 18:19:45 +03:00
John
1c10218bb2 Delete All button in clerk purchase gui + a bit of inventorynew cleanup 2015-07-25 13:04:16 +03:00
John
3766374c80 Timer message fix 2015-07-25 12:21:06 +03:00
John
7cc57172c7 Crash fix 2015-07-25 12:18:36 +03:00
John
9a059f3893 Add clerks to Cog HQs, change their appearences, clerk rewrite, add ~dna showrandom m/f magic word. 2015-07-25 12:15:08 +03:00
John
9494a47466 New laff restock NPC 2015-07-25 09:08:54 +03:00
John
6d902c4d5d Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-25 09:07:49 +03:00
John
725e936a5d Delivery is instant on dev 2015-07-25 08:15:10 +03:00
John
ac3c97f723 Merge branch 'master' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-25 08:14:25 +03:00
John Cote
8de82b6f7d Reorganize Jumblespeed's commit 2015-07-24 19:58:37 -04:00
tts
cb422fd46b astron: add the centos one 2015-07-24 19:45:15 -04:00
tts
b1df3556b6 adjust permissions so that we may execute the files 2015-07-24 19:42:49 -04:00
JawhnL5
273ad26abb Merge branch 'master' into 'features/ttn'
Add Jumblespeed's prod commits into features/ttn.

See merge request !6
2015-07-24 19:53:58 -04:00
John Cote
987d828d59 dclass: Change uint64 to uint32 for LAST_LOGIN_TS entry. 2015-07-24 20:02:48 -04:00
John Cote
1a4e919e0f Revert "stride: add some files for running astron on centos & gameserver on ubuntu (we'll need to switch astron when server chanegs"
This reverts commit dc81ce6331.
2015-07-24 19:33:23 -04:00
tts
dc81ce6331 stride: add some files for running astron on centos & gameserver on ubuntu (we'll need to switch astron when server chanegs 2015-07-24 16:54:50 -04:00
John Cote
02e452b594 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-23 16:30:06 -04:00
John Cote
14ff727052 correct delivery times 2015-07-23 16:29:56 -04:00
Loudrob
c6db0b82d8 fuck dicks 2015-07-23 16:17:43 -04:00
John
7ef12e079a ctime 2015-07-23 23:03:22 +03:00
John
e1de301f2a Revert "Loyalty items cum back. ;(. & add ctime so mongo doesn't complain."
This reverts commit 881a8007df.
2015-07-23 23:00:50 +03:00
Loudrob
881a8007df Loyalty items cum back. ;(. & add ctime so mongo doesn't complain. 2015-07-23 15:54:46 -04:00
Loudrob
9ab1bd9534 Disney estate cannons. 2015-07-23 11:53:54 -04:00
John
fda14d3153 Satan 2015-07-23 13:19:57 +03:00
John
6ce7485ef4 Loudrob pls 2015-07-23 12:59:17 +03:00
Loudrob
a0d8025621 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 18:01:04 -04:00
Loudrob
1de4367482 No more updateCoons. 2015-07-22 18:00:31 -04:00
John Cote
99bd20b9da Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 12:20:29 -04:00
John Cote
f71a9124cc nice 2015-07-22 12:20:18 -04:00
Loudrob
b49683ccd9 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 11:14:09 -04:00
Loudrob
01b7437514 Phone quest. 2015-07-22 11:12:00 -04:00
John Cote
86b825a1f0 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 11:03:42 -04:00
John Cote
713babe566 Fish Bingo in estates
Same schedule.
2015-07-22 11:03:30 -04:00
Loudrob
e4e2b17e47 Forgot this, lel 2015-07-22 11:02:56 -04:00
Loudrob
773a1d2f43 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 10:52:12 -04:00
Loudrob
d1694f3d70 nice 2015-07-22 10:49:36 -04:00
John Cote
ec388033c1 Implement Fish Bingo
Every Wednesday and Saturday!
2015-07-22 10:47:02 -04:00
John Cote
d8381d214b Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-22 09:47:19 -04:00
John Cote
99e37a7f8a fix toon deletion 2015-07-22 09:47:10 -04:00
Loudrob
634378555d For now. 2015-07-22 09:11:48 -04:00
John Cote
4b2e6c05d6 edit DistributedToonStatuary 2015-07-22 02:46:55 -04:00
John Cote
baeb2f38f4 move the pet model down a bit
so it's closer to TTO.
2015-07-22 02:27:51 -04:00
John Cote
c5af613514 We don't need all these useless imports. 2015-07-22 02:21:04 -04:00
John Cote
e2501c2832 bye bye velvetRoped 2015-07-22 02:08:34 -04:00