Commit graph

95 commits

Author SHA1 Message Date
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
dfcd7c2124 Gift duplication fixed. 2015-07-14 14:35:15 -04:00
Master Voltage
1d48a7fa28 praise nacib 2015-07-14 10:40:11 -04:00
Loudrob
87efdba167 More gifting. 2015-07-13 10:17:56 -04:00
Loudrob
c1654a3f42 fuck ur tabs 2015-07-12 20:17:17 -04:00
Loudrob
4e8fb45531 Current progress on gifting. 2015-07-12 15:42:55 -04:00
John
ac60242003 Add skelecog and waiter invasions to summon page 2015-07-07 21:16:55 +03:00
John Cote
7508de0d79 lol whoops 2015-07-05 21:12:17 -04: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
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
e4340eb131 Stuff that was bothering me 2015-06-29 21:54:28 +03:00
John
40875ea6f6 Knock Knock door toonups 2015-06-27 20:01:51 +03: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
John
7029f536c8 Holocaust HolidayManagerAI (newsmanager rewrite soon to come) 2015-06-21 22:46:17 +03:00
John
c57ebf03ed Cleanup 2015-06-20 12:24:08 +03:00
John
e0765526be Remove setGM and gm name, now combined with setAdminAccess. TODO: disables 2015-06-18 22:26:42 +03:00
John
f0c0c08719 DANIEL: Cleanup 2015-06-17 10:11:33 -04:00
John
a4708291ac 33% instead of 16% 2015-06-17 10:10:38 -04: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
78a7662ff4 Fix wedding cake pie 2015-06-17 10:01:55 -04:00
John
def7ca4372 Max true friends + cleanup 2015-06-17 09:49:18 -04:00
John
7bad238cbe DANIEL: New npc friends page 2015-06-17 09:20:54 -04:00
John
338d83a907 DANIEL: Friends cleanup 2015-06-17 09:10:17 -04:00
John
93e0c04dce DANIEL: db values cleanup 2015-06-17 09:08:02 -04:00
John
f1ffdc9a1e DANIEL: Proper toonKilledCogs method 2015-06-17 08:24:00 -04:00
John
6bfb28c36f Add tank item to cattlelog 2015-06-17 08:15:28 -04:00
John
d92c28de27 Remove single cog summon, add Field Office cog summon, add V2 invasion cog summon, add Cog name to V2 invasion bulletins. 2015-06-17 08:14:19 -04:00
John
8c47aa0fd0 Added PBN nametag font 2015-06-17 08:08:34 -04:00
John
755c9afc6a Fix house in cattlelog 2015-06-17 08:08:15 -04:00
John
0f53845b05 DANIEL: Cogdo Tasks 2015-06-17 08:07:26 -04:00
Loudrob
e702145334 DANIEL: Remove Welcome Valley '9a4af9c686edd4c45ea1ced13e72376493fe8a11' 2015-06-16 19:13:24 -04:00
John
35b646c4e6 Revert "Spring cleaning"
This reverts commit 1e4bad8c6b.
2015-06-16 20:26:44 +03:00
John Cote
1e4bad8c6b Spring cleaning 2015-06-15 20:56:12 -04:00
Zach
9033861dfb pillow gravity 2015-06-01 16:14:34 -05:00
Zach
f25ad9caf8 merge fix and my bs devs fix 2015-05-24 18:42:26 -05:00
Zach
8bf8cf5f55 GARDENING, BITCHES 2015-05-24 18:23:54 -05:00
John
9a4af9c686 Remove Welcome Valley 2015-05-24 17:21:40 +03:00
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
DenialMC
cc781f595e fuck y'all 2015-05-14 00:22:58 +03:00
DenialMC
694122266e Killed cpickle air_cancer, unused flagAv method, useless PetDCImports class (WTF!) 2015-05-13 19:54:42 +03:00
Loudrob
64aafa769c Merge branch 'master' of https://gitlab.com/ToontownUnited/src
Conflicts:
	otp/distributed/DCClassImports.py
2015-05-13 07:43:36 -04:00
Loudrob
9d54f4f88a Murdered TTI's promotion system. 2015-05-13 07:41:49 -04:00
DenialMC
509a9697e6 True Friends holocausted until I make the new system tomorrow, using the panel 2015-05-13 14:04:03 +03:00
Zach
8e8a194dfa john's emote cleanup 2015-05-12 12:47:58 -05:00
DenialMC
2d055f2dea PDB must be crucified 2015-05-11 22:58:11 +03:00
DenialMC
4be52eb5aa Skrublordism 2015-05-10 16:06:43 +03:00