Compare commits

..

21 Commits

Author SHA1 Message Date
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
15 changed files with 28 additions and 0 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.

View File

@@ -0,0 +1,28 @@
#include "sh_Utils.h"
varying mediump vec2 v_TexCoord;
varying lowp vec4 v_Colour;
uniform lowp sampler2D m_Sampler;
uniform lowp float progress;
// Taken from http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl
vec3 rgb2hsv(vec3 c)
{
vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
vec4 p = c.g < c.b ? vec4(c.bg, K.wz) : vec4(c.gb, K.xy);
vec4 q = c.r < p.x ? vec4(p.xyw, c.r) : vec4(c.r, p.yzx);
float d = q.x - min(q.w, q.y);
float e = 1.0e-10;
return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
}
void main(void)
{
vec4 colour = toSRGB(texture2D(m_Sampler, v_TexCoord, -0.9));
vec3 hsv = rgb2hsv(colour.rgb);
gl_FragColor = hsv.x < progress ? toSRGB(vec4(v_Colour.rgb, v_Colour.a * colour.a * hsv.z)) : vec4(0);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 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.