Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions
1461 commits 6 branches 0 tags 524 MiB
Commit graph

1182 commits

Author SHA1 Message Date
John
d686796023 Merge SnowUtil and SkyUtil into SZUtil, fix mayChange spam in log because of the map, fix the various issues with the underwater fog. 2015-08-14 17:23:45 +03:00
John
699c54b40d DisplaySettingsDialog fix 2015-08-14 16:47:05 +03:00
Alexander
ad81064fb7 Add back files from old deployment branch. 2015-08-14 02:23:24 -04:00
John
655d77a401 Add chat settings RPC command: untested 2015-08-14 00:38:00 +03:00
John
b8ef66621f CHAT_SETTINGS Account dc field 2015-08-14 00:31:23 +03:00
John
be54eb19df 2X merit multiplier for factories 2015-08-13 23:39:09 +03:00
Loudrob
ecc33e1c3d some more mongo stuff (sorry that i pushed it here :() 2015-08-13 16:00:50 -04:00
John
ae3a7e7dc5 Nerf fish rarity properly 2015-08-13 22:42:29 +03:00
John
a3822b5099 Proper resistance toon DNAs + scarecrow fix in CFO battle 2015-08-13 15:41:18 +03:00
John
fc0a24904c Tutorial chat bubble click fix + arrows fix 2015-08-13 14:47:51 +03:00
John
1d1e96d055 Fix cast member crash 2015-08-13 14:03:08 +03:00
John
0976a80bef Carry 3 TNTs and 7 trapdoors 2015-08-13 13:58:38 +03:00
John
dc83a72cc4 Widescreen whisper frame 2015-08-13 13:54:13 +03:00
John
3880d7e032 NPCToons cleanup 2015-08-13 13:23:57 +03:00
John
6bdc129b67 Organic gag display in the battle GUI and better ~trackBonus command 2015-08-13 03:55:51 +03:00
John
3d5a138a68 SOS friends are now sorted by rarity 2015-08-13 03:19:58 +03:00
John
b155962dca Fix a bug with the teleport button 2015-08-12 22:46:34 +03:00
John
2098275dfa Cog HQ teleport crash fix 2015-08-12 22:03:58 +03:00
John
9299357345 Color picker fixes 2015-08-12 21:49:51 +03:00
John
0489a156a3 Color drag 2015-08-12 21:37:20 +03:00
John
b3efea4a6d Teleport button fixed 2015-08-12 20:17:34 +03:00
John
7a8552c10e More fixes 2015-08-12 19:14:40 +03:00
John
19608959c5 Tutorial fix 2015-08-12 19:10:45 +03:00
John
f137f3f047 Toons now stop when greeted with a warning message while trying to go into a door instead of running in 1 place 2015-08-12 18:44:35 +03:00
John
1dcba024d5 NPC fix!! 2015-08-12 18:37:17 +03:00
John
c7011bc757 Don't send trophies on result 2015-08-12 14:55:03 +03:00
John
41307f6a0f Revert "Another friend fix" 
This reverts commit 156752b4a7.
 2015-08-12 14:51:07 +03:00
John
156752b4a7 Another friend fix 2015-08-12 14:45:48 +03:00
John
da0366d02a TV proper loop 2015-08-12 14:39:31 +03:00
John
bacd4b365c Boarding Group messages are now clickable 2015-08-12 14:21:39 +03:00
John
9d43264adc Friends list bug fix 2015-08-12 14:17:43 +03:00
John
e2d7b9b674 POPSICLES 2015-08-10 16:33:28 +03:00
John
1d8fe20587 Refactor suit health bar 2015-08-09 15:23:35 +03:00
John
7019d1ba9a Rewritten (no pun intended) cog panel 2015-08-09 14:32:13 +03:00
John
a2d5b004c9 Holocaust fire cost 2015-08-09 13:41:30 +03:00
Alexander
1d4caa84e9 Revert to old way for now. 2015-08-08 22:53:39 -04:00
Alexander
9b1dfba315 Let's try this. 2015-08-08 22:38:16 -04:00
Alexander
4ac30dbe52 Forgot a import. 2015-08-08 22:29:39 -04:00
Alexander
4a12f647ee Fix game crashing now? 2015-08-08 22:24:05 -04:00
Alexander
aa99dab28d Avoid using the account-bridge on prod. 2015-08-08 22:14:29 -04:00
Alexander
f6e34fd8a5 Fix Missing 'mongodb' 2015-08-08 21:14:57 -04:00
Alexander
504c178acc Update Resources, LibPandaDna (broken) and fix the missing resources on the client. 2015-08-08 10:12:50 -04:00
John
80b5e4c548 New magic word: ~secondVP - skips to second battle 2015-08-08 13:32:48 +03:00
John
ce8d856ebe Proper Fish Bingo implementation using News Manager 2015-08-08 12:08:45 +03:00
John
0718b91ed4 Add the new shops and NPCs for the street 2015-08-07 23:54:53 +03:00
John
56c9f71296 Yet another fix.. 2015-08-07 23:32:10 +03:00
John
d696338f5d Color shop crash fix 2015-08-07 23:27:54 +03:00
Alexander
d93a8e5e60 Merge remote-tracking branch 'origin/master' into feature/deployment 2015-08-07 16:13:37 -04:00
John
4a0ac70835 Preferred district 2015-08-07 17:36:58 +03:00
John
e31d7fae8e NPC Tuple magic word 2015-08-07 13:02:07 +03:00
John
68b8b047a5 Grammar fixes, settings.json beautify, crash fixes, GC fixes (still breaks though with #f), and gag selection fix 2015-08-06 14:55:00 +03:00
John
3093813f06 Holocaust minimum laff for elevators 2015-08-06 12:29:26 +03:00
Alexander
ad206df3e9 Add some more things needed for deployment. 2015-08-05 15:41:39 -04:00
John
c00680154d Falling asleep fix 2015-08-05 13:54:18 +03:00
John
7ad94d8034 Holocaust Talkative Tyler 2015-08-05 13:44:56 +03:00
John
57cb06e3fa Migrate color after manual change 2015-08-05 13:30:52 +03:00
John
567c556ebc No TV looping 2015-08-05 11:38:49 +03:00
John
ead19d7c63 Another fix 2015-08-05 11:05:01 +03:00
Alexander
00e3650737 Replace self.shard with the correct districtId. 2015-08-05 04:02:12 -04:00
Alexander
5c776d6cc8 Fix a mistake I made. 2015-08-05 03:55:11 -04:00
Alexander
2e6cc13c56 Add the resources as a submodule for deployment. 2015-08-05 03:46:11 -04:00
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