Compare commits

..

20 Commits

Author SHA1 Message Date
Dean Herbert
126e0f55bf Trim font spritesheet sizes where possible (#62)
Trim font spritesheet sizes where possible
2019-07-01 17:55:42 +09:00
Dean Herbert
affcaf9413 Trim font spritesheet sizes where possible 2019-07-01 17:41:06 +09:00
Dean Herbert
f8b1063617 Merge pull request #61 from iiSaLMaN/venera-medium
Add Venera900 as Medium
2019-06-30 23:08:39 +09:00
Salman Ahmed
299099bfb6 Add Venera900 as Medium 2019-06-29 10:25:41 +03:00
Dean Herbert
93f52d0add Merge pull request #60 from welsar55/combobreak
Add combobreak.mp3
2019-06-27 00:19:08 +09:00
Welsar55
79b2f662db Add combobreak.mp3 2019-06-26 00:10:41 -05:00
iiSaLMaN
c7cc430505 Update grade textures + Remove F grade texture (#58) 2019-06-09 22:00:45 +09:00
Dean Herbert
44c3acb3ab Merge pull request #56 from peppy/add-changelog-resources
Add graphical resources for changelog overlay
2019-05-17 19:09:40 +09:00
Dean Herbert
82e55bf2e7 Add graphical resources for changelog overlay 2019-05-17 10:19:37 +09:00
Dean Herbert
d650f1c3e3 Merge pull request #54 from iiSaLMaN/master
Add a fail sound
2019-05-02 14:21:04 +09:00
iiSaLMaN
ca32d2b67d Add fail sound 2019-04-17 16:52:56 +03:00
iiSaLMaN
807cfd28e1 Delete failsound.mp3 2019-04-17 16:52:32 +03:00
iiSaLMaN
e12898f65d Add fail sound 2019-04-17 16:46:52 +03:00
Dean Herbert
a9eb133d26 Merge pull request #53 from nyquillerium/flashlight-dimming
Add dim to flashlight shader
2019-04-17 21:41:34 +08:00
David Zhao
005f95a4b6 Invert to flashlightDim 2019-04-12 11:24:17 +09:00
David Zhao
801c6efa96 Add lightness to flashlight shader for dimming 2019-04-12 10:50:10 +09:00
Dean Herbert
adf26ecf9d Remove font awesome
Now included with framework
2019-03-28 22:50:13 +09:00
Dean Herbert
d5aa2e6c91 Merge pull request #52 from Joehuu/readme-format-1
Normalize repo readme format
2019-03-02 20:21:50 +09:00
Dean Herbert
efddc9d410 Remove space on "osu!resources"
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-03-01 21:21:28 -08:00
Joehu
8696d20433 Normalize repo readme format 2019-03-01 20:06:42 -08:00
36 changed files with 11 additions and 8 deletions

View File

@@ -1,14 +1,15 @@
# osu-resources
[osu! on the web](https://osu.ppy.sh) | [dev chat](https://discord.gg/ppy)
# osu!resources
Rhythm is just a *click* away. The future of osu! and the beginning of an open era!
[![Build status](https://ci.appveyor.com/api/projects/status/github/ppy/osu?svg=true)](https://ci.appveyor.com/project/peppy/osu-resources) [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
# Requirements
Assets used by osu!.
This is a dependency of [osu!](https://github.com/ppy/osu) and intended to be used as a submodule only.
## Requirements
# Licence
This is a dependency of [osu!](https://github.com/ppy/osu) and intended to be used as a NuGet package only.
The content of this repository is licensed under [CC-BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode). Please see [the licence file](LICENCE.md) for more information. [tl;dr](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-4.0-international-(cc-by-nc-4.0)) you can use in a non-commercial manner.
## Licence
The majority of content in this repository is licensed under [CC-BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode). Please see [the licence file](LICENCE.md) for more information. [tl;dr](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-4.0-international-(cc-by-nc-4.0)) you can use it in a non-commercial manner.
Please note that this *does not cover* the usage of the "osu!" or "ppy" branding in any software, resources, advertising or promotion, as this is protected by trademark law. If you require clearance for the use of these terms, please [contact us](mailto:contact@ppy.sh).

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 KiB

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 KiB

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Binary file not shown.

View File

@@ -8,11 +8,13 @@ varying vec4 v_Colour;
uniform vec2 flashlightPos;
uniform vec2 flashlightSize;
uniform float flashlightDim;
const float smoothness = 1.1;
vec4 getColourAt(vec2, vec2, vec4);
void main(void)
{
gl_FragColor = getColourAt(flashlightPos - v_Position, flashlightSize, v_Colour);
gl_FragColor = mix(getColourAt(flashlightPos - v_Position, flashlightSize, v_Colour), vec4(0.0, 0.0, 0.0, 1.0), flashlightDim);
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB