Skip to content

Commit

Permalink
Merge branch 'issue-88-map-additional-child-assets' into issue-141-ad…
Browse files Browse the repository at this point in the history
…ded-lpc-revised-shirts
  • Loading branch information
jrconway3 committed May 26, 2024
2 parents b13ec08 + 43b8e1c commit 61533a0
Show file tree
Hide file tree
Showing 301 changed files with 52 additions and 52 deletions.
60 changes: 30 additions & 30 deletions index.html

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions sheet_definitions/hair_xlong_ponytail.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
"type_name": "hair",
"layer_1": {
"zPos": 120,
"male": "hair/xlong_ponytail/adult_front/",
"muscular": "hair/xlong_ponytail/adult_front/",
"female": "hair/xlong_ponytail/adult_front/",
"pregnant": "hair/xlong_ponytail/adult_front/",
"teen": "hair/xlong_ponytail/adult_front/",
"child": "hair/xlong_ponytail/child_front/"
"male": "hair/xlong_ponytail/adult/mg/",
"muscular": "hair/xlong_ponytail/adult/mg/",
"female": "hair/xlong_ponytail/adult/mg/",
"pregnant": "hair/xlong_ponytail/adult/mg/",
"teen": "hair/xlong_ponytail/adult/mg/",
"child": "hair/xlong_ponytail/child/mg/"
},
"layer_2": {
"zPos": 9,
"male": "hair/xlong_ponytail/adult_back/",
"muscular": "hair/xlong_ponytail/adult_back/",
"female": "hair/xlong_ponytail/adult_back/",
"pregnant": "hair/xlong_ponytail/adult_back/",
"teen": "hair/xlong_ponytail/adult_back/",
"child": "hair/xlong_ponytail/child_back/"
"male": "hair/xlong_ponytail/adult/bg/",
"muscular": "hair/xlong_ponytail/adult/bg/",
"female": "hair/xlong_ponytail/adult/bg/",
"pregnant": "hair/xlong_ponytail/adult/bg/",
"teen": "hair/xlong_ponytail/adult/bg/",
"child": "hair/xlong_ponytail/child/bg/"
},
"layer_3": {
"zPos": 145,
"male": "hair/xlong_ponytail/adult_top/",
"muscular": "hair/xlong_ponytail/adult_top/",
"female": "hair/xlong_ponytail/adult_top/",
"pregnant": "hair/xlong_ponytail/adult_top/",
"teen": "hair/xlong_ponytail/adult_top/",
"child": "hair/xlong_ponytail/child_top/"
"male": "hair/xlong_ponytail/adult/fg/",
"muscular": "hair/xlong_ponytail/adult/fg/",
"female": "hair/xlong_ponytail/adult/fg/",
"pregnant": "hair/xlong_ponytail/adult/fg/",
"teen": "hair/xlong_ponytail/adult/fg/",
"child": "hair/xlong_ponytail/child/fg/"
},
"variants": [
"blonde",
Expand Down Expand Up @@ -72,7 +72,7 @@
"climb",
"combat",
"1h_slash",
"1h_backslash",
"1h/bgslash",
"1h_halfslash"
]
}
6 changes: 3 additions & 3 deletions source_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h3>Body</h3>
<!-- Body types -->
<span class="expanded">Body type</span>
<ul style="display:block;">
<li class="noPreview" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering,idle,jump,run,sit,climb,combat,1h_slash,1h_backslash,1h_halfslash">
<li class="noPreview">
<input type="radio" id="sex-male" name="sex" checked>
<label for="sex-male">Male</label>
</li>
Expand All @@ -143,11 +143,11 @@ <h3>Body</h3>
<input type="radio" id="sex-child" name="sex">
<label for="sex-child">Child</label>
</li>
<li class="noPreview" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering">
<li class="noPreview" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering,climb,idle,combat,jump,run">
<input type="radio" id="sex-pregnant" name="sex">
<label for="sex-pregnant">Pregnant</label>
</li>
<li class="noPreview" data-animations="spellcast,thrust,walk,slash,hurt,watering,climb,idle,combat,jump,">
<li class="noPreview" data-animations="spellcast,thrust,walk,slash,hurt,watering,climb,idle,combat,jump">
<input type="radio" id="sex-muscular" name="sex">
<label for="sex-muscular">Muscular</label>
</li>
Expand Down
Binary file added spritesheets/body/bodies/child.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 spritesheets/body/bodies/female.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 spritesheets/body/bodies/male.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 spritesheets/body/bodies/male/amber.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 spritesheets/body/bodies/male/black.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 spritesheets/body/bodies/male/blue.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 spritesheets/body/bodies/male/bright_green.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 spritesheets/body/bodies/male/bronze.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 spritesheets/body/bodies/male/brown.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 spritesheets/body/bodies/male/dark_green.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 spritesheets/body/bodies/male/fur_black.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 spritesheets/body/bodies/male/fur_brown.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 spritesheets/body/bodies/male/fur_copper.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 spritesheets/body/bodies/male/fur_gold.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 spritesheets/body/bodies/male/fur_grey.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 spritesheets/body/bodies/male/fur_tan.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 spritesheets/body/bodies/male/fur_white.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 spritesheets/body/bodies/male/green.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 spritesheets/body/bodies/male/lavender.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 spritesheets/body/bodies/male/light.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 spritesheets/body/bodies/male/olive.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 spritesheets/body/bodies/male/pale_green.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 spritesheets/body/bodies/male/taupe.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 spritesheets/body/bodies/male/zombie.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 spritesheets/body/bodies/male/zombie_green.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 spritesheets/body/bodies/muscular.png
Binary file added spritesheets/body/bodies/pregnant.png
Binary file added spritesheets/body/bodies/teen.png
Binary file modified spritesheets/hair/tied_back/child.png
Binary file modified spritesheets/hair/tied_back/child/ash.png
Binary file modified spritesheets/hair/tied_back/child/black.png
Binary file modified spritesheets/hair/tied_back/child/blonde.png
Binary file modified spritesheets/hair/tied_back/child/blue.png
Binary file modified spritesheets/hair/tied_back/child/carrot.png
Binary file modified spritesheets/hair/tied_back/child/chestnut.png
Binary file modified spritesheets/hair/tied_back/child/dark_brown.png
Binary file modified spritesheets/hair/tied_back/child/dark_gray.png
Binary file modified spritesheets/hair/tied_back/child/ginger.png
Binary file modified spritesheets/hair/tied_back/child/gold.png
Binary file modified spritesheets/hair/tied_back/child/gray.png
Binary file modified spritesheets/hair/tied_back/child/green.png
Binary file modified spritesheets/hair/tied_back/child/light_brown.png
Binary file modified spritesheets/hair/tied_back/child/navy.png
Binary file modified spritesheets/hair/tied_back/child/orange.png
Binary file modified spritesheets/hair/tied_back/child/pink.png
Binary file modified spritesheets/hair/tied_back/child/platinum.png
Binary file modified spritesheets/hair/tied_back/child/purple.png
Binary file modified spritesheets/hair/tied_back/child/raven.png
Binary file modified spritesheets/hair/tied_back/child/red.png
Binary file modified spritesheets/hair/tied_back/child/redhead.png
Binary file modified spritesheets/hair/tied_back/child/rose.png
Binary file modified spritesheets/hair/tied_back/child/sandy.png
Binary file modified spritesheets/hair/tied_back/child/strawberry.png
Binary file modified spritesheets/hair/tied_back/child/violet.png
Binary file modified spritesheets/hair/tied_back/child/white.png
Binary file added spritesheets/hair/xlong_ponytail/child/bg.png
Binary file added spritesheets/hair/xlong_ponytail/child/bg/ash.png
Binary file added spritesheets/hair/xlong_ponytail/child/bg/red.png
Binary file added spritesheets/hair/xlong_ponytail/child/fg.png
Binary file added spritesheets/hair/xlong_ponytail/child/fg/ash.png
Binary file added spritesheets/hair/xlong_ponytail/child/mg.png
Binary file added spritesheets/hair/xlong_ponytail/child/mg/red.png
Binary file removed spritesheets/hair/xlong_ponytail/child_back.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/ash.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/blue.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/gold.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/gray.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/navy.png
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/pink.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/red.png
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_back/rose.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_front.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_front/ash.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_front/red.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/ash.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/gold.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/gray.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/green.png
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/navy.png
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/pink.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/raven.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/red.png
Diff not rendered.
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/rose.png
Diff not rendered.
Binary file removed spritesheets/hair/xlong_ponytail/child_top/sandy.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 61533a0

Please sign in to comment.