Commit graph

342 commits

Author SHA1 Message Date
Loudrob
369f038b63 Revert "No XP cap"
This reverts commit f42631b401.
2015-07-29 16:02:57 -04:00
Blurryface
260d5d1ae6 Revert "Added new colors."
This reverts commit 1bf949cfb0.
2015-07-28 20:10:08 +02: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
76423e911f Added baru's pro shirt + fixed over-filling closet bug 2015-07-27 18:53:31 +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
26de40ce8c Ability to switch poles in shticker book + poles appear in every catalog 2015-07-27 10:46:14 +03: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
John
1c10218bb2 Delete All button in clerk purchase gui + a bit of inventorynew cleanup 2015-07-25 13:04:16 +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
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
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
John
6ce7485ef4 Loudrob pls 2015-07-23 12:59:17 +03:00
Loudrob
a06c6a7543 Flower sell fix 2015-07-21 10:34:55 -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
f28c65d32b Match Jaymo 2015-07-18 01:21:43 +03:00
John
207f397e32 Fix trunk 2015-07-18 01:09:01 +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
d2834a6f65 Fix phone's 63 and nick 2015-07-17 18:36:33 +03:00
John
50297ca489 Trunks 2015-07-17 17:51:43 +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
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
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
a89e89f99a Chat Offense 2015-07-16 14:14:00 -04:00
Loudrob
6868fa1267 Merge branch 'master' into features/ttn 2015-07-14 20:49:28 -04:00
jp187187
9c349e5e42 dont fire me ;) added the 100inch cog screen 2015-07-14 17:42:29 -07: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
e4f432858e it's supposed to be like this 2015-07-12 19:16:38 -04:00
John
92b3eac364 Rounds a lure takes is shown in battle 2015-07-11 22:36:58 +03:00
John
86c6598284 Hypno Glass 2015-07-09 21:23:01 +03:00
John
071ee08176 It is always available. 2015-07-09 17:43:52 +03:00
John Cote
059b7801cb ClientStart can screw off. 2015-07-08 08:15:51 -04:00
John Cote
d0c0054e89 Fix an issue w/ describeException not working. 2015-07-08 08:06:14 -04:00
John
3c4770ebc6 CEO Boss Speech 2015-07-08 03:12:12 +03:00
John
ac60242003 Add skelecog and waiter invasions to summon page 2015-07-07 21:16:55 +03:00
John
e4d46fa992 Newbie Quests holocausted 2015-07-07 19:15:35 +03:00
John
0a3df8b2ea Fix music and sfx toggle 2015-07-07 13:27:23 +03:00
John
ec8ee69769 Add messages for CEO. TODO: Banquet Speech. 2015-07-07 02:39:55 +03:00
John
cb532a3fc8 CJ talks more 2015-07-07 02:04:20 +03:00
John
7d7686b900 Add messages for CFO 2015-07-07 01:49:02 +03:00
John
4ca9255561 VP talks a lot more now 2015-07-07 00:47:56 +03:00
John
394e232b6d Boss Taunts when releasing cogs 2015-07-06 21:20:32 +03: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
e31154ffc6 Cashbot Treasury Vault 2015-07-06 02:39:08 +03:00
Master Jumblespeed
6586760947 cleanup 2015-07-04 15:18:48 -04:00
Master Jumblespeed
49b26c4103 csmud: adjust remotedb 2015-07-04 15:13:29 -04:00
John
0c04d9d876 Remove Gag Accuracy tasks 2015-07-04 15:41:15 +03:00
John
fc1a9d8368 Title text shown in boss battles (such as: Sellbot Towers - Rooftop) 2015-07-04 14:24:27 +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
Loudrob
1716707f2d lazy 2015-07-03 13:14:21 -04:00
John
cbec66d244 Remove Techno/Trench font 2015-07-02 21:20:43 +03:00
John
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
3660d305cd NewsManager setInvasionStatus 2015-06-30 21:50:15 +03:00
John
6bb4ea0dbe ToontownTimer callback support 2015-06-30 20:11:20 +03:00
John
3ff23f8656 Boarding parties fixed 2015-06-29 19:44:23 +03:00
John
c04b4967fb Fix Zach's doors, fix immortal mode, fix unlimited gags, add new CJ cutscene. 2015-06-29 16:35:22 +03:00
John
40875ea6f6 Knock Knock door toonups 2015-06-27 20:01:51 +03:00
John
812164a696 Valentines Day 2015-06-25 21:43:32 +03:00
John
721a28d9cf Fireworks 2015-06-25 21:20:15 +03:00
John
d15813630f Calendar magic 2015-06-25 11:57:02 +03: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
Master Voltage
c269969ab9 RockAByeRoad is kill 2015-06-23 11:06:00 -04:00
John
2b6ca4e5cd Create general EffectMgr for cheesy effects, implement getEndDate for holidays, and implement Ides of March 2015-06-23 15:27:14 +03:00
John
39b42edbda They don't need more work 2015-06-21 22:33:39 +03:00
John
539afab9fe Minigame skipping 2015-06-21 22:09:31 +03:00
John
ad7c327752 I can't believe how many times I removed trolley holiday/weekend 2015-06-21 11:16:48 +03:00
John
8b5f1d040e Stride 2015-06-20 15:51:55 +03:00
John
e0765526be Remove setGM and gm name, now combined with setAdminAccess. TODO: disables 2015-06-18 22:26:42 +03:00
John
6c94355d39 FOV slider + add other sliders into TTLocalizer 2015-06-18 16:53:50 +03:00
Loudrob
4a5f177318 Merge branch 'master' of https://github.com/stevetts/tts_src
Conflicts:
	toontown/toonbase/ToontownGlobals.py
2015-06-17 11:26:10 -04:00
Loudrob
b05d274158 Misc Fixes (prepare your asshole for daniels commits) 2015-06-17 11:24:52 -04:00
John
8004cb953c Where did this go 2015-06-17 18:18:06 +03:00
John
468c192c14 Add tickets unite and make cog icons a bit smaller in the merits unite 2015-06-17 10:09:53 -04:00
John
6d24fb4390 Add merits unite which restocks 16.66% of the total merits required (meaning it needs a bit more than 6 unites to restock fully, even for BIg Cheese 23300 promotions.) 2015-06-17 10:08:57 -04:00
John
8c0eed8214 DANIEL: "Toon has went sad" 2015-06-17 10:06:05 -04:00
John
8751f73779 DANIEL: More cleanup 2015-06-17 10:04:20 -04:00
John
db17bbdc84 ChatGlobals cleanup 2015-06-17 10:00:36 -04:00
John
9416b70e91 10% chance for a Silly Surge 2015-06-17 10:00:09 -04:00
John
f42631b401 No XP cap 2015-06-17 09:58:43 -04:00
John
def7ca4372 Max true friends + cleanup 2015-06-17 09:49:18 -04:00
John
4cda455edc DANIEL: Leaderboards are done 8======D 2015-06-17 09:42:15 -04:00
John
9db517cfb3 DANIEL: Cycle through races shit 2015-06-17 09:40:24 -04:00
John
702260b1b7 DANIEL: Cast member button shit 2015-06-17 09:23:45 -04:00