Compare commits

..

67 Commits

Author SHA1 Message Date
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
Dan Balasescu
93aac715f8 Merge pull request #97 from peppy/add-taiko-hitcircle-resources
Add missing taiko samples and hitcircle resources
2020-04-12 17:43:40 +09:00
Dean Herbert
d5869a9bfe Add missing taiko samples and hitcircle resources 2020-04-11 14:04:30 +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
Dean Herbert
35af4862ed Merge pull request #96 from peppy/add-taiko-drum
Add taiko legacy skin resources
2020-04-03 18:23:13 +09:00
Dean Herbert
8dfedcdfa6 Add taiko legacy skin resources 2020-04-03 18:01:06 +09:00
Dean Herbert
49c442fe36 Merge pull request #95 from smoogipoo/add-mania-resources
Add mania lighting textures
2020-04-02 21:40:20 +09:00
smoogipoo
187820f49a Add mania lighting textures 2020-04-02 16:00:25 +09:00
Dean Herbert
ce0994fe1a Merge pull request #94 from smoogipoo/add-mania-resources
Add skinnable mania resources
2020-03-31 21:18:05 +09:00
smoogipoo
5150ba1a34 Update resources + add 2x variants 2020-03-31 19:51:56 +09:00
smoogipoo
ec6a4a8788 Add skinnable mania resources 2020-03-31 11:04:34 +09:00
Dean Herbert
ff20e55a16 Merge pull request #93 from EVAST9919/wiki-icon
Add icon for wiki overlay header
2020-03-25 09:22:18 +09:00
Andrei Zavatski
f0be6f4254 Add icon for wiki overlay header 2020-03-24 15:40:11 +03:00
Dan Balasescu
3779a79ca1 Merge pull request #91 from peppy/remove-exo
Remove Exo font
2020-03-15 00:25:20 +09:00
Dean Herbert
5eb16c1656 Remove Exo font 2020-03-13 13:42:01 +09:00
Dean Herbert
b8fdc58937 Merge pull request #90 from peppy/rename-venera
Rename venera fonts to match their actual weights
2020-03-04 11:33:42 +09:00
Dean Herbert
f001501daa Rename venera fonts to match their actual weights 2020-03-04 11:25:12 +09:00
Dean Herbert
9cc83dfffd Merge pull request #89 from peppy/add-torus
Add torus font
2020-03-03 18:19:48 +09:00
Dean Herbert
7ae2768c9a Add torus font 2020-03-03 17:17:38 +09:00
Dean Herbert
ec93df9075 Merge pull request #88 from peppy/catch-legacy-skin
Add osu!catch legacy skin resources
2020-02-21 10:19:40 +09:00
Dean Herbert
9889a3de33 Add osu!catch legacy skin resources 2020-02-21 10:17:52 +09:00
Dean Herbert
7af5e416c8 Merge pull request #87 from EVAST9919/direct-nothing-found
Add "not-found" image for beatmap listing overlay
2020-02-18 20:36:07 +09:00
Andrei Zavatski
798cd622ad Add not-found image for beatmap listing overlay 2020-02-18 13:03:13 +03:00
Dean Herbert
8283831674 Remove test beatmaps (#86)
Remove test beatmaps
2020-01-02 16:59:36 +09:00
Dean Herbert
67eab2f7a0 Merge pull request #85 from smoogipoo/remove-taiko-samples
Remove taiko samples
2020-01-02 16:39:21 +09:00
smoogipoo
990f2dac52 Remove test beatmaps 2020-01-02 16:29:00 +09:00
smoogipoo
46b42fb154 Remove taiko samples 2020-01-02 16:26:50 +09:00
Dean Herbert
5897e615bc Add icon for rankings overlay header (#84)
Add icon for rankings overlay header
2019-12-30 13:42:00 +09:00
Andrei Zavatski
601b2250a8 Update the icon size 2019-12-30 06:22:59 +03:00
Andrei Zavatski
55619aac71 Add icon for rankings header 2019-12-30 06:14:29 +03:00
Dean Herbert
e27c63fa46 Remove transparent pixels from icons 2019-12-27 10:08:08 +09:00
Dean Herbert
a0852cde53 Remove a few unnecessary 1x sprites 2019-12-27 10:02:30 +09:00
Dean Herbert
c10c2a41e6 Add legacy mania judgement sprites (#83)
Add legacy mania judgement sprites

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-27 10:01:35 +09:00
Dean Herbert
a41c01dd88 Remove 1x resources 2019-12-27 09:59:28 +09:00
Dean Herbert
d75f8c1561 Add icon for ProfileOverlay header (#82)
Add icon for ProfileOverlay header
2019-12-27 09:42:44 +09:00
mcendu
03b018a587 Add legacy mania judgement sprites 2019-12-26 21:52:26 +08:00
Andrei Zavatski
79c23957a8 Add icon for ProfileOverlay 2019-12-26 16:17:15 +03:00
Dean Herbert
c99e22d334 Merge pull request #80 from huoyaoyuan/assembly-ref
Add code to get assembly reference to resource project
2019-12-16 18:07:04 +09:00
Huo Yaoyuan
aa78104f4a Change the helper type name 2019-11-28 23:40:14 +08:00
Huo Yaoyuan
de9ecb69c5 Add code to get assembly reference to resource project. 2019-11-28 23:02:36 +08:00
185 changed files with 28 additions and 48 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 263 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

View File

@@ -1,47 +0,0 @@
SIL Open Font License v1.10
This license can also be found at this permalink: https://www.fontsquirrel.com/license/exo-2
Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name Exo.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
—————————————————————————————-
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
—————————————————————————————-
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
DEFINITIONS
“Font Software” refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
“Reserved Font Name” refers to any names specified as such after the copyright statement(s).
“Original Version” refers to the collection of Font Software components as distributed by the Copyright Holder(s).
“Modified Version” refers to any derivative made by adding to, deleting, or substituting—in part or in whole—any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
“Author” refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

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.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

@@ -0,0 +1,9 @@
using System.Reflection;
namespace osu.Game.Resources
{
public static class OsuResources
{
public static Assembly ResourceAssembly => typeof(OsuResources).Assembly;
}
}

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: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 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: 1.6 KiB

Some files were not shown because too many files have changed in this diff Show More