Commit graph

262 commits

Author SHA1 Message Date
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