Merge pull request #56 from peppy/add-changelog-resources

Add graphical resources for changelog overlay

README.md

@@ -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).

osu.Game.Resources/Shaders/sh_Flashlight.h

@@ -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);
 }