From 06181378ef2b306407c7182d3377d39672bc86db Mon Sep 17 00:00:00 2001 From: John Cote Date: Wed, 24 Jun 2015 15:35:03 -0400 Subject: [PATCH 1/4] Fix Make-A-Toon --- toontown/makeatoon/MakeAToon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toontown/makeatoon/MakeAToon.py b/toontown/makeatoon/MakeAToon.py index 832448a4..8ed43523 100755 --- a/toontown/makeatoon/MakeAToon.py +++ b/toontown/makeatoon/MakeAToon.py @@ -66,7 +66,7 @@ class MakeAToon(StateData.StateData): self.bs = BodyShop.BodyShop('BodyShop-done') self.cos = ColorShop.ColorShop('ColorShop-done') self.cls = MakeClothesGUI.MakeClothesGUI('ClothesShop-done') - self.ns = NameShop.NameShop(self, 'NameShop-done', avList, index, True) + self.ns = NameShop.NameShop(self, 'NameShop-done', avList, index) self.shop = GENDERSHOP self.shopsVisited = [] if self.warp: From 477fe900e9319a06f39b5bf9b51ab47e70116418 Mon Sep 17 00:00:00 2001 From: Master Voltage Date: Wed, 24 Jun 2015 17:16:05 -0400 Subject: [PATCH 2/4] Update README.md don't fork --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 7dac475b..af803074 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ The source code for Toontown Stride. ### Info -* It is recommended that you make all of your changes in a fork before committing. * Do not erase or revert another person's commit without first consulting them. * Only push to this repository. -* Never force a git push. \ No newline at end of file +* Never force a git push. From e331969f740a5d3d8b792d211ff219787d6a8050 Mon Sep 17 00:00:00 2001 From: Master Voltage Date: Wed, 24 Jun 2015 17:16:51 -0400 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af803074..257633c0 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,5 @@ The source code for Toontown Stride. ### Info * Do not erase or revert another person's commit without first consulting them. -* Only push to this repository. +* Only push to this repository for Toontown Stride source code. * Never force a git push. From b21a3e22c96ef4660087578fb56f8a90360c2287 Mon Sep 17 00:00:00 2001 From: John Cote Date: Wed, 24 Jun 2015 17:52:14 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 257633c0..1b5e34b1 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,5 @@ The source code for Toontown Stride. * Do not erase or revert another person's commit without first consulting them. * Only push to this repository for Toontown Stride source code. +* Bigger commits should be done in a seperate branch then merged to master after tested. * Never force a git push.