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.

Sign up for GitHub

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

fixes rocroc #101

Merged
merged 11 commits into from
Oct 13, 2023
Merged

fixes rocroc #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
740bfd0
fix rocroc
BockyBlock Oct 9, 2023
ad18215
merge wrecking's sprites, phase 1
BockyBlock Oct 9, 2023
d096aed
merge wreckings, phase 2
BockyBlock Oct 9, 2023
b79fac4
rithere and raaaaagh
BockyBlock Oct 10, 2023
c47e286
Update listofcharacter.txt
BockyBlock Oct 10, 2023
3fdb663
imagineit's sprites
BockyBlock Oct 11, 2023
16f4c89
Update listofcharacter.txt
BockyBlock Oct 11, 2023
c913c9f
get jiggy
BockyBlock Oct 11, 2023
ce3ca4f
tuft
BockyBlock Oct 12, 2023
4d09dd6
support
BockyBlock Oct 12, 2023
e063f9c
why am I doing really small pulls?
BockyBlock Oct 12, 2023
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
  •  
  •  
  •  
18 changes: 18 additions & 0 deletions data/custom/dizzyandy-sprites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,5 +529,23 @@
"3"
],
"tiling": "1"
},
{
"name": "raaagh",
"sprite": "raaagh",
"color": [
"2",
"0"
],
"tiling": "0"
},
{
"name": "glyph_scug",
"sprite": "glyph_scug",
"color": [
"0",
"3"
],
"tiling": "-1"
}
]
18 changes: 18 additions & 0 deletions data/custom/gabe-sprites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,23 @@
"3"
],
"tiling": "2"
},
{
"name": "glyph_tesho",
"sprite": "glyph_tesho",
"color": [
"2",
"4"
],
"tiling": "-1"
},
{
"name": "glyph_ryry",
"sprite": "glyph_ryry",
"color": [
"1",
"3"
],
"tiling": "-1"
}
]
24 changes: 12 additions & 12 deletions data/custom/glyph.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@
"name": "glyph_cursor",
"sprite": "glyph_cursor",
"color": [
"2",
"4"
"4",
"2"
],
"tiling": "-1"
},
Expand Down Expand Up @@ -480,8 +480,8 @@
"name": "glyph_belt",
"sprite": "glyph_belt",
"color": [
"0",
"1"
"1",
"2"
],
"tiling": "-1"
},
Expand Down Expand Up @@ -543,8 +543,8 @@
"name": "glyph_has",
"sprite": "glyph_has",
"color": [
"0",
"3"
"6",
"1"
],
"tiling": "0"
},
Expand Down Expand Up @@ -738,7 +738,7 @@
"tiling": "-1"
},
{
"name": "text_metglyph",
"name": "text_metaglyph",
"sprite": "text_meta",
"color": [
"3",
Expand All @@ -747,7 +747,7 @@
"tiling": "-1"
},
{
"name": "text_metexta",
"name": "text_metatext",
"sprite": "text_metatext",
"color": [
"4",
Expand All @@ -760,7 +760,7 @@
"sprite": "text_inscribe",
"color": [
"0",
"3"
"2"
],
"tiling": "-1"
},
Expand All @@ -778,7 +778,7 @@
"sprite": "glyph_inscribe",
"color": [
"0",
"3"
"2"
],
"tiling": "0"
},
Expand Down Expand Up @@ -847,7 +847,7 @@
},
{
"name": "glyph_color",
"sprite": "glyph_color",
"sprite": "glyph_red",
"color": [
"4",
"3"
Expand All @@ -859,7 +859,7 @@
"sprite": "glyph_select",
"color": [
"2",
"3"
"4"
],
"tiling": "-1"
}
Expand Down
20 changes: 20 additions & 0 deletions data/custom/imagineit-sprites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"name": "aaxia",
"sprite": "aaxia",
"color": [
"0",
"3"
],
"tiling": "0"
},
{
"name": "gmalls",
"sprite": "gmalls",
"color": [
"2",
"2"
],
"tiling": "2"
}
]
45 changes: 36 additions & 9 deletions data/custom/misc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,15 +1439,6 @@
],
"tiling": "0"
},
{
"name": "ifif",
"sprite": "ifif",
"color": [
"6",
"3"
],
"tiling": "2"
},
{
"name": "atat",
"sprite": "atat",
Expand Down Expand Up @@ -1762,5 +1753,41 @@
"2",
"4"
]
},
{
"name": "rithere",
"sprite": "rithere",
"color": [
"3",
"1"
],
"tiling": "2"
},
{
"name": "waterwraith",
"sprite": "waterwraith",
"color": [
"0",
"4"
],
"tiling": "0"
},
{
"name": "tuft",
"sprite": "grass_strand",
"color": [
"5",
"0"
],
"tiling": "-1"
},
{
"name": "support",
"sprite": "support",
"color": [
"0",
"1"
],
"tiling": "-1"
}
]
74 changes: 74 additions & 0 deletions data/custom/pmr-sprites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[
{
"name": "ifif",
"sprite": "ifif",
"color": [
"6",
"3"
],
"tiling": "2"
},
{
"name": "corner",
"sprite": "corner",
"color": [
"2",
"3"
],
"tiling": "0"
},
{
"name": "dart",
"sprite": "dart",
"color": [
"1",
"2"
],
"tiling": "0"
},
{
"name": "oval",
"sprite": "oval",
"color": [
"6",
"2"
],
"tiling": "-1"
},
{
"name": "recta",
"sprite": "recta",
"color": [
"5",
"1"
],
"tiling": "-1"
},
{
"name": "rhombus",
"sprite": "rhombus",
"color": [
"4",
"3"
],
"tiling": "-1"
},
{
"name": "semi",
"sprite": "semi",
"color": [
"3",
"0"
],
"tiling": "-1"
},
{
"name": "quatre",
"sprite": "quatre",
"color": [
"4",
"4"
],
"tiling": "-1"
}
]
11 changes: 10 additions & 1 deletion data/custom/theopold-sprites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@
"sprite": "gogo",
"color": [
"5",
"0"
"1"
],
"tiling": "2"
},
Expand Down Expand Up @@ -1456,5 +1456,14 @@
"0"
],
"tiling": "-1"
},
{
"name": "weiun",
"sprite": "weiun",
"color": [
"5",
"0"
],
"tiling": "0"
}
]
30 changes: 1 addition & 29 deletions data/custom/wreckinggames-sprites.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1 @@
[
{
"name": "switch",
"sprite": "switch",
"tiling": "0",
"color": [
"0",
"3"
]
},
{
"name": "text_switch",
"sprite": "text_switch",
"tiling": "0",
"color": [
"0",
"3"
]
},
{
"name": "color",
"sprite": "color",
"tiling": "2",
"color": [
"4",
"3"
]
}
]
[]
Loading