Skip to content

Commit

Permalink
Merge branch 'master' into GBC
Browse files Browse the repository at this point in the history
  • Loading branch information
Walavouchey authored Nov 3, 2023
2 parents 54deaf8 + dc6d029 commit c4fb363
Show file tree
Hide file tree
Showing 605 changed files with 29,050 additions and 11,074 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/news/ @ppy/news-approval
/wiki/Legal/**/en.md @peppy @Ephemeralis
/wiki/Legal/SCTL/ @peppy @Ephemeralis
/wiki/Help_centre/**/en.md @peppy @Ephemeralis
16 changes: 5 additions & 11 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,8 @@ jobs:

- name: detect changed files
run: |
INTERESTING_FILES=$(
sort -u < <(
# Changes that are not committed (staged + unstaged + untracked), but without deleted files
git status --short -v -v --no-renames --porcelain | awk '$1 != "D" { print $2 }'
# Changes committed so far (may overlap with the above)
git diff --no-renames --name-only --diff-filter=d ${{ github.sha }}^
)
)
# Changes committed to this PR so far
INTERESTING_FILES=$( git diff --no-renames --name-only --diff-filter=d ${{ github.sha }}^ )
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
# XXX: env.INTERESTING_FILES will be a single string with newline delimiters.
Expand All @@ -55,9 +49,9 @@ jobs:
uses: actions/cache@v3
with:
path: node_modules
key: node-modules-${{ hashFiles('package.json', 'package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}
key: node-modules-${{ hashFiles('package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}

- name: install remark
- name: 'if cache is outdated: install node.js dependencies'
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: npm ci

Expand All @@ -74,7 +68,7 @@ jobs:
with:
cache: pip
cache-dependency-path: scripts/requirements.txt
python-version: 3.x
python-version: '3.11'

- name: set up Python CI dependencies
run: pip install -r scripts/requirements.txt
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/refresh-cache.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: refresh node_modules cache

on:
push:
branches:
- master

jobs:
cache-node-modules:
name: update cache
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
# meta/remark contains linked packages
sparse-checkout: meta/remark

- name: set up Node.js
id: setup-node
uses: actions/setup-node@v3
with:
cache: npm
node-version: 16

- name: check node_modules cache
id: cache-node-modules
uses: actions/cache/restore@v3
with:
path: node_modules
lookup-only: true
key: node-modules-${{ hashFiles('package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}

- name: 'if cache is outdated: install node_modules'
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: npm ci

- name: 'if cache is outdated: save cache'
if: steps.cache-node-modules.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
with:
path: node_modules
key: node-modules-${{ hashFiles('package-lock.json') }}-${{ steps.setup-node.outputs.node-version }}
4 changes: 2 additions & 2 deletions .github/workflows/welcome-new-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
- Make sure you've read [this self-check checklist](https://osu.ppy.sh/wiki/en/osu%21_wiki/Contribution_guide#self-check).
- Translations that have not been reviewed by a native speaker will be merged after a minimum of 1 week. If there are no reviewers for your language, please mention it explicitly.
- Refrain from continually updating the branch with `master` yourself. A [maintainer](https://osu.ppy.sh/wiki/People/osu%21_wiki_maintainers) will do this before merging anyway.
- Refrain from spamming the `Update branch` button. A [maintainer](https://osu.ppy.sh/wiki/People/osu%21_wiki_maintainers) will do this before merging anyway.
- Apply review suggestions in batches from the `Files changed` tab like this:
![Demo GIF](https://user-images.githubusercontent.com/36758269/214177263-b6ead137-e7e0-43a0-9aec-00f81894ebf7.gif)
See the [contribution guide](https://osu.ppy.sh/wiki/en/osu%21_wiki/Contribution_guide) for more information.
All changes are run through [continuous integration checks](https://osu.ppy.sh/wiki/en/osu%21_wiki/Maintenance#ci-checks), which provide automatic detection for common errors. If you need help with decrypting CI check error messages, or with any other issues, ask in the `#osu-wiki` channel on the [osu!dev Discord server](https://discord.com/invite/ppy).
All changes are run through [continuous integration checks](https://osu.ppy.sh/wiki/en/osu%21_wiki/Maintenance#ci-checks), which provide automatic detection of common errors. If you need help with decrypting CI check error messages, or with any other issues, ask in the `#osu-wiki` channel on the [osu! Discord server](https://discord.com/invite/ppy).
7 changes: 5 additions & 2 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"MD003": { "style": "atx" },
"MD004": { "style": "dash" },
"MD011": false,
"MD009": { "br_spaces": 0 },
"MD013": false,
"MD024": { "siblings_only": true },
"MD026": false,
Expand All @@ -10,5 +10,8 @@
"MD035": { "style": "---" },
"MD040": false,
"MD045": false,
"MD046": { "style": "fenced" }
"MD046": { "style": "fenced" },
"MD048": { "style": "backtick" },
"MD049": { "style": "asterisk" },
"MD050": { "style": "asterisk" }
}
1 change: 1 addition & 0 deletions .remarkignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.github/
meta/
wiki/Legal/SCTL/
wiki/Tournaments/TEMPLATE.md
wiki/Tournaments/README.md
wiki/Tournaments/TEMPLATE-SERIES.md
Expand Down
14 changes: 9 additions & 5 deletions .remarkrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ export default {
},
plugins: [
'preset-lint-markdown-style-guide',
['frontmatter', {type: 'yaml', marker: '-'}],
['gfm', {singleTilde: false, tablePipeAlign: false}],
['frontmatter', { type: 'yaml', marker: '-' }],
['gfm', { singleTilde: false }],
['lint-definition-case', false],
['lint-fenced-code-flag', {allowEmpty: true}],
['lint-fenced-code-flag', { allowEmpty: true }],
['lint-final-newline'],
['lint-hard-break-spaces', false],
['lint-hard-break-style', 'backslash'],
['lint-linebreak-style', 'unix'],
['lint-list-item-indent', 'space'],
['lint-list-item-spacing', {checkBlanks: true}],
['lint-list-item-spacing', { checkBlanks: true }],
['lint-maximum-heading-length', false],
['lint-maximum-line-length', false],
['lint-no-duplicate-definitions'],
Expand All @@ -32,14 +32,18 @@ export default {
['lint-no-heading-indent'],
['lint-no-heading-like-paragraph'],
['lint-no-html'],
['lint-no-missing-blank-lines', {exceptTightLists: true}],
['lint-no-missing-blank-lines', { exceptTightLists: true }],
['lint-no-shortcut-reference-link', false],
['lint-no-tabs'],
['lint-no-undefined-references'],
['lint-no-unused-definitions'],
['lint-ordered-list-marker-value', 'ordered'],
['lint-osu-links'],
['lint-osu-wiki-links'],
['lint-table-cell-padding', false],
['lint-table-pipe-alignment', false],
['osu/lint-table-align-style'],
['osu/lint-table-cell-padding'],
['osu/lint-table-no-missing-cells'],
],
};
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM python:3.11-slim

RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
Expand Down
32 changes: 32 additions & 0 deletions meta/group-info/zh-tw.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
separator:
alumni:
roles:
academy: osu!academy 創辦人
admin: 管理員
chat: 聊天室管理員
dev: osu! 開發者
media: osu!media 建立者
support: 支援團隊
tournaments: 錦標賽管理員
gmt:
all_mods: 全域管理員
areas:
beatmap: 圖譜管理員
chat: 聊天室管理員
forum: 論壇管理員
team: 官方團隊
dev: osu! 開發者
player: 玩家支援人員
support: 技術支援人員
tournaments: 錦標賽管理員
wiki: Wiki 管理員
mapping: 製圖/Mod 圖社群管理員
skinning: Skin 社群管理員
leadership: 團隊領袖
nat:
subgroups:
structural: 組織
evaluation: 評估
leadership: 領導
languages:
partial: 部分<language>
31 changes: 31 additions & 0 deletions meta/remark/markdown-table/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// This package replaces "markdown-table" under "mdast-util-gfm-table" for the
// purpose of printing tables that follow osu-wiki standards:
//
// - Empty cells are printed explicitly
// - Alignment cells use exactly 3 characters
// - Every cell uses 1 space of left and right padding, even empty cells
export function markdownTable(table, options = {}) {
const maxColumns = Math.max(...table.map((row) => row.length));

// Fill cells with empty string if not defined
const filledTable = table.map((row) => Array.from(
{ length: maxColumns },
(_, columnIndex) => row[columnIndex] ?? '',
));

// Add alignment row
filledTable.splice(1, 0, Array.from(
{ length: maxColumns },
(_, columnIndex) => {
switch (options.align?.[columnIndex]) {
case 'center': return ':-:';
case 'right': return '--:';
default: return ':--';
}
},
));

return filledTable
.map((row) => `| ${row.join(' | ')} |`)
.join('\n');
}
5 changes: 5 additions & 0 deletions meta/remark/markdown-table/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"private": true,
"type": "module",
"main": "./index.js"
}
2 changes: 1 addition & 1 deletion news/2023/2023-03-15-new-featured-artist-minstrel.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Play through [this very real beatmap](https://osu.ppy.sh/beatmapsets/1085793) ho
<source src="https://assets.ppy.sh/artists/349/recollection/Minstrel%20-%20Fiction.mp3">
</audio>

### Minstrel - Cinderella Cage ~Falling in Love Again~
### Minstrel - Cinderella Cage \~Falling in Love Again\~

Or try [this map from the video above](https://osu.ppy.sh/beatmapsets/1909142) hosted by [SMOKELIND](https://osu.ppy.sh/users/9327302)!

Expand Down
40 changes: 40 additions & 0 deletions news/2023/2023-09-24-halloween-fanart-contest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
layout: post
title: "Halloween 2023 Fanart Contest"
date: 2023-09-24 04:00:00 +0000
---

As the mists of October draw ever closer, the artists of the osu! community have only one thing on their mind: **spooky month.** Turn your tablets to their true and terrible purpose in our latest Fanart Contest!

![](https://assets.ppy.sh/contests/186/header.jpg)

Chills and thrills abound during spooky month, and as always, we're throwing *skills* into the mix too by inviting any brave enough to put their work up for voting. It begins with just one question: **do you like to draw?**

If so, you're in luck! **Draw any of the osu! mascots (or community mascots) in a Halloween theme or setting** for fun and a chance at glory and possibly even some sweet profile loot to boot.

You've got **21 days** from the date of this post to conjure up your harrowing Halloween spectacle, but only once you've **CAREFULLY** read the rules listed out below.

As always, a selection of the top-voted finalists will make it into the game client as our special Halloween 2023 seasonal background, and their artists will nab *3 months* of osu!supporter to commemorate their effort. The top three voted entries will also have their pieces made into bespoke profile badges in honour of their grand victory.

Got all that? Great, time to get on to the rest:

## Rules

- **By submitting your artwork to this contest, you grant us permission to use your artwork in the main menu client should it win, and to use it in promotional material for both the game (osu!) and the contest (Halloween 2023 Fanart Contest).** You retain all rights to your creation and you can sell it and distribute it however you like — it is your work, after all. We're just saying here that if you submit your piece to this contest, you should be okay with us using it.
- **All entries MUST follow the contest theme (Halloween) and contain AT LEAST one of the osu! official or community mascots.** Wouldn't be an osu! fanart contest without at least one of our beloved mascots, would it?
- **All entries MUST be suitable for all-ages viewing.** Keep the actual gore out of your art pieces! Some blood is fine, just be reasonable with it.
- **SUBMIT ONLY YOUR OWN WORK. REDRAWING AND COMPOSITE WORKS ARE NOT ALLOWED.** Plagiarism sucks. Don't do it. Someone in the comments will call you out for it as has happened every other time someone's tried and they're going to do more damage to your reputation than us removing your entry from the voting will do. Use only your own work — brushes and the like are fine, but that's it! Don't redraw someone else's work.
- **Generative art programs or methods (such as AI) are not allowed.** This includes any kind of software that has you supply a written or visual prompt and fills in large amounts of details for you. We will know if you do this. If we somehow miss it, the community won't. Don't sully your legacy as an artist!
- **Artist attribution (names, social media handles, etc.) must be limited to no more than three lines total and confined to any corner of your entry.** Being proud of your work is good, just do it in a reasonably small spot of your work. One thing unique to osu!'s history is that we really don't like forced advertisement, and attribution that is too large can come across like it.
- **Entries MUST meet the resolution requirements for a main-menu piece — namely 2732x1536. THIS IS CHECKED BY A SCRIPT AND ENTRIES THAT DO NOT MATCH THIS REQUIREMENT WILL BE DISCARDED AUTOMATICALLY.** This remains the \#1 reason for distressed emails sent after the contest about why an entry didn't make it in. Even ONE pixel off is enough. Export your creations at the correct resolution!
- **Artists should use the custom templates provided ([PSD template](https://assets.ppy.sh/events/fanart/templates/osu%21%20main%20menu%202732x1536.psd?2017) / [PNG template](https://assets.ppy.sh/events/fanart/templates/osu%21%20main%20menu%202732x1536.png?2017)) when composing their piece as a guideline to understand where the osu! cookie will be placed on the main menu and during the voting process.** The circular spot in the middle shows where the main-menu cookie will be when inside the game. Factor this in when designing your piece, as anything inside it is likely not going to be seen. This doesn't mean leaving a big circular hole full of nothing in the middle! Be creative. *Make sure you don't leave it visible in your end result.*
- **Do not leave the dotted osu! cookie template visible in your submission.** Leave the meme in the grave, where it belongs.
- **If you're using characters from other intellectual properties, do so sparingly.** All the official osu! mascots and the community mascots are fair game, but please avoid using excessive representations of characters from other worlds or franchises in your work - the contest is about osu! foremost, after all. Remember also that the community mascots are someone else's treasured creation, so please treat them with the same respect that you'd treat your own OCs and work.

When you think you're ready, head on over to the [Halloween 2023 Fanart Contest listing](https://osu.ppy.sh/community/contests/186) and drag-drop your entry into the box with the plus sign in it.

You can delete and resubmit your entry at any time and as many times as you like before the contest closes and voting starts. This is ideal for the creative types who finish something then notice one pixel out of the four million, one hundred and ninety-six thousand, three hundred and fifty-two that they just placed is *slightly* off.

We look forward to seeing your creations!

—Ephemeral
32 changes: 32 additions & 0 deletions news/2023/2023-09-25-osulazer-updates-september-24.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
layout: post
title: "osu!(lazer) Updates: September 24"
date: 2023-09-25 21:30:00 +0000
---

Marvel at the never-ending stream of usability improvements.

![](/wiki/shared/news/2023-09-25-osulazer-updates-september-24/banner.jpg)

Things are progressing faster towards the goal of leaderboards by the end of the year, but so is the to-do list of getting there. Find out all about it in this video here or read the executive summary below:

<div align="center">
<iframe width="95%" style="aspect-ratio: 16 / 9;" src="https://www.youtube.com/embed/SWEE8XlGluI" frameborder="0" allowfullscreen></iframe>
</div>

### Changes

- **Velocity change visualisation toggle in the editor.** In osu!mania and osu!taiko, the speed of objects can be toggled to be constant or reflect gameplay.
- **New minimum -10 approach rate for the Difficulty Adjust mod.** Courtesy of reading expert [-GN](https://osu.ppy.sh/users/895581), you may now attempt and fail something he does with ease.
- **Removed slider head movement.** No more misses when hitting a slider late. This was a consequence of the new slider "snake out" feature, but has now been fixed.
- **Beatmap attribute display in the mod select overlay.** Star rating, BPM, and other info can be seen on the left-side "details" tab, but when trying to select mods, a huge (albeit fabulous) overlay would rudely block the view. That is now fixed along with other quality-of-life improvements.
- **Missing beatmap download on replay import.** The game will present you with the correct beatmap (in a new *nano-sized* beatmap card) if you don't have the map for a replay your friend sent you. If you tick `Automatically download missing beatmaps` in the options, it'll skip this fancy presentation and just download the map automatically (which is still fancy).
- **Highlighted friend scores in gameplay leaderboards.** Your friends are pink, so you can easily tell when you're about to snipe their score.
- **Various spinner adjustments.** Calculations are now more like osu!(stable), which mainly affects the limit of how many bonus spins you can achieve.
- **Behind-the-scenes future design implementation.** Nothing important here. Do not look at the [changelog](https://osu.ppy.sh/home/changelog/lazer/2023.924.0).

---

There's probably no need for me to tell you how to receive the latest update (it's automatic), but if you absolutely don't know, you can install the latest version [right here](https://osu.ppy.sh/home/download).

—Walavouchey
Loading

0 comments on commit c4fb363

Please sign in to comment.