Compare commits

..

42 Commits

Author SHA1 Message Date
Dan Balasescu
41face8af4 Merge pull request #113 from peppy/add-missing-icons
Update and add missing icons
2020-09-03 19:52:35 +09:00
Dean Herbert
de9132a7d7 Remove space in directory 2020-09-03 17:42:53 +09:00
Dean Herbert
59efcb23f7 Add new icons 2020-09-03 17:01:00 +09:00
Dean Herbert
0984b46926 Update and add missing icons 2020-09-03 16:35:36 +09:00
Dan Balasescu
18254992a5 Merge pull request #112 from peppy/shorter-seeya
Shorten "welcome" intro outro voice to match lazer fade duration
2020-09-03 14:22:53 +09:00
Dean Herbert
9dfffd1e89 Shorten "welcome" intro outro voice to match lazer fade duration 2020-09-03 13:05:54 +09:00
Dean Herbert
a7df4bc0e0 Merge pull request #111 from Wieku/heartbeat-fix 2020-08-11 15:17:25 +09:00
Dean Herbert
7ea62f7d79 Shorten in length 2020-08-11 15:17:00 +09:00
Sebastian Krajewski
6850dd5773 Trim silence at the beginning of osu-logo-heartbeat 2020-08-11 08:00:46 +02:00
Sebastian Krajewski
500f5f4f29 Replace osu-logo-heartbeat with WAV version of it 2020-08-11 07:51:50 +02:00
Dan Balasescu
760bbe0d18 Merge pull request #110 from peppy/add-banana-catch-sound
Add banana catch sound
2020-07-31 12:40:52 +09:00
Dean Herbert
e81f149d8d Add banana catch sound 2020-07-30 17:55:44 +09:00
Dean Herbert
3fbb90b2f2 Revert "Apply lightweight png compression"
This reverts commit 06d4fd2fb8.
2020-07-27 14:03:32 +09:00
jorolf
b4615aeed8 Grey logo animation (#109)
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-07-27 13:43:39 +09:00
jorolf
cbc76e1ab6 Add Triangles logo animation texture and shader (#105)
Co-authored-by: Sebastian Krajewski <mail@wieku.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-07-15 18:54:57 +09:00
Dan Balasescu
70925f8165 Merge pull request #108 from HakuraSukinoe/thailand-font
Thailand font
2020-07-15 13:35:29 +09:00
Shivam
07153ebed5 Add welcome background (#106)
* Add welcome background

* Move background & change with jpg
2020-07-08 23:28:21 +09:00
HakuraSukinoe
79b6e52d2e Change to Noto Thai 2020-07-07 13:11:25 +07:00
HakuraSukinoe
a0a31372c3 Added Thai Font
Yeah i added for osu!lazer
2020-07-07 12:35:27 +07:00
Dean Herbert
6cb9677bc8 Move welcome text to correct subdirectory 2020-06-22 16:48:02 +09:00
Dean Herbert
4910e1bd08 Merge pull request #103 from MiraiSubject/fallback-intro 2020-06-22 16:45:52 +09:00
Shivam
193b30d149 Remove @2x suffix 2020-06-14 17:09:00 +02:00
Shivam
92a54f4fe4 Change capitalisation of the welcome folder 2020-06-13 15:29:29 +02:00
Shivam
9f676305f1 Move welcome and seeya to the base directory of intro
They are right now being used by both triangles (if startup music is beatmap) and circles
2020-06-12 15:56:09 +02:00
Dean Herbert
1e0f4d7923 Merge pull request #104 from totallyrobot/pause-loooop
Add pause loop sample
2020-06-12 16:49:27 +09:00
TotallyRobot
8d932bfa6b Move and rename pause loop file 2020-06-06 20:55:21 +02:00
TotallyRobot
edf43d2e12 Add pause loop sample 2020-06-06 16:29:22 +02:00
Shivam
27204b087e Add the original welcome sprite 2020-06-02 20:53:00 +02:00
Shivam
b48a1f45bd Rename from legacy to welcome 2020-06-02 13:21:11 +02:00
Shivam
b45de76e64 Rename fallback to legacy 2020-06-02 13:07:06 +02:00
Shivam
62d444baf0 Use original file names and separate into folders 2020-06-02 12:55:47 +02:00
Shivam
9ecfb4563e Add "stable fallback" intro samples 2020-06-02 12:19:22 +02:00
Shivam
06dc0666c2 move the original welcome/seeya to a subfolder 2020-06-02 12:19:00 +02:00
Dean Herbert
fe4e998e9c Merge pull request #102 from MiraiSubject/fallback-audio
Add nekodex' welcome to osu! audio track
2020-06-02 13:50:37 +09:00
Shivam
fa0bf9fb18 Add nekodex' welcome to osu! 2020-06-02 03:40:35 +02:00
Dean Herbert
ff31ae4748 Merge pull request #101 from smoogipoo/update-cursortrail-shader
Add TexRect to CursorTrail shader
2020-06-01 18:55:11 +09:00
smoogipoo
b38d484c40 Add TexRect to CursorTrail shader 2020-05-07 19:13:17 +09:00
Dan Balasescu
93708000ad Merge pull request #100 from peppy/add-taiko-slider
Add taiko "slider" resources
2020-05-04 00:55:01 +09:00
Dean Herbert
1383fb7fd2 Add taiko "slider" resources 2020-05-01 19:41:36 +09:00
Dean Herbert
1d0c916590 Merge pull request #99 from Craftplacer/taiko-don
Add taiko mascot resources
2020-04-24 09:59:45 +09:00
Craftplacer
1ced938f43 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-06 01:55:25 +02:00
Craftplacer
bc11af25d4 Add legacy pippi don textures 2020-04-06 01:52:08 +02:00
75 changed files with 19 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,12 +1,14 @@
attribute vec2 m_Position;
attribute vec4 m_Colour;
attribute vec2 m_TexCoord;
attribute vec4 m_TexRect;
attribute float m_Time;
varying vec2 v_DrawingPosition;
varying vec2 v_MaskingPosition;
varying vec4 v_Colour;
varying vec2 v_TexCoord;
varying vec4 v_TexRect;
uniform mat4 g_ProjMatrix;
uniform mat3 g_ToMaskingSpace;
@@ -27,5 +29,7 @@ void main(void)
v_Colour = vec4(m_Colour.rgb, m_Colour.a * pow(clamp(m_Time - g_FadeClock, 0.0, 1.0), 1.7));
v_TexCoord = m_TexCoord;
v_TexRect = m_TexRect;
gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0);
}
}

View File

@@ -0,0 +1,14 @@
#include "sh_Utils.h"
varying mediump vec2 v_TexCoord;
varying lowp vec4 v_Colour;
uniform lowp sampler2D m_Sampler;
uniform lowp float progress;
void main(void)
{
vec4 colour = toSRGB(texture2D(m_Sampler, v_TexCoord, -0.9));
gl_FragColor = colour.r < progress ? toSRGB(vec4(v_Colour.rgb, v_Colour.a * colour.a)) : vec4(0);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 761 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 565 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.