Skip to content

Commit

Permalink
Merge branch 'master' into aitVica2
Browse files Browse the repository at this point in the history
  • Loading branch information
Walavouchey authored Nov 15, 2023
2 parents c28c504 + f952595 commit 07a1a1b
Show file tree
Hide file tree
Showing 362 changed files with 9,455 additions and 2,319 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/setup-node@v3
with:
cache: npm
node-version: 16
node-version: 20

- name: load node_modules from cache
id: cache-node-modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/refresh-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v3
with:
cache: npm
node-version: 16
node-version: 20

- name: check node_modules cache
id: cache-node-modules
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/welcome-new-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
Please take note of the following:
- Make sure you've read [this self-check checklist](https://osu.ppy.sh/wiki/en/osu%21_wiki/Contribution_guide#self-check).
- Make sure you've read [this self-check checklist](https://osu.ppy.sh/wiki/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 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.
See the [contribution guide](https://osu.ppy.sh/wiki/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 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).
All changes are run through [continuous integration checks](https://osu.ppy.sh/wiki/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).
21 changes: 13 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
FROM python:3.11-slim

RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \
git

# https://github.com/nodesource/distributions/blob/master/README.md
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm
# Install git
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y git

# Install Node.js <https://github.com/nodesource/distributions#nodejs>
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates curl gnupg && \
mkdir -p /etc/apt/keyrings && \
curl -fLSs https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' >/etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs

WORKDIR /osu-wiki
COPY package.json package-lock.json scripts/requirements.txt /osu-wiki/
RUN npm install && npm install -g osu-wiki
RUN pip3 install -r requirements.txt

# Install osu-wiki tool dependencies
RUN npm install && npm install -g osu-wiki && pip3 install -r requirements.txt

# Prevent git from refusing to work in a repository with "dubious ownership".
# The repository, mounted with --volume ...:/osu-wiki, is owned by a host user, and the container user is root.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: post
title: "Performance ranking for all gamemodes"
date: 2014-03-01 00:00:00 +0000
tumblr_url: http://osunews.tumblr.com/post/79496003745/skin-showcase-neosu-series
tumblr_url: https://osunews.tumblr.com/post/78209471160/performance-ranking-for-all-gamemodes
---

Finally the performance rankings for Taiko, Catch the Beat and osu!mania reached a point where they can be used as official ranking systems. You can find your new rank in your profile and the performance ladder [here](https://osu.ppy.sh/p/pp).
Expand Down
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
55 changes: 55 additions & 0 deletions news/2023/2023-11-04-new-featured-artist-phaze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
layout: post
title: "New Featured Artist: PHAZE"
date: 2023-11-04 16:30:00 +0000
---

Our newest Featured Artist **PHAZE** steps into the virtual spotlight!

![](https://assets.ppy.sh/artists/387/header.jpg)

**PHAZE** is a three-piece international band specialising in the internet's ever-expansive landscape. Mixing anime-inspired Japanese vocals with genres like electro swing, rock, and pop, **PHAZE**'s sound reaches throughout VR spheres via live virtual events and the VRChat scene.

**5** fresh tunes have been slammed onto [**PHAZE**'s Featured Artist listing](https://osu.ppy.sh/beatmaps/artists/387), all pre-timed for your next mapping session (which should be right now).

Ever tried clicking circles without your index finger? It's uncomfortable. And that's what renowned mapper [LMT](https://osu.ppy.sh/users/7262798) does all the time. Watch him play [PHAZE - Mirai Isho](https://osu.ppy.sh/beatmapsets/1989072) from [COE](/wiki/Community/cavoe's_osu!_event/2023), then check out the rest of these previews:

<div align="center">
<video width="85%" controls>
<source src="https://assets.ppy.sh/artists/387/release_showcase.mp4" type="video/mp4" preload="none">
</video>
</div>

### PHAZE - Mirai Isho

Try out [the map from the video above](https://osu.ppy.sh/beatmapsets/1989072) hosted by [KaedeharaKazuha](https://osu.ppy.sh/users/6300910)!

<audio controls>
<source src="https://assets.ppy.sh/artists/387/Songs/PHAZE_-_Mirai_lsho.mp3">
</audio>

### PHAZE - abyss

Or try [this recently Ranked map](https://osu.ppy.sh/beatmapsets/2047330) hosted by [AirinCat](https://osu.ppy.sh/users/11119539)!

<audio controls>
<source src="https://assets.ppy.sh/artists/387/abyss/PHAZE%20-%20abyss.mp3">
</audio>

### PHAZE - Phantom Chain

If neither of those are what you're looking for, [take the plunge for yourself](https://assets.ppy.sh/artists/387/Songs/PHAZE%20-%20Phantom%20Chain.osz).

<audio controls>
<source src="https://assets.ppy.sh/artists/387/Songs/PHAZE%20-%20Phantom%20Chain.mp3">
</audio>

---

In case you needed *more songs*, [**PHAZE**'s Featured Artist listing](https://osu.ppy.sh/beatmaps/artists/387) might be able to help.

And in case you needed some *mapping inspiration*, maybe check out the latest batch of [**Featured Artist playlists** in osu!(lazer)](/wiki/People/Featured_Artists/Featured_Artist_playlists). Tastefully yoinking patterns is an essential skill in mapping, so we trust you to do what must be done.

Stay tuned for another Featured Artist reveal next week!

—pishifat
55 changes: 55 additions & 0 deletions news/2023/2023-11-07-winter-fanart-contest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
layout: post
title: "Winter 2023 Fanart Contest"
date: 2023-11-07 11:00:00 +0000
---

The end of the year soon approaches, and what better way to send it off in style than with a feast-themed fanart contest!

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

Each and every year since a date long lost to the annals of time, we've sat down and posed the artists of the osu! community a timeless question: **do you like to draw?**

If your answer to this question is yes, then pull up a chair and prepare yourselves for a brand-new food-related theme! **Draw any of the osu! mascots (or community mascots) enjoying a seasonal feast** for fun and glory!

You may be wondering what the heck a *seasonal feast* is. Since we're a massively multicultural community, there's a ton of traditional festivals and feasts that roughly align around the end of the year, from anything like Thanksgiving, Diwali/Deepavali, Hanukkah, the winter solstice (including the Dongzhi festival), Festivus, Christmas, Kwanzaa, and tons more that we could probably spend a whole article describing.

Suffice to say, the end of the year involves a *lot* of celebrating and eating, so we figured this year, we'd try trussing up the idea and seeing what delectable creations the immensely talented artists of the osu! community can cook up. *Shokugeki no Soma* enthusiasts who've wanted to draw glazed ham (and we know there is at LEAST *one* of you), rejoice!

If you're looking for ideas, here's a few to get the juices flowing:

- The mascots fighting over who gets the last piece of Christmas ham
- Mocha rolling a comically overstuffed don around in front of a fireplace
- Yuzu being spear-tackled by Chirou right as he was about to finish his fruit pyramid centrepiece
- Mari pulverising Mani with a turkey drumstick for the sin of being an annoying younger sibling
- ...and basically anything you can think of that involves a seasonal, end-of-year feast!

This is a pretty broad theme, so feel free to go wild with it — just make sure it stays vaguely festive. If you want snow, go for it! If you don't, that's fine too. As long as the mascots are enjoying their time together in the company of good friends, we'll consider that fair game.

You've got **21 days** to bring your creation to life, so time to get cracking on the crackling! As always, a selection of the top voted finalists will make it to the main menu and receive 3 months of osu!supporter, plus the top 3 will also receive fancy bespoke profile badges pulled from their own creations.

But make sure you read the contest rules below first, especially because there's a new one this time around.

## 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 (Winter 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 (Winter/end-of-year seasonal feast) and contain AT LEAST one of the osu! official or community mascots.** The mascots are not optional and neither are the feasts and festivities!
- **All entries MUST be suitable for all-ages viewing.** We legitimately cannot fathom how someone can tarnish a wholesome festival feast like this, but we're also not willing to make it a challenge since someone is bound to figure out a way. Just don't do 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!
- **Entrants must keep a full file containing all of their entry's layers available.** We'll only ask you for this if we think it's needed to ascertain any claims regarding plagiarism or the use of generative art tools. If you don't/can't provide us this within a timely manner when we ask, we'll have no choice but to pull your listing from the contest, sorry!
- **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.

*Header and promotional artwork by finalist [Novarece](https://osu.ppy.sh/users/18728833) from the [New Beginnings Art Contest](https://osu.ppy.sh/community/contests/160)!*

The [Winter 2023 Fanart Contest listing](https://osu.ppy.sh/community/contests/189) awaits you when you're ready to submit your entry.

And remember, you can resubmit your entry as many times as you like before submissions close. One pixel off? No worries, fix the thing and reupload your entry. Do this thirty times, three hundred times, three THOUSAND times, it's fine! Though if you're doing it that many times, we might wonder just how fine you are, but we digress.

Good luck!

—Ephemeral
Loading

0 comments on commit 07a1a1b

Please sign in to comment.