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

[GiantDays] Character overlay tiles (rebased) #2147

Closed
wants to merge 9 commits into from
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions gfx/GiantDays/pngs_items_20x20/wearables/head/balclava.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"id": [
"balclava",
"mask_ski",
"mask_ski_loose",
"thermal_mask",
"thermal_mask_on",
"bondage_mask"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"id": [
"goggles_welding",
"survivor_goggles",
"iggaak"
"survivor_goggles"
],
"fg": "goggles_welding"
}
Binary file modified gfx/GiantDays/pngs_items_20x20/wearables/head/hat_knit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions gfx/GiantDays/pngs_items_20x20/wearables/head/mask_ski.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"mask_ski",
"mask_ski_loose"
],
"fg": "mask_ski"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"id": [
"straw_hat",
"hat_sombrero",
"straw_fedora"
],
"fg": "straw_hat"
Expand Down
Binary file modified gfx/GiantDays/pngs_items_20x20/wearables/torso/dinosuit.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 not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[
{
"id": [
"overlay_mutation_hair_black_fro",
"overlay_mutation_fro_var_black"
],
"fg": "overlay_mutation_hair_black_fro"
},
{
"id": [
"overlay_mutation_hair_black_long",
"overlay_mutation_long_var_black"
],
"fg": "overlay_mutation_hair_black_long"
},
{
"id": [
"overlay_mutation_hair_black_medium",
"overlay_mutation_medium_var_black"
],
"fg": "overlay_mutation_hair_black_medium"
},
{
"id": [
"overlay_mutation_hair_black_mohawk",
"overlay_mutation_mohawk_var_black"
],
"fg": "overlay_mutation_hair_black_mohawk"
},
{
"id": [
"overlay_mutation_hair_black_short",
"overlay_mutation_short_var_black"
],
"fg": "overlay_mutation_hair_black_short"
},
{
"id": [
"overlay_mutation_hair_black_long_over_eye",
"overlay_mutation_long_over_eye_var_black"
],
"fg": "overlay_mutation_long_over_eye_var_black"
},
{
"id": [
"overlay_mutation_hair_black_messy",
"overlay_mutation_messy_var_black"
],
"fg": "overlay_mutation_messy_var_black"
},
{
"id": [
"overlay_mutation_hair_black_mullet",
"overlay_mutation_mullet_var_black"
],
"fg": "overlay_mutation_mullet_var_black"
},
{
"id": [
"overlay_mutation_hair_black_ponytail",
"overlay_mutation_ponytail_var_black"
],
"fg": "overlay_mutation_ponytail_var_black"
},
{
"id": [
"overlay_mutation_hair_black_short_no_fringe",
"overlay_mutation_short_no_fringe_var_black"
],
"fg": "overlay_mutation_short_no_fringe_var_black"
},
{
"id": [
"overlay_mutation_hair_black_short_over_eye",
"overlay_mutation_short_over_eye_var_black"
],
"fg": "overlay_mutation_short_over_eye_var_black"
}
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[
{
"id": [
"overlay_mutation_hair_blond_fro",
"overlay_mutation_fro_var_blond"
],
"fg": "overlay_mutation_hair_blond_fro"
},
{
"id": [
"overlay_mutation_hair_blond_long",
"overlay_mutation_long_var_blond"
],
"fg": "overlay_mutation_hair_blond_long"
},
{
"id": [
"overlay_mutation_hair_blond_medium",
"overlay_mutation_medium_var_blond"
],
"fg": "overlay_mutation_hair_blond_medium"
},
{
"id": [
"overlay_mutation_hair_blond_mohawk",
"overlay_mutation_mohawk_var_blond"
],
"fg": "overlay_mutation_hair_blond_mohawk"
},
{
"id": [
"overlay_mutation_hair_blond_short",
"overlay_mutation_short_var_blond"
],
"fg": "overlay_mutation_hair_blond_short"
},
{
"id": [
"overlay_mutation_hair_blond_long_over_eye",
"overlay_mutation_long_over_eye_var_blond"
],
"fg": "overlay_mutation_long_over_eye_var_blond"
},
{
"id": [
"overlay_mutation_hair_blond_messy",
"overlay_mutation_messy_var_blond"
],
"fg": "overlay_mutation_messy_var_blond"
},
{
"id": [
"overlay_mutation_hair_blond_mullet",
"overlay_mutation_mullet_var_blond"
],
"fg": "overlay_mutation_mullet_var_blond"
},
{
"id": [
"overlay_mutation_hair_blond_ponytail",
"overlay_mutation_ponytail_var_blond"
],
"fg": "overlay_mutation_ponytail_var_blond"
},
{
"id": [
"overlay_mutation_hair_blond_short_no_fringe",
"overlay_mutation_short_no_fringe_var_blond"
],
"fg": "overlay_mutation_short_no_fringe_var_blond"
},
{
"id": [
"overlay_mutation_hair_blond_short_over_eye",
"overlay_mutation_short_over_eye_var_blond"
],
"fg": "overlay_mutation_short_over_eye_var_blond"
}
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[
{
"id": [
"overlay_mutation_hair_blue_fro",
"overlay_mutation_fro_var_blue"
],
"fg": "overlay_mutation_hair_blue_fro"
},
{
"id": [
"overlay_mutation_hair_blue_long",
"overlay_mutation_long_var_blue"
],
"fg": "overlay_mutation_hair_blue_long"
},
{
"id": [
"overlay_mutation_hair_blue_medium",
"overlay_mutation_medium_var_blue"
],
"fg": "overlay_mutation_hair_blue_medium"
},
{
"id": [
"overlay_mutation_hair_blue_mohawk",
"overlay_mutation_mohawk_var_blue"
],
"fg": "overlay_mutation_hair_blue_mohawk"
},
{
"id": [
"overlay_mutation_hair_blue_short",
"overlay_mutation_short_var_blue"
],
"fg": "overlay_mutation_hair_blue_short"
},
{
"id": [
"overlay_mutation_hair_blue_long_over_eye",
"overlay_mutation_long_over_eye_var_blue"
],
"fg": "overlay_mutation_long_over_eye_var_blue"
},
{
"id": [
"overlay_mutation_hair_blue_messy",
"overlay_mutation_messy_var_blue"
],
"fg": "overlay_mutation_messy_var_blue"
},
{
"id": [
"overlay_mutation_hair_blue_mullet",
"overlay_mutation_mullet_var_blue"
],
"fg": "overlay_mutation_mullet_var_blue"
},
{
"id": [
"overlay_mutation_hair_blue_ponytail",
"overlay_mutation_ponytail_var_blue"
],
"fg": "overlay_mutation_ponytail_var_blue"
},
{
"id": [
"overlay_mutation_hair_blue_short_no_fringe",
"overlay_mutation_short_no_fringe_var_blue"
],
"fg": "overlay_mutation_short_no_fringe_var_blue"
},
{
"id": [
"overlay_mutation_hair_blue_short_over_eye",
"overlay_mutation_short_over_eye_var_blue"
],
"fg": "overlay_mutation_short_over_eye_var_blue"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
[
{
"id": [
"overlay_mutation_hair_brown_fro",
"overlay_mutation_fro_var_brown"
],
"fg": "overlay_mutation_hair_brown_fro"
},
{
"id": [
"overlay_mutation_hair_brown_long",
"overlay_mutation_long_var_brown"
],
"fg": "overlay_mutation_hair_brown_long"
},
{
"id": [
"overlay_mutation_hair_brown_medium",
"overlay_mutation_medium_var_brown"
],
"fg": "overlay_mutation_hair_brown_medium"
},
{
"id": [
"overlay_mutation_hair_brown_mohawk",
"overlay_mutation_mohawk_var_brown"
],
"fg": "overlay_mutation_hair_brown_mohawk"
},
{
"id": [
"overlay_mutation_hair_brown_short",
"overlay_mutation_short_var_brown"
],
"fg": "overlay_mutation_hair_brown_short"
},
{
"id": [
"overlay_mutation_hair_brown_long_over_eye",
"overlay_mutation_long_over_eye_var_brown"
],
"fg": "overlay_mutation_long_over_eye_var_brown"
},
{
"id": [
"overlay_mutation_hair_brown_messy",
"overlay_mutation_messy_var_brown"
],
"fg": "overlay_mutation_messy_var_brown"
},
{
"id": [
"overlay_mutation_hair_brown_mullet",
"overlay_mutation_mullet_var_brown"
],
"fg": "overlay_mutation_mullet_var_brown"
},
{
"id": [
"overlay_mutation_hair_brown_ponytail",
"overlay_mutation_ponytail_var_brown"
],
"fg": "overlay_mutation_ponytail_var_brown"
},
{
"id": [
"overlay_mutation_hair_brown_short_no_fringe",
"overlay_mutation_short_no_fringe_var_brown"
],
"fg": "overlay_mutation_short_no_fringe_var_brown"
},
{
"id": [
"overlay_mutation_hair_brown_short_over_eye",
"overlay_mutation_short_over_eye_var_brown"
],
"fg": "overlay_mutation_short_over_eye_var_brown"
}
]
Loading
Loading