Skip to content

Commit f3a6b61

Browse files
authored
Merge branch 'master' into de-meta-nat-groups
2 parents bcda0d7 + eabcb30 commit f3a6b61

File tree

163 files changed

+5732
-1572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+5732
-1572
lines changed

meta/group-info/el.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ gmt:
2626
wiki: Διαχείριση Wiki
2727
mapping: Συντονιστής κοινοτητας δημιουργίας/Συντονισμου χαρτων
2828
nat:
29-
areas:
30-
communication: Επικοινωνία
31-
evaluation: Αξιολογηση
32-
moderation: Συντονιστής
33-
structural: Οικοδομικός
29+
subgroups:
30+
advisor: Σύμβουλος
31+
evaluator: Αξιολογητής
3432
languages:
3533
partial: λιγο <language>

meta/group-info/es.yaml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
outdated_since: 0522bc4c323f9a2b0c89a6b9582109a0608c6287
2-
outdated_translation: true
3-
41
separator: ", "
52
alumni:
63
roles:
7-
academy: fundador de osu!academy
8-
admin: administración
4+
academy: fundador de la osu!academy
5+
admin: administador
96
chat: moderador del chat
107
dev: osu!dev
118
media: creador de osu!media
@@ -18,17 +15,15 @@ gmt:
1815
chat: moderación del chat
1916
forum: moderación del foro
2017
team: presencia oficial del equipo
21-
dev: desarrollador de osu!
18+
dev: desarrollo de osu!
2219
player: soporte al jugador
2320
support: soporte técnico
24-
tournaments: gestor de torneos
21+
tournaments: gestión de torneos
2522
wiki: administración de la wiki
2623
mapping: moderación de la comunidad de mapping/modding
2724
nat:
28-
areas:
29-
communication: comunicación
30-
evaluation: evaluación
31-
moderation: moderación
32-
structural: estructural
25+
subgroups:
26+
advisor: asesor
27+
evaluator: evaluador
3328
languages:
3429
partial: algo de <language>

meta/group-info/fr.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
outdated_since: 0522bc4c323f9a2b0c89a6b9582109a0608c6287
2-
outdated_translation: true
3-
41
separator: ", "
52
alumni:
63
roles:
@@ -25,11 +22,9 @@ gmt:
2522
wiki: administration du wiki
2623
mapping: modération de la communauté modding/mapping
2724
nat:
28-
areas:
29-
communication: communication
30-
evaluation: évaluation
31-
moderation: modération
32-
structural: structure
25+
subgroups:
26+
advisor: conseiller
27+
evaluator: évaluateur
3328
languages:
3429
partial: un peu de <language>
3530
partial_vowel_prefix: un peu d'<language> # This key is specific to FR

meta/group-info/pl.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
outdated_since: 0522bc4c323f9a2b0c89a6b9582109a0608c6287
2-
outdated_translation: true
3-
4-
# need to update alumni.roles.tournaments and gmt.areas.tournaments
51
separator: ", "
62
alumni:
73
roles:
@@ -26,10 +22,8 @@ gmt:
2622
wiki: zarządzanie wiki osu!
2723
mapping: moderowanie społeczności twórców i moderów beatmap
2824
nat:
29-
areas:
30-
communication: komunikacja
31-
evaluation: ewaluacja
32-
moderation: moderacja
33-
structural: struktury
25+
subgroups:
26+
advisor: doradca
27+
evaluator: ewaluator
3428
languages:
3529
partial: <language> (częściowo)

meta/group-info/zh.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
outdated_since: 0522bc4c323f9a2b0c89a6b9582109a0608c6287
2-
outdated_translation: true
3-
41
separator:
52
alumni:
63
roles:
@@ -25,11 +22,9 @@ gmt:
2522
wiki: wiki 管理员
2623
mapping: 作图、摸图社群管理员
2724
nat:
28-
areas:
29-
communication: 沟通
30-
evaluation: 评估
31-
moderation: 管理
32-
structural: 结构
25+
subgroups:
26+
advisor: 顾问
27+
evaluator: 评估者
3328
languages:
3429
partial: 一部分<language>
3530
zh: 汉语

news/2022-10-23-osutaiko-featured-artist-cup-3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The top 3 teams that reign supreme will be awarded with the following prizes:
6161
- **2nd place:** 4 months of osu!supporter, and 2 Contest Points.
6262
- **3rd place:** 2 months of osu!supporter, and 1 Contest Point.
6363

64-
![](/wiki/Contests/o!tFAC/3/img/badge.png "osu!taiko Featured Artist Cup #3 Winning Team")
64+
![](/wiki/Contests/o!tFAC/3/img/badge1.png "osu!taiko Featured Artist Cup #3 Winning Team")
6565

6666
*Note: The top 3 entries will be fast-tracked to the Ranked section if the mappers choose to.*
6767

news/2022-12-10-makeship-x-osu-plushies.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@ date: 2022-12-10 12:00:00 +0000
66

77
Countless generations of osu! players have yearned for one thing: the capability to squeeze an osu! cookie or mascot in plushie form. Thanks to a collaboration with Makeship, your dreams can now come true, with **THREE** new crowdfunding campaigns!
88

9-
![](https://assets.ppy.sh/media/makeship-x-osu/header.jpg)
9+
![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/header.jpg)
1010

1111
Yes, it's finally happening.
1212

1313
As you might've guessed from our recent [Twitter teasing](https://twitter.com/osugame/status/1600560233885339649) and [subsequent giveaway](https://twitter.com/osugame/status/1601055681217384453), we've partnered up with [Makeship](https://www.makeship.com/) to bring a selection of some iconic osu! figures into squishable life.
1414

1515
Feast your eyes on these glorious plushies in the form of *the* osu! cookie, pippi herself, and the much loved Taikonator 3000:
1616

17-
[![](https://assets.ppy.sh/media/makeship-x-osu/launch.jpg)](https://www.makeship.com/search?q=ppy)
17+
[![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/launch.jpg)](https://www.makeship.com/search?q=ppy)
1818

1919
Exciting, right? While we don't have a banana for scale, we do have an open bottle of authentic green tea, a headphone amplifier and a DAC instead. Can you guess whose desk this is? We bet you can.
2020

21-
[![](https://assets.ppy.sh/media/makeship-x-osu/banana-for-scale.jpg)](https://www.makeship.com/search?q=ppy)
21+
[![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/banana-for-scale.jpg)](https://www.makeship.com/search?q=ppy)
2222

2323
Something in this picture will make you go 'woot', and we suspect it probably isn't the keyboard.
2424

25-
[![](https://assets.ppy.sh/media/makeship-x-osu/mascots-keyboard.jpg)](https://www.makeship.com/search?q=ppy)
25+
[![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/mascots-keyboard.jpg)](https://www.makeship.com/search?q=ppy)
2626

2727
Still not convinced? Witness a pippi plushie riding into the (osu! cookie) sunset atop the Taikonator 3000 as she leaves behind a hard life of farming scores for a new adventure that involves actually enjoying the game. She's crying because she's happy.
2828

29-
[![](https://assets.ppy.sh/media/makeship-x-osu/yeehaw.jpg)](https://www.makeship.com/search?q=ppy)
29+
[![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/yeehaw.jpg)](https://www.makeship.com/search?q=ppy)
3030

3131
Take a moment to look back on how far we've come, from clicking circles and making fan art to actually bringing both of them into the real world. In plushie form, no less.
3232

33-
[![](https://assets.ppy.sh/media/makeship-x-osu/the-og.jpg)](https://www.makeship.com/search?q=ppy)
33+
[![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/the-og.jpg)](https://www.makeship.com/search?q=ppy)
3434

3535
When our dashing developer [smoogipoo](https://osu.ppy.sh/users/1040328) isn't carefully considering code commits, he moonlights as a plushie salesman. Instead of punching time cards, our developers try to sell you things that just straight-up punch you instead.
3636

37-
[![](https://assets.ppy.sh/media/makeship-x-osu/smoog.jpg)](https://www.makeship.com/search?q=ppy)
37+
[![](/wiki/shared/news/2022-12-10-makeship-x-osu-plushies/smoog.jpg)](https://www.makeship.com/search?q=ppy)
3838

3939
We also felt it was important to demonstrate just how throwable the osu! cookie plushie is. No reason.
4040

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
layout: post
3+
title: "New Featured Artist: nyankobrq"
4+
date: 2022-12-21 11:00:00 +0000
5+
---
6+
7+
The one and only **nyankobrq** strides into our Featured Artist library!
8+
9+
![](https://assets.ppy.sh/artists/330/header.jpg)
10+
11+
**nyankobrq** isn't your ordinary electronic producer. Alongside his super catchy solo instrumental works, he's also a rapper in the unit *nyankobrq & yaca*, which you might've already heard from [twinkle night (feat. somunia)](https://osu.ppy.sh/beatmapsets/1684705)!
12+
13+
**5** delicious tracks (including the one above) are pre-timed and ready for mappers to bite into. Check 'em out on [**nyankobrq**'s Featured Artist listing](https://osu.ppy.sh/beatmaps/artists/330)!
14+
15+
Haven't heard **nyankobrq**'s music yet? Use your circle-clicking instincts and click anything on this article. It'll lead to **nyankobrq** somehow. We promise.
16+
17+
<div align="center">
18+
<video width="100%" controls>
19+
<source src="https://assets.ppy.sh/artists/330/release_showcase.mp4" type="video/mp4" preload="none">
20+
</video>
21+
</div>
22+
23+
### nyankobrq & yaca - twinkle night (feat. somunia)
24+
25+
Explore [the map that introduced **nyankobrq** to osu!](https://osu.ppy.sh/beatmapsets/1684705) hosted by [climbx3145](https://osu.ppy.sh/users/14014646)!
26+
27+
<audio controls>
28+
<source src="https://assets.ppy.sh/artists/330/Songs/nyankobrq%20_%20yaca%20-%20twinkle%20night%20(feat.%20somunia).mp3" type="audio/mpeg">
29+
</audio>
30+
31+
### nyankobrq - Snorkel
32+
33+
Or check out [this brand-new map](https://osu.ppy.sh/beatmapsets/1886230) hosted by [Ogura Yui](https://osu.ppy.sh/users/6644401)!
34+
35+
<audio controls>
36+
<source src="https://assets.ppy.sh/artists/330/Songs/nyankobrq%20-%20Snorkel.mp3" type="audio/mpeg">
37+
</audio>
38+
39+
### nyankobrq - Hammer
40+
41+
<audio controls>
42+
<source src="https://assets.ppy.sh/artists/330/Songs/nyankobrq%20-%20Hammer.mp3" type="audio/mpeg">
43+
</audio>
44+
45+
---
46+
47+
[**nyankobrq**'s Featured Artist listing](https://osu.ppy.sh/beatmaps/artists/330) has something you're looking for. We won't tell you what it is, but it's there. It's up to you to find it. (Hint: it's shaped exactly like a beatmap template)
48+
49+
We have ONE more artist planned for this year — a gift from the osu! team to you. You've been asking for this one for a while, so keep tabs on the [@osugame Twitter](https://twitter.com/osugame). You won't want to miss this.
50+
51+
Stay tuned.
52+
53+
—pishifat
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
layout: post
3+
title: "New Beginnings Art Contest: Voting Open"
4+
date: 2022-12-24 12:00:00 +0000
5+
---
6+
7+
**121** artists have set forth to end an era in osu! with their masterful creations, and now it falls to us to decide the finalists... with only **15** votes each!
8+
9+
![](https://assets.ppy.sh/contests/160/header.jpg)
10+
11+
With the festive season in full swing and the end of the year not far off, what better time is there to settle down for a couple of minutes and vote on your favourite bits of osu! fan art to close out the year?
12+
13+
Courtesy of one pishifat (for whom this very video is his *third* creation today, on Christmas Eve, bless his diligent soul), we've got a neat preview video showcasing a brief glimpse of what is up for voting, all set to the tunes of [2ToneDisco](https://osu.ppy.sh/beatmaps/artists/157) x Kabuki's *Giga*:
14+
15+
<div align="center">
16+
<video width="90%" controls>
17+
<source src="https://assets.ppy.sh/contests/160/voting.mp4" type="video/mp4" preload="none">
18+
</video>
19+
</div>
20+
21+
[**Click here to go to the voting for the New Beginnings Art Contest!**](https://osu.ppy.sh/community/contests/160)
22+
23+
We sure don't need to tell you that the window is tight this year, with 2023 *very* fast approaching. The vote will be up for only **7 days** from the date of this post, so make sure to get in quick and choose your favourites while the opportunity is still around!
24+
25+
A selection from the top-voted entries will make it to the game's main menu as the New Beginnings seasonal backgrounds, and their creators will also receive 3 months of osu!supporter.
26+
27+
And as always, the top 3 voted entries will be enshrined upon their author's profiles forever more as bespoke profile badges - a prize you can quite literally not get anywhere else.
28+
29+
A big thanks to everyone who took time out of the holiday season to participate, and we hope the change in schedule worked out a little better for you!
30+
31+
For the rest of us, we must now agonize over how to spend our votes. What wonderful woe.
32+
33+
—Ephemeral

0 commit comments

Comments
 (0)