Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Adds new costumes for Jeff, Chang & Leonard #1549

Merged
merged 3 commits into from

1 participant

@edisonout
Owner

Jeff - train conductor
Chang - Peggy Fleming & zombie
Leonard - paintball

@edisonout edisonout merged commit 4a407a2 into hawkthorne:master
@edisonout edisonout deleted the edisonout:dressup branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
4 src/characters/chang.json
@@ -21,7 +21,9 @@
{ "category": "s3e21", "name": "Dictator", "sheet": "dictator", "ow": 3 },
{ "category": "s4promo", "name": "Evil Chang", "sheet": "evil", "ow": 4 },
{ "category": "s2e18", "name": "Father", "sheet": "father", "ow": 5 },
- { "category": "s1e24", "name": "Safety First", "sheet": "safety", "ow": 6 }
+ { "category": "s2e6", "name": "Peggy Fleming", "sheet": "peggy", "ow": 9 },
+ { "category": "s1e24", "name": "Safety First", "sheet": "safety", "ow": 6 },
+ { "category": "s2e6", "name": "Zombie", "sheet": "zombie", "ow": 10 }
],
"name": "chang",
"offset": 8
View
1  src/characters/jeff.json
@@ -36,6 +36,7 @@
{ "category": "s1e2", "name": "Spanish 101", "sheet": "abeds_shirt", "ow": 18 },
{ "category": "s4e3", "name": "Thoraxis", "sheet": "thoraxis", "ow": 19 },
{ "category": "s3e9", "name": "Tinkletown", "sheet": "anime", "ow": 20 },
+ { "category": "s2e21", "name": "Train Conductor", "sheet": "train", "ow": 34 },
{ "category": "s3e5", "name": "Vampire", "sheet": "vampire", "ow": 22 },
{ "category": "s2e19", "name": "Vincent Vega", "sheet": "vega", "ow": 25 },
{ "category": "s2e6", "name": "Zombie", "sheet": "zombie", "ow": 21 }
View
3  src/characters/leonard.json
@@ -15,7 +15,8 @@
},
"costumes": [
{"category": "base", "name": "Leonard Rodriguez", "sheet": "base","ow": 1},
- {"category": "s3e19", "name": "Asylum", "sheet": "asylum", "ow": 2}
+ {"category": "s3e19", "name": "Asylum", "sheet": "asylum", "ow": 2},
+ {"category": "s2e24", "name": "Paintball", "sheet": "paintball", "ow": 3}
],
"name": "leonard",
"offset": 9
View
BIN  src/images/characters/chang/overworld.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/characters/chang/peggy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/characters/chang/zombie.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/characters/jeff/overworld.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/characters/jeff/train.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/characters/leonard/overworld.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/characters/leonard/paintball.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Something went wrong with that request. Please try again.