Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yanorei32/yr32-skinbuilder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.6.0
Choose a base ref
...
head repository: yanorei32/yr32-skinbuilder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
3 contributors
Loading
6 changes: 3 additions & 3 deletions .github/workflows/actionlint.yml
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ on:
jobs:
actionlint:
name: actionlint with reviewdog
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: actionlint
uses: reviewdog/action-actionlint@v1.27.0
uses: reviewdog/action-actionlint@v1.65.2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-review
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@ on:
jobs:
build:
name: build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- uses: FedericoCarboni/setup-ffmpeg@v1
- uses: FedericoCarboni/setup-ffmpeg@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}

18 changes: 8 additions & 10 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ on:
jobs:
build:
name: build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- uses: FedericoCarboni/setup-ffmpeg@v1
- uses: FedericoCarboni/setup-ffmpeg@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}

@@ -34,19 +34,17 @@ jobs:
STYLE=number ./build.sh
- name: pre-release
uses: "marvinpinto/action-automatic-releases@latest"
uses: softprops/action-gh-release@v2.2.1
if: "! startsWith(github.ref, 'refs/tags/')"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest"
tag_name: "latest"
prerelease: true
title: "Development Build"
name: "Development Build"
files: "*.osk"

- name: tagged-release
uses: "marvinpinto/action-automatic-releases@latest"
uses: softprops/action-gh-release@v2.2.1
if: startsWith(github.ref, 'refs/tags/')
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: "*.osk"

4 changes: 2 additions & 2 deletions .github/workflows/shellcheck_commit.yml
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ on:
jobs:
shellcheck:
name: runner / shellcheck
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: shellcheck
uses: reviewdog/action-shellcheck@v1
with:
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck_pullreq.yml
View file
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ on: [pull_request]
jobs:
shellcheck:
name: runner / shellcheck
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: shellcheck
uses: reviewdog/action-shellcheck@v1
with:
6 changes: 3 additions & 3 deletions .github/workflows/validate-renovate.yml
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ on:

jobs:
validate-renovate:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-node@v4

- name: install
run: |
4 changes: 1 addition & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yr32's osu! skin

![Build](https://img.shields.io/github/workflow/status/yanorei32/yr32-skinbuilder/release?logo=github&style=for-the-badge)
![Build](https://img.shields.io/github/actions/workflow/status/yanorei32/yr32-skinbuilder/release.yml?branch=master&style=for-the-badge&logo=github)
![License](https://img.shields.io/github/license/yanorei32/yr32-skinbuilder.svg?style=for-the-badge&color=blue)
![Top Language](https://img.shields.io/github/languages/top/yanorei32/yr32-skinbuilder.svg?style=for-the-badge)

@@ -29,7 +29,6 @@ https://github.com/yanorei32/yr32-skinbuilder/releases

| Key | Value |
|:-------------------------------------------------------|:------|
| Graphics/DETAIL SETTINGS/Hit lighting | false |
| Gameplay/GENERAL/Background dim | 90% + |
| Gameplay/GENERAL/Dont't change dim level during breaks | true |
| Skin/SKIN/Ignore all beatmap skins | true |
@@ -39,7 +38,6 @@ https://github.com/yanorei32/yr32-skinbuilder/releases

| Key | Value |
|:-------------------------------------------------------------|:------|
| Gameplay/General/Hit lighting | false |
| Gameplay/Beatmap/Beatmap skins | false |
| Gameplay/Beatmap/Beatmap colours | false |
| Gameplay/Beatmap/Beatmap hitsounds | false |
35 changes: 25 additions & 10 deletions build.sh
View file
Original file line number Diff line number Diff line change
@@ -51,15 +51,15 @@ cd "${DIR}/workdir"

if [[ "${STYLE}" == "number" ]]; then
# depName=rsms/inter
INTER_VERSION="v3.19"
INTER_VERSION="v4.1"
PURE_INTER_VERSION="${INTER_VERSION:1}"

if [[ ! -e "Inter-$PURE_INTER_VERSION.zip" ]]; then
curl -L -f -s \
--output "Inter-$PURE_INTER_VERSION.zip" \
https://github.com/rsms/inter/releases/download/$INTER_VERSION/Inter-$PURE_INTER_VERSION.zip
"https://github.com/rsms/inter/releases/download/$INTER_VERSION/Inter-$PURE_INTER_VERSION.zip"

unzip -p Inter-$PURE_INTER_VERSION.zip "Inter Desktop/Inter-Medium.otf" > Inter-Medium.otf
unzip -p "Inter-$PURE_INTER_VERSION.zip" "extras/otf/InterDisplay-Medium.otf" > InterDisplay-Medium.otf
fi
fi

@@ -70,6 +70,9 @@ if [[ ! -e Inconsolata-Black.ttf ]]; then
curl -L -f -s \
--output Inconsolata-Black.ttf \
https://github.com/googlefonts/Inconsolata/raw/${INCONSOLATA_COMMIT}/fonts/ttf/Inconsolata-Black.ttf

mkdir -p ~/.fonts
cp ./Inconsolata-Black.ttf ~/.fonts/
fi

# depName=git@github.com:sevmeyer/oxanium.git
@@ -92,7 +95,7 @@ function generate_empty_wav() {
fi

for f in "$@"; do
cp empty.ogg yr32/$f.ogg
cp empty.ogg "yr32/$f.ogg"
done
}

@@ -104,10 +107,11 @@ function generate_empty_png() {
fi

for f in "$@"; do
cp empty.png yr32/$f.png
cp empty.png "yr32/$f.png"
done
}


function generate_hit_emoji() {
color=$1
label=$2
@@ -200,7 +204,7 @@ function generate_circle_number(){
output=$2

convert \
-font "Inter-Medium.otf" \
-font "InterDisplay-Medium.otf" \
-fill white \
-weight Bold \
-pointsize 120 \
@@ -303,7 +307,14 @@ generate_empty_png \
menu-snow@2x \
scorebar-marker@2x \
ranking-title@2x \
scorebar-bg@2x
scorebar-bg@2x \
mania-stage-hint@2x \
mania-key1@2x \
mania-key2@2x \
mania-keyS@2x \
mania-key1D@2x \
mania-key2D@2x \
mania-keySD@2x

convert -size 32x32 \
xc:#50506733 \
@@ -422,7 +433,11 @@ generate_empty_png \
spinner-osu@2x \
followpoint-0@2x followpoint-1@2x \
followpoint-2@2x followpoint-3@2x \
ready@2x
lightingN@2x \
lightingL@2x \
lighting@2x \
ready@2x \
comboburst@2x

len=350
center=800
@@ -714,8 +729,8 @@ set -u

# shellcheck disable=SC2002
cat "${DIR}/skin.ini" \
| sed s/SB_VERSION/$VERSION_NAME/g "${DIR}/skin.ini" \
| sed s/HIT_CIRCLE_OVERLAP/$HIT_CIRCLE_OVERLAP/g \
| sed "s/SB_VERSION/$VERSION_NAME/g" "${DIR}/skin.ini" \
| sed "s/HIT_CIRCLE_OVERLAP/$HIT_CIRCLE_OVERLAP/g" \
> skin.ini

cp "${DIR}/README.md" README.md
11 changes: 10 additions & 1 deletion skin.ini
View file
Original file line number Diff line number Diff line change
@@ -11,10 +11,19 @@ SliderTrackOverride: 15, 15, 15
Combo1: 127, 255, 127
Combo2: 0, 255, 255


SongSelectActiveText: 224, 224, 224
SongSelectInactiveText: 192, 192, 192

[Mania]
Keys: 4
ColumnStart: 252
ColumnWidth: 86,86,86,86
Colour1: 127,127,255,0
Colour2: 127,127,255,0
Colour3: 127,127,255,0
Colour4: 127,127,255,0
NoteBodyStyle: 0

[Fonts]
HitCircleOverlap: HIT_CIRCLE_OVERLAP

16 changes: 16 additions & 0 deletions svgs/mania-hit0@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions svgs/mania-hit100@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions svgs/mania-hit200@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions svgs/mania-hit300@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svgs/mania-hit300g@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-hit300@2x.svg
16 changes: 16 additions & 0 deletions svgs/mania-hit50@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions svgs/mania-note1@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svgs/mania-note1H@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
8 changes: 8 additions & 0 deletions svgs/mania-note1L@2x.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions svgs/mania-note1T@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-note2@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-note2H@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-note2L@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1L@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-note2T@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-noteS@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-noteSH@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-noteSL@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1L@2x.svg
1 change: 1 addition & 0 deletions svgs/mania-noteST@2x.svg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mania-note1@2x.svg
10 changes: 10 additions & 0 deletions svgs/mania-stage-light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.