Commit graph

1121 commits

Author SHA1 Message Date
John
c609a44980 Shuffle button fix 2015-08-04 23:17:48 +03:00
John
b036e788e8 Cut down on colors 2015-08-04 22:11:43 +03:00
John
859eba5e10 Fix Glove NPC.. I promise 2015-08-04 22:08:38 +03:00
John
ed9c41bbf4 Glove NPC 2015-08-04 22:00:20 +03:00
John
8acb336dae Actual color picker 2015-08-04 21:57:39 +03:00
John
86223ef6df Take that colorful coons! 2015-08-04 19:59:47 +03:00
John
edb6fa9d40 Broken af 2015-08-04 19:33:25 +03:00
John
3ff51a9b14 Holocausted Laughing Man 2015-08-04 16:26:11 +03:00
John
1f4783607d Color gender equality 2015-08-04 14:46:02 +03:00
John
a4c9d2957c Gag popup on hover 2015-08-04 03:18:12 +03:00
John
1b6c2c0176 Buster's pitched cog fall apart sound 2015-08-03 17:31:13 +03:00
John
e0e2c27681 Added a few NPCs to the new street - the NameMe ones are missing 2015-08-03 15:49:36 +03:00
John
a5b7293a35 Fix emote access 2015-08-03 03:53:39 +03:00
John
ba586faa6f Improved TV with "remote" 2015-08-03 03:25:37 +03:00
John
323d181e6f Text to speech 2015-08-03 02:48:36 +03:00
John
61a703e04d Initial work on new street 2015-08-03 02:48:08 +03:00
John
ab5ae94e17 Add teleport transition toggle button 2015-08-01 23:19:18 +03:00
John
5fb794cf41 Andrew's rename 2015-08-01 22:06:44 +03:00
John
5441e4ce0d Added back teleport animation 2015-08-01 21:56:42 +03:00
John
6dd6ad8951 Potential fix for laff meter overlapping 2015-08-01 21:41:53 +03:00
John
0686115b24 ~satanGrowFlowers grows trees now, treasures are now every 30 seconds instead of 10, TTC heals 1 -> DDL heals 6, and treasures are incremented by 3 2015-08-01 21:13:36 +03:00
John
1c5a9ebbbe WTF 2015-08-01 19:14:50 +03:00
John
d4557e69fa Group Manager 2015-08-01 17:08:37 +03:00
Loudrob
e3c34e4fe8 Top Toons Bool 2015-08-01 10:01:28 -04:00
John
e78d84f9e4 Merits are not in the random unite list anymore 2015-08-01 02:45:37 +03:00
John
067667c019 Holocaust Cog HQ clerks 2015-08-01 02:43:28 +03:00
John
f1f38cdae8 Holocaust admin nametags + do Loudrob's pro stuff 2015-08-01 02:37:41 +03:00
John
2687adb691 Hot fix 2015-07-31 21:17:41 +03:00
John
395130b72f New phrases 2015-07-31 20:30:54 +03:00
John
30b7ff3b20 The CFO can now jump to revive all goons 2015-07-31 20:18:56 +03:00
John
90b98ad3ef True Friends 2015-07-31 14:45:00 +03:00
jp187187
8a0467cf7e Garden fixes to give a TTO feel 2015-07-30 19:30:53 -07:00
John
42f79c3957 Some cleanup 2015-07-31 01:26:06 +03:00
John
ffd8f1f001 Oops, debug 2015-07-31 01:22:58 +03:00
John
49b2422187 Chairs.. my blood went into this.. 2015-07-31 01:15:21 +03:00
John
0c06b40b39 Added John's top floors 2015-07-30 20:25:37 +03:00
John
e64d1583a4 John L's pro stuff (Buildings) + cleanup 2015-07-30 00:14:59 +03:00
Loudrob
369f038b63 Revert "No XP cap"
This reverts commit f42631b401.
2015-07-29 16:02:57 -04:00
Blurryface
a9d6a70ef7 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-28 20:12:29 +02:00
Blurryface
260d5d1ae6 Revert "Added new colors."
This reverts commit 1bf949cfb0.
2015-07-28 20:10:08 +02:00
John
b3d86da403 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-28 20:35:55 +03:00
John
892addeb9b Add back yes/no/OK 2015-07-28 20:34:26 +03:00
Blurryface
1bf949cfb0 Added new colors. 2015-07-28 15:42:42 +02:00
John
6ab319db0f Stats! To-do: fix gone sad 2015-07-28 04:15:28 +03:00
John
2bd6230fd3 Require player to type in toon's name before deleting 2015-07-28 01:09:55 +03:00
John
28331e7b0a Show dustcloud on disable 2015-07-28 00:52:37 +03:00
John
e402d25e21 Remove Yes, No, OK (loudrob's favorite) 2015-07-27 22:52:30 +03:00
Master Jumblespeed
fe658a6b03 fix parenthesis 2015-07-27 12:05:02 -04:00
John
76423e911f Added baru's pro shirt + fixed over-filling closet bug 2015-07-27 18:53:31 +03:00
John
0308b56ac4 Don't tell me I forgot to push the actual crates 2015-07-27 18:05:58 +03:00
John
75ffd52621 Crates finished :D 2015-07-27 18:02:19 +03:00
John
48ba472271 Initial work on crates and keys + ~factorywarp fix 2015-07-27 13:44:29 +03:00
John
3e81a8c468 Tug Of War + Cog-O-War 2015-07-27 10:55:40 +03:00
John
26de40ce8c Ability to switch poles in shticker book + poles appear in every catalog 2015-07-27 10:46:14 +03:00
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
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
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
99e37a7f8a fix toon deletion 2015-07-22 09:47:10 -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
John Cote
4411cb805b gtfo has_key and range 2015-07-22 01:45:01 -04:00
Loudrob
c042107c4d maxGarden 2015-07-21 23:41:50 -04:00
Loudrob
f772fd8e27 Treasure planner 2015-07-21 14:38:59 -04:00
John Cote
b044f98305 More gardening GUI widescreen 2015-07-21 14:32:19 -04:00
John Cote
d0ff9ff635 widescreen gardening gui 2015-07-21 14:12:56 -04:00
John Cote
47845a2865 Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn 2015-07-21 12:21:30 -04:00
John Cote
3de77cb7b0 Fix an error with plating statuary. 2015-07-21 12:21:20 -04:00
Loudrob
ba42dcb7d8 Top Toons: More appropriate 2015-07-21 12:04:01 -04:00
Loudrob
a06c6a7543 Flower sell fix 2015-07-21 10:34:55 -04:00
John Cote
3d8d023af9 hot keyerror fix 2015-07-21 10:04:58 -04:00
Loudrob
41d8b63ec2 wtf this fixed it cool 2015-07-21 09:08:00 -04:00
Loudrob
43b138e338 gtfo has_key 2015-07-20 19:02:13 -04:00
Loudrob
1236e38d62 Current garden progress. 2015-07-20 15:53:53 -04:00
Loudrob
c93fec2f19 Top Toons 2015-07-20 13:16:39 -04:00
Loudrob
cf319c587b useless 2015-07-20 09:25:21 -04:00
Loudrob
7cb50fc828 Mongo 2015-07-18 12:57:36 -04:00
Loudrob
7505459b59 Newer pet manager. 2015-07-18 12:17:05 -04:00
John
2c451321b2 nametags: Removed a few unused nametags, added boardinggroup and battlesos color, fixed toon statue selection GUI, doodles now have green nametags. 2015-07-18 15:25:47 +03:00
John
071d59f4d0 Leaderboard fix + ~race finish magic word 2015-07-18 11:21:53 +03:00
John
18f600b593 RIP Pillows 2015-07-18 03:00:24 +03:00
John
ba8df1addf Merge branch 'master' into features/ttn 2015-07-18 02:42:40 +03:00
Master Jumblespeed
ad680a934c csmud: fix name approval with developer db 2015-07-17 19:39:20 -04:00
John
95f67faab5 Stuff 2015-07-18 02:28:36 +03:00
John
0be23c6abe Show name of nametag while choosing 2015-07-18 01:41:22 +03:00
John
7be88f4d33 Tank items should have delivery date 2015-07-18 01:36:45 +03:00
John
f28c65d32b Match Jaymo 2015-07-18 01:21:43 +03:00
John
207f397e32 Fix trunk 2015-07-18 01:09:01 +03:00
John
24aefa8408 Nametag styles are sent now 2015-07-18 00:39:11 +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
72e4dc11ad Somebody come up with quests for EPP 2015-07-17 16:07:43 -04:00
Loudrob
c76b2ca2c8 Easy Promotion Papers 2015-07-17 14:01:50 -04:00
John
98347f5b7f Accessory gender equality (Clothing equality is harder and will be done later cause of 63) 2015-07-17 20:30:29 +03:00
John
18fb9b1924 Sorry nacib 2015-07-17 19:48:30 +03:00
John
d5dc2c9d50 PotentialAvatar cleanup 2015-07-17 19:05:29 +03:00
John
d2834a6f65 Fix phone's 63 and nick 2015-07-17 18:36:33 +03:00
John
cc91c43036 Fix 63 or nick 2015-07-17 18:08:49 +03:00
John
50297ca489 Trunks 2015-07-17 17:51:43 +03:00
Loudrob
2de7c4d6ca Merge branch 'features/ttn' of https://github.com/stevetts/tts_src into features/ttn 2015-07-17 10:30:54 -04:00
Loudrob
a20de77143 Disable this for now. 2015-07-17 10:29:56 -04:00
John
fea04b73e7 Give girls girl furniture 2015-07-17 17:24:21 +03:00
John
feba8e73c0 Add trunks to houses 2015-07-17 16:51:45 +03:00
John
96d78ae33d Lock friends list for 1.5 seconds after loading a friend + show text when player is sending gifts too fast. 2015-07-17 15:54:12 +03:00
John
f3ca3df3c0 Fix family member display name in the mailbox 2015-07-17 15:42:04 +03:00
John
81e339d9e9 Preparation for next commit (sry have to git reset) 2015-07-17 15:40:14 +03:00
John
0d3f31971e X on order + mailbox sync + grammar 2015-07-17 15:29:08 +03:00
John
5a4dc305d1 Fix Loudrob's stuff 2015-07-17 15:04:59 +03:00
John
c21c7d53fd Sorry loudrob 2015-07-17 14:55:14 +03:00
Loudrob
e25c163d48 Merge branch 'master' into features/ttn 2015-07-17 07:53:22 -04:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
a89e89f99a Chat Offense 2015-07-16 14:14:00 -04:00
jp187187
359e52ed11 Fix Jukeboxes for estates parties and no conflict with TV
loop needs int not float and time is float and loop was set to
getMusicRepeatTimes(length) this is time not loop
2015-07-16 08:12:20 -07:00
Loudrob
ae40f21034 Better phone scale. 2015-07-16 09:26:34 -04:00
John
603dad00cb Merge branch 'master' into features/ttn 2015-07-16 15:53:32 +03:00