Commit graph

164 commits

Author SHA1 Message Date
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
0d3f31971e X on order + mailbox sync + grammar 2015-07-17 15:29:08 +03:00
John
61705bbf20 Gifting update!!! 2015-07-17 14:50:16 +03:00
Loudrob
ae40f21034 Better phone scale. 2015-07-16 09:26:34 -04:00
Loudrob
4e8fb45531 Current progress on gifting. 2015-07-12 15:42:55 -04:00
John
6d1cf1ae43 Video player! 2015-07-08 15:30:25 +03:00
John
02fb386ed5 Fix a few bugs - jukebox's still broken 2015-07-07 13:37:24 +03:00
John Cote
568a076266 Deprecate has_key and fix bugs 2015-07-05 21:53:42 -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
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
John
2b02385e51 Swim run SFX 2015-07-01 15:12:45 +03:00
John
e24791c307 Water color is dependent on water depth 2015-07-01 14:49:07 +03:00
John
be683c8fb0 Merge branch 'news' 2015-06-30 22:07:08 +03:00
John
ab10d5f05f Swim Sound implemented 2015-06-27 18:14:04 +03:00
Loudrob
6eaaed8056 Another fix and Dan's nametag scaling. 2015-06-26 09:19:43 -04:00
John Cote
48539188de Some final nametag shit 2015-06-26 03:09:27 -04:00
John Cote
dd45d7d7be YET MORE WORK. ALMOST DONE. 2015-06-25 23:33:15 -04:00
John Cote
5cc0d8f27a More nametag translation 2015-06-25 22:59:13 -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
Loudrob
3c80ecc367 卐 House Door Flickering Fix 卐 2015-06-18 15:24:21 -04:00
John
9804328571 Fix building flickering 2015-06-18 21:22:54 +03:00
John
7a9da93d39 DANIEL: Crash fixes 2015-06-17 09:47:43 -04:00
John
3e97752dff DANIEL: Nametag color shit 2015-06-17 09:25:20 -04:00
John
7c0ba851c7 Proper TV 2015-06-17 09:19:53 -04:00
John
338d83a907 DANIEL: Friends cleanup 2015-06-17 09:10:17 -04:00
John
1b2c00f7a1 DANIEL: Beginning of chat stuff 2015-06-17 08:45:55 -04:00
John
3dd1d05573 Fixed phone sphere entering 2015-06-17 08:13:25 -04:00
John
755c9afc6a Fix house in cattlelog 2015-06-17 08:08:15 -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
Loudrob
5983452347 Better fix. 2015-06-11 15:47:45 -04:00
Loudrob
210a8f012e Toons can't destroy other toon's money. 2015-06-11 15:23:44 -04:00
Loudrob
5101a94e5a GARDENS: Needs to get done. 2015-06-11 13:48:13 -04:00
Loudrob
b29da23a0a Revert "John L: GardenGlobals edit"
This reverts commit 9050b1abff.
2015-06-11 13:08:24 -04:00
John Cote
9050b1abff John L: GardenGlobals edit 2015-06-04 15:33:27 -04:00
John Cote
bf006b5617 bool for garden game k 2015-05-25 15:27:34 -04:00
Master Voltage
b8b9891c1e disabled garden drop k 2015-05-25 14:03:51 -04:00
Zach
023cbc6acb jukebox at estate 2015-05-25 05:17:14 -05:00
Zach
0f622cfe27 fixed bug 2015-05-24 18:56:45 -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
Master Jumblespeed
d882959bfa switch to remote 2015-05-18 22:11:33 -04:00
Master Voltage
2dfc68ed8b Revert "Zach stop breaking shit too k"
This reverts commit 7fa0bf6d73.
2015-05-14 16:13:41 -04:00
Master Voltage
7fa0bf6d73 Zach stop breaking shit too k 2015-05-14 16:12:19 -04:00
DenialMC
f784a15e1d You no longer need to wait any days to buy the items in the special menu.. and Loud, we start with 10000 beans not 15000!! 2015-05-14 20:34:00 +03:00
DenialMC
db9dacb624 Import cleanup 2015-05-13 20:02:48 +03:00
Zach
2400f44ff8 oops. now its done 2015-05-12 15:58:12 -05:00
Zach
ab3876ff0d DistributedGardenAI is done 2015-05-12 15:52:38 -05:00
Zach
37fad887da fixed the fish sale at estate 2015-05-12 14:46:35 -05:00
Zach
37097d0645 Revert "treasurechest timing"
This reverts commit e7d32197b9.
2015-05-12 13:30:10 -05:00
Zach
e7d32197b9 treasurechest timing 2015-05-12 12:42:20 -05:00
John Cote
7a5bd20859 Correct Treasure Chest H and collision tube. 2015-05-11 18:16:12 -04:00
DenialMC
989f3f89ef Revert "Correct Treasure Chest H"
This reverts commit e845fea8fa.
2015-05-11 23:45:16 +03:00
DenialMC
e845fea8fa Correct Treasure Chest H 2015-05-11 23:43:14 +03:00
John Cote
267310adc7 File cleanup and some fixes. 2015-05-11 15:05:59 -04:00
DenialMC
3e61bc9501 Treasure Chest is now destroyed properly 2015-05-11 19:18:42 +03:00
DenialMC
afdd660152 Better position for treasure chest 2015-05-11 18:11:35 +03:00
DenialMC
ef2ccf2bfe Base Treasure Chest (no rental yet) 2015-05-11 17:54:45 +03:00
Loudrob
4ad535659f Increased items on-order limit. 2015-05-10 15:19:56 -04:00
DenialMC
36400d6e51 Rename config options, enable photo game, enable game tables, remove config options for live updates, long pattern games, resistance disables, enable estate day night, remove election leftovers, remove goonsEnabled leftovers, shorten estate nights, remove Dance resistance message. 2015-05-10 15:31:46 +03:00
Zach
55d06848e6 gardening AIs again 2015-05-10 07:10:32 -05:00
Zach
ec9072a0f9 more gardening AIs 2015-05-10 07:00:38 -05:00
Zach
c1a45bcb06 gardening AIs 2015-05-10 06:47:03 -05:00
John Cote
ab3072fb84 Pets will work in battle now. 2015-05-09 02:21:07 -04:00
Loudrob
8c7498d548 Merge branch 'rental-items'
Conflicts:
	config/release/dev.prc
	otp/distributed/DCClassImports.py
	toontown/estate/DistributedEstateAI.py
2015-05-03 09:10:19 -04:00
John Cote
38dfc863af so many spaces ugh 2015-04-30 20:10:54 -04:00
Loudrob
21e1d98e76 Garden Game Widescreen. 2015-04-30 18:59:22 -04:00
Loudrob
2a429014b4 Someone else work on this fugly dna shit in OZHoodAI 2015-04-29 18:22:38 -04:00
Loudrob
abccde1cfb Began work. 2015-04-29 07:48:29 -04:00
John Cote
4be89cbfb3 Cleanup toontown/estate 2015-04-29 04:12:56 -04:00
DenialMC
b2bab83cbb So much Jizzney removing that Hitler toke his life 2015-04-25 10:26:27 +03:00
DenialMC
1ff86c076d Start on Fish Bingo 2015-04-19 02:01:14 +03:00
Loudrob
1ceab36e9b fix daniels bank gui 2015-04-10 07:50:25 -04:00
DenialMC
168ae65d1e Animated Props client 2015-04-09 20:17:24 +03:00
DenialMC
78ab9750d9 Random stuff 2015-04-09 16:46:52 +03:00
John
7b3ded4f3f April Toons Week (doodles talk, low gravity in Estate, speedchat menu) added! 2015-04-09 14:05:29 +03:00
DenialMC
71f72ef913 Um why did I do this? 2015-04-08 15:35:45 +03:00
DenialMC
5d875cb022 Exponential increase for Bank GUI 2015-04-08 15:34:13 +03:00
DenialMC
4ef9b360bd Dumm dumm dumm.. the Bank Update 2015-04-08 14:51:59 +03:00
DenialMC
d36f957694 TutorialForceAcknowledge, DownloadForceAcknowledge and the huge launcher is exterminated. 2015-04-08 11:56:49 +03:00
DenialMC
45b9e2972b isPaid and getGameAccess holocausted 2015-04-08 00:15:58 +03:00
DenialMC
04233eb9f3 Revert "Holocausted Welcome Valley"
This reverts commit ad91b21823.
2015-04-07 17:19:50 +03:00
DenialMC
ad91b21823 Holocausted Welcome Valley 2015-04-07 16:30:49 +03:00
Loudrob
bae578b5d7 Time to start over boys!!!!! 2015-04-06 18:53:47 -04:00
Loudrob
eeacd947b8 ass 2015-04-06 18:32:39 -04:00
Loudrob
5c3ae8a0ba Revert "daniel and loud, look at the current error"
This reverts commit bf46f64382.
2015-04-06 18:20:07 -04:00
Loudrob
10da5ad398 Revert "trees and boxes"
This reverts commit 9ea697b1cb.
2015-04-06 18:19:51 -04:00
DenialMC
11913788e9 Holocaust - prepare for chat update 2015-04-06 12:32:54 +03:00
DenialMC
b4af78209c Add Laughing Man holiday end (everybody loses their head), add Laughing Man to DNA instead of explicitly showing it, add ~dna laughingman [0/1] 2015-04-04 12:50:42 +03:00
Daniel
f38f910638 Upstream update 2015-03-29 18:41:02 +03:00
Loudrob
64845859ff Began work on emblem items, we don't really need these urgently. 2015-03-29 09:06:13 -04:00
Loudrob
4855f1c3b9 Rental items 95% done. 2015-03-23 16:28:42 -04:00
Loudrob
0f24fb0ffd RENTALS: Began work on rentals. 2015-03-23 08:56:48 -04:00
loblao
e06dde7709 DNA: Finish C++ reader implementation 2015-03-15 13:26:22 -03:00
Loudrob
b3fd5e37ae 95% Done implementing C++ DNA Reader 2015-03-14 19:23:50 -04:00
Zach
9ea697b1cb trees and boxes 2015-03-13 18:52:45 -05:00