Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds 4 new costumes & fixes Pierce's canoe costume. #1204

Merged
merged 1 commit into from
Apr 5, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/characters/britta.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ return {
{name='Britta Perry', sheet='base', category='base' },
{name='Astronaut', sheet='astronaut', category='s2e4' },
{name='Asylum', sheet='asylum', category='s3e19' },
{name='Brittabot', sheet='brittabot', category='s2e11' },
{name='Brittasaurus Rex', sheet='dragon', category='s2e6' },
-- {name='Cheerleader', sheet='cheer', category='s1e13' },
{name='Darkest Timeline', sheet='dark', category='s3e4' },
{name='German Dirndl', sheet='german', category='s4e4' },
-- {name='Goth Assistant', sheet='goth', category='s3e21' },
{name='Kool Kat', sheet='cool', category='s2e13' },
{name='Me So Christmas', sheet='king', category='s3e10' },
Expand Down
5 changes: 3 additions & 2 deletions src/characters/shirley.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ return {
{name='Darkest Timeline', sheet='dark', category='s3e4' },
{name='Harry Potter', sheet='potter', category='s1e7' },
-- {name='Jules Winnfield', sheet='jules', category='s2e19' }
-- {name='Not Miss Piggy', sheet='glenda', category='s2e6' }
{name='Princess Leia', sheet='leia', category='s4e2' }
{name='Not Miss Piggy (Glinda)', sheet='glinda', category='s2e6' },
{name='Princess Leia', sheet='leia', category='s4e2' },
{name='Zombie', sheet='zombie', category='s2e6' }
}
}
Binary file added src/images/characters/britta/brittabot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/characters/britta/german.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/characters/pierce/canoe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/characters/shirley/glinda.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/characters/shirley/zombie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.