Skip to content

Commit

Permalink
Merge branch 'master' into Patch-Multi
Browse files Browse the repository at this point in the history
  • Loading branch information
TicClick authored Dec 31, 2023
2 parents fded20d + 54d8c01 commit d29af4e
Show file tree
Hide file tree
Showing 579 changed files with 14,196 additions and 6,761 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- name: detect changed files
run: |
changed_files="$(mktemp)"
git diff --diff-filter=d --name-only --no-renames master >"$changed_files"
git diff --diff-filter=d --name-only --no-renames -z master >"$changed_files"
printf 'CHANGED_FILES=%s\n' "$changed_files" >>"$GITHUB_ENV"
- name: check file sizes
run: xargs -r meta/check-file-sizes.sh <"$CHANGED_FILES"
run: xargs -0r meta/check-file-sizes.sh <"$CHANGED_FILES"

- name: set up Node.js
id: setup-node
Expand All @@ -52,8 +52,8 @@ jobs:
- name: run remark on changed files
if: ${{ !contains(github.event.pull_request.body, 'SKIP_REMARK') }}
run: |
grep '\.md$' <"$CHANGED_FILES" | \
REPORTER=vfile-reporter-github-action xargs -r meta/remark.sh
grep -z '\.md$' <"$CHANGED_FILES" | \
REPORTER=vfile-reporter-github-action xargs -0r meta/remark.sh
- name: set up Python
uses: actions/setup-python@v4
Expand Down
18 changes: 9 additions & 9 deletions meta/check-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ run_test() {

cd -- "$(dirname "$0")/.."

changed_files="$(
{
git diff --diff-filter=d --name-only --no-renames master
git ls-files --exclude-standard --others
} | sort -u
)"

printf '%s\n' "$changed_files" | run_test 'file size' xargs -r meta/check-file-sizes.sh
printf '%s\n' "$changed_files" | grep '\.md$' | run_test Remark xargs -r meta/remark.sh
changed_files="$(mktemp)"
{
git diff --diff-filter=d --name-only --no-renames -z master
git ls-files --exclude-standard --others -z
} | \
sort -uz >"$changed_files"

run_test 'file size' xargs -0r meta/check-file-sizes.sh <"$changed_files"
grep -z '\.md$' <"$changed_files" | run_test Remark xargs -0r meta/remark.sh
run_test 'YAML style' osu-wiki-tools check-yaml
run_test link osu-wiki-tools check-links --all

Expand Down
9 changes: 5 additions & 4 deletions meta/group-info/fr.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
no_native_review_since: c828a3cf602155b387adfae4dc2a9546894d7a77 Doryan

separator: ", "
alumni:
roles:
academy: créateur de l'osu!academy
admin: administration
chat: modérateur de tchat
dev: osu!dev
media: créateur d'osu!media
media: créateur de contenu osu!media
support: équipe du support
tournaments: gestion des tournois
tournaments: manager des tournois
gmt:
all_mods: tous les modérateurs
areas:
Expand All @@ -18,7 +20,7 @@ gmt:
dev: développement d'osu!
player: support aux joueurs
support: support technique
tournaments: gestion des tournois
tournaments: manager des tournois
wiki: administration du wiki
mapping: modération de la communauté modding/mapping
skinning: modération de la communauté skinning
Expand All @@ -31,4 +33,3 @@ nat:
languages:
partial: un peu de <language>
partial_vowel_prefix: un peu d'<language> # This key is specific to FR
fil: philippin
34 changes: 17 additions & 17 deletions news/2020/2020-04-23-osu-mapping-olympiad-6-results.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ Apples, oranges, bananas and... waffles? The results for the second osu!catch Ma

In [this installment of the Mapping Olympiad contest](https://osu.ppy.sh/community/contests/90), the community was tasked with creating two osu!catch difficulties for [*MYLK*](https://osu.ppy.sh/beatmaps/artists/62)'s Waffle Wave. One of the two difficulties was required to be of a lower playing skill level (Easy, Normal or Hard), with the other being for players of a higher skill level (Insane or Expert). The results can be seen below:

| Rank | Username | Entry Name | Musical Relevance (60) | Creativity (60) | Technique (60) | Impression (30) | Hitsounding (30) | Total Score |
|------|---------------|----------------------|------------------------|-----------------|----------------|-----------------|------------------|-------------|
| #1 | alienflybot | Nippy Opossum | 47 | 39.5 | 47 | 23 | 20.5 | **177** |
| #2 | Sinnoh | Clever Heron | 46 | 45 | 42.5 | 22.5 | 18 | **174** |
| #3 | Yumeno Himiko | Arctic Raccoon | 42.5 | 41.5 | 39 | 18.5 | 21 | **162.5** |
| #4 | rew0825 | Illegal Bluebird | 47.5 | 35.5 | 41.5 | 19.5 | 17.5 | **161.5** |
| #5 | Nelly | Zigzag Sea Lion | 44.5 | 37 | 42.5 | 19 | 18 | **161** |
| #6 | Jemzuu | Gracious Whale | 43 | 37 | 40.5 | 20 | 19 | **159.5** |
| #7 | -Luminate | Orderly Gecko | 41 | 36.5 | 39.5 | 18.5 | 18 | **153.5** |
| #8 | Ilhamuharam | Diligent Pelican | 37 | 34.5 | 35.5 | 17.5 | 17.5 | **142** |
| #9 | Xinely | Naughty Eagle | 40 | 32 | 36 | 17.5 | 10 | **135.5** |
| #10 | dika312 | Fumbling Turtle | 34 | 33 | 34.5 | 16 | 13.5 | **131** |
| #11 | Mafumafu | Snarling Rattlesnake | 36.5 | 27.5 | 33.5 | 14 | 15 | **126.5** |
| #12 | Rocma | Extra-Large Unicorn | 31.5 | 33 | 27.5 | 13 | 14 | **124** |
| #13 | Acyl | Self-Assured Iguana | 32.5 | 29 | 24.5 | 13.5 | 16.5 | **116** |
| #14 | Absolute Zero | Bitter Pheasant | 34 | 26.5 | 24 | 13.5 | 0 | **98** |
| #15 | ts8zs | Hasty Gopher | 15.5 | 15 | 12 | 7 | 10.5 | **60** |
| Rank | Username | Entry Name | Musical Relevance (60) | Creativity (60) | Technique (60) | Impression (30) | Hitsounding (30) | Total Score |
| :-- | :-- | :-- | :-- | :-- | :-- | :-- | :-- | :-- |
| #1 | alienflybot | Nippy Opossum | 47 | 39.5 | 47 | 23 | 20.5 | **177** |
| #2 | Sinnoh | Clever Heron | 46 | 45 | 42.5 | 22.5 | 18 | **174** |
| #3 | Yumeno Himiko | Arctic Raccoon | 42.5 | 41.5 | 39 | 18.5 | 21 | **162.5** |
| #4 | rew0825 | Illegal Bluebird | 47.5 | 35.5 | 41.5 | 19.5 | 17.5 | **161.5** |
| #5 | Nelly | Zigzag Sea Lion | 44.5 | 37 | 42.5 | 19 | 18 | **161** |
| #6 | Jemzuu | Gracious Whale | 43 | 37 | 40.5 | 20 | 19 | **159.5** |
| #7 | -Luminate | Orderly Gecko | 41 | 36.5 | 39.5 | 18.5 | 18 | **153.5** |
| #8 | Ilhamuharam | Diligent Pelican | 37 | 34.5 | 35.5 | 17.5 | 17.5 | **142** |
| #9 | Xinely | Naughty Eagle | 40 | 32 | 36 | 17.5 | 10 | **135.5** |
| #10 | dika312 | Fumbling Turtle | 34 | 33 | 34.5 | 16 | 13.5 | **131** |
| #11 | Mafumafu | Snarling Rattlesnake | 36.5 | 27.5 | 33.5 | 14 | 15 | **126.5** |
| #12 | Rocma | Extra-Large Unicorn | 31.5 | 33 | 27.5 | 13 | 14 | **124** |
| #13 | Acyl | Self-Assured Iguana | 32.5 | 29 | 24.5 | 13.5 | 16.5 | **116** |
| #14 | Absolute Zero | Bitter Pheasant | 34 | 26.5 | 24 | 13.5 | 0 | **98** |
| #15 | ts8zs | Hasty Gopher | 15.5 | 15 | 12 | 7 | 10.5 | **60** |

Edging past the competition and securing **first place** is [**alienflybot**](https://osu.ppy.sh/users/636114) with a total score of **177**! alienflybot's experience shone through in the execution and enjoyability of their Platter and Rain difficulties, topping the judges scorecards for the Technique and Impression categories. Their entry also came in second by merely a whisker in the Musical Relevance and Hitsounding categories, and was judge Sc4v4nger's favourite pick. Congratulations to a veteran mapper of over five years on joining the ranks of osu!'s Elite Mappers at last!

Expand Down
2 changes: 1 addition & 1 deletion news/2020/2020-05-14-osucatch-scoring-updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ After much testing and discussion by the osu-dev community, the cumulative chang
## Deployment schedule

| Task | Estimated Time | Progress |
|:--|:-:|:-:|
| :-- | :-: | :-: |
| Update beatmap star ratings | 30h | Done |
| Update users' scores performance | 12h | Done |
| Re-index users' top ranks | 3h | Done |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ Depending on how you perform among the Seasonal Ranking, we plan to award you wi
In addition, the Top 10 players for each mode at the end of each week will be given 1 week of osu!supporter.

| Badges | Bracket Tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/ri_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/ri_3.png) | Rhythm Incarnate | Top 50 |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/diamond_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/diamond_3.png) | Diamond | Top 51 - 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/platinum_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/platinum_3.png) | Platinum | 3% - 10% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/gold_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/gold_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/gold_3.png) | Gold | 10% - 25% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/silver_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/silver_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/silver_3.png) | Silver | 25% - 50% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/bronze_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/bronze_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/bronze_3.png) | Bronze | 50% - 70% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/copper_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/copper_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/copper_3.png) | Copper | 70% - 95% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/iron_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/iron_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/iron_3.png) | Iron | 95% - 100% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/iron_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/iron_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2020/osu/iron_3.png) | Iron | 95% - 100% |

This table only shows one of four badge versions. Each game mode has its own badge version.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ You can check the finalized leaderboard for the previous season [here](https://d
## Rewards

| Badges | Bracket Tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/ri_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/ri_3.png) | Rhythm Incarnate | Top 50 |
| ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/diamond_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/diamond_3.png) | Diamond | Top 51 - 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/platinum_2.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2020/osu/platinum_3.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The Winter Season 2021 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket Tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2021/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2021/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2021/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2021/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2021/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2021/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The Spring Season 2021 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket Tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2021/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2021/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2021/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2021/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2021/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2021/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ The Winter Season 2022 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2022/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2022/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2022/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2022/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2022/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2022/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ The Winter Season 2022 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2022/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2022/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2022/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2022/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2022/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2022/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ The Summer Season 2022 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2022/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2022/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2022/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2022/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/summer_2022/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/summer_2022/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ The Winter Season 2023 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2023/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2023/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2023/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2023/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/winter_2023/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/winter_2023/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ The Spring Season 2023 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2023/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2023/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2023/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2023/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/spring_2023/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/spring_2023/osu/platinum_2.png) | Platinum | 3% - 10% |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ The Autumn Season 2023 leaderboard will be available over at the [Beatmap Spotli
## Rewards

| Badges | Bracket tier | Placement |
| :--: | :--: | :--: |
| :-: | :-: | :-: |
| ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2023/osu/ri_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2023/osu/ri_2.png) | Rhythm Incarnate | The best of the best |
| ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2023/osu/diamond_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2023/osu/diamond_2.png) | Diamond | 3% |
| ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2023/osu/platinum_1.png) ![](/wiki/Beatmap_Spotlights/img/badges/autumn_2023/osu/platinum_2.png) | Platinum | 3% – 10% |
Expand Down
Loading

0 comments on commit d29af4e

Please sign in to comment.