Compare commits

...

73 Commits

Author SHA1 Message Date
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
Dean Herbert
dd061350ba Merge pull request #81 from LeNitrous/nightcore-samples
Add nightcore-related samples
2019-12-15 18:45:29 +09:00
unknown
3974e0694f add nightcore-related samples 2019-12-15 17:39:31 +08: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
Dean Herbert
f9e7cc434f Merge pull request #79 from peppy/add-virtual-track-beatmap
Add a beatmap resource which is backed by a virtual track
2019-10-10 17:38:22 +09:00
Dean Herbert
5bd6a5f52c Add a beatmap resource which is backed by a virtual track 2019-10-10 17:37:33 +09:00
Dean Herbert
5385f75351 Merge pull request #78 from Joehuu/add-saint-helena-flag
Add Saint Helena flag
2019-09-19 09:03:27 +09:00
Joehu
6b3aa80e6b Add Saint Helena flag 2019-09-18 16:15:09 -07:00
Dean Herbert
b4d0a62a90 Merge pull request #59 from EVAST9919/search-header
Add background for Search overlay
2019-09-13 15:40:33 +09:00
Dean Herbert
7028234581 Merge pull request #69 from Game4all/add-news-resources
Add graphical resources for News overlay
2019-09-13 15:40:20 +09:00
Dean Herbert
6ecfc3aaa5 Merge pull request #77 from EVAST9919/rankings-header
Add Rankings page header
2019-09-13 15:39:33 +09:00
Andrei Zavatski
cf96f9118a Add Rankings page header 2019-09-10 03:14:37 +03:00
Dean Herbert
05ee05ea7c Fix taiko sample name casing (#76)
Fix taiko sample name casing
2019-09-04 12:58:14 +09:00
smoogipoo
6d78f4f767 Fix taiko sample names 2019-09-04 12:45:05 +09:00
Dan Balasescu
be07d4d6f9 Merge pull request #75 from peppy/fix-ruleset-case
Fix ruleset folder case
2019-09-03 16:18:58 +09:00
Dean Herbert
b0de84de68 Fix case of more ruleset resources 2019-09-03 13:57:20 +09:00
Dean Herbert
072742a5ac Fix case of ruleset resources 2019-09-03 13:57:12 +09:00
Dean Herbert
33ee4ad349 Merge pull request #74 from peppy/play-to-gameplay
Move textures to Gameplay folder
2019-09-03 11:41:45 +09:00
Dean Herbert
7e5ac4479c Move textures to Gameplay folder 2019-08-30 15:08:08 +09:00
Dan Balasescu
406ccb8b7a Merge pull request #73 from peppy/add-legacy-skin
Add legacy skin resources
2019-08-30 12:17:31 +09:00
Dean Herbert
77b5d8e02f Add legacy skin resources 2019-08-26 18:50:10 +09:00
Dean Herbert
4a825a79d7 Add spinner samples for each bank (#71)
Add spinner samples for each bank
2019-08-22 16:24:03 +09:00
iiSaLMaN
a7d0dc2ca4 Add spinner samples each bank 2019-08-22 10:13:22 +03:00
Dean Herbert
3c8e0db0f0 Add resources for new intro sequence (#70)
Add resources for new intro sequence
2019-08-09 19:55:22 +09:00
Dean Herbert
28326c7107 Add video 2019-08-09 19:53:11 +09:00
Dean Herbert
36d6a8931a triangles dot osz 2019-08-09 19:53:07 +09:00
Lucas A
4d9e06ce33 Add news overlay icon 2019-08-06 17:55:29 +02:00
Lucas A
7c2f0fe222 Add News overlay header background 2019-08-06 17:38:18 +02:00
Dean Herbert
3c1262ae00 Add appveyor deploy script 2019-07-31 16:32:30 +09:00
Dean Herbert
99473d3670 Merge pull request #67 from smoogipoo/more-precision-qualifiers
Fix GL_ES errors due to missing precision identifiers
2019-07-31 16:25:47 +09:00
smoogipoo
568d36cb72 Fix GL_ES errors due to missing precision identifiers 2019-07-31 16:20:01 +09:00
Dan Balasescu
f6d3057dcc Merge pull request #66 from nyquillerium/highp-flashlight
Fix loss of precision for flashlight smoothing distance calculations
2019-07-31 13:22:35 +09:00
David Zhao
fb90b1a668 specify for method as well 2019-07-25 11:24:15 +09:00
David Zhao
6448d6051f Remove compiler definitions 2019-07-24 17:20:14 +09:00
David Zhao
8bc6f5a986 specify precision for rectangular flashlight too 2019-07-23 18:58:49 +09:00
David Zhao
c12541bb28 remove unnecessary pre-processor directives 2019-07-23 15:44:15 +09:00
David Zhao
96286f8c6f Explicitly define precision for all variables, fall back to medium precision 2019-07-22 20:02:18 +09:00
David Zhao
d58ad077c8 Add comment 2019-07-19 15:22:38 +09:00
David Zhao
751ded4dd9 define highp and lowp for non GL_ES platforms 2019-07-19 15:20:26 +09:00
David Zhao
7675deb816 Update precisions 2019-07-19 14:58:33 +09:00
David Zhao
9ba9ae77b9 Only mark diff parameter as high precision 2019-07-18 21:02:47 +09:00
David Zhao
f36e765845 Change flashlight float precision to highp 2019-07-18 17:36:03 +09:00
Dean Herbert
3a3d0c1984 Remove grade textures (#65)
Remove grade textures
2019-07-03 13:49:28 +09:00
iiSaLMaN
b7f01508a0 Remove unused textures 2019-07-03 04:32:11 +03:00
Dean Herbert
3ade4a856c Add new menu backgrounds (#64)
Add new menu backgrounds
2019-07-02 17:55:41 +09:00
Dean Herbert
d79c12f663 Trim audio samples that were excessively long (#63)
Trim audio samples that were excessively long
2019-07-02 17:55:07 +09:00
Dean Herbert
f5a3de1e89 Add new menu backgrounds 2019-07-02 17:52:16 +09:00
Dean Herbert
34448428fe Trim audio samples that were excessively long 2019-07-02 16:19:26 +09:00
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
EVAST9919
5aeb32a756 Add background for Search overlay 2019-06-14 10:54:16 +03: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
211 changed files with 43 additions and 17 deletions

17
appveyor_deploy.yml Normal file
View File

@@ -0,0 +1,17 @@
clone_depth: 1
version: '{build}'
skip_non_tags: true
image: Visual Studio 2017
configuration: Release
platform: Any CPU
before_build:
- ps: if($env:appveyor_repo_tag -eq 'True') { Update-AppveyorBuild -Version $env:appveyor_repo_tag_name }
build_script:
- cmd: dotnet pack osu.Game.Resources /p:Version=%APPVEYOR_BUILD_VERSION%
artifacts:
- path: osu.Game.Resources/bin/Any CPU/Release/**/*.nupkg
deploy:
- provider: Environment
name: nuget
- provider: Environment
name: github

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

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.

Binary file not shown.

Binary file not shown.

View File

@@ -1,9 +1,10 @@
#include "sh_Flashlight.h"
vec4 getColourAt(vec2 diff, vec2 size, vec4 originalColour)
// highp precision is necessary for vertex positions to prevent catastrophic failure on GL_ES platforms
lowp vec4 getColourAt(highp vec2 diff, highp vec2 size, lowp vec4 originalColour)
{
float dist = length(diff);
float flashlightRadius = length(size);
highp float dist = length(diff);
highp float flashlightRadius = length(size);
return originalColour * vec4(1.0, 1.0, 1.0, smoothstep(flashlightRadius, flashlightRadius * smoothness, dist));
}

View File

@@ -1,18 +1,16 @@
#ifdef GL_ES
precision mediump float;
#endif
varying highp vec2 v_Position;
varying lowp vec4 v_Colour;
varying vec2 v_Position;
varying vec4 v_Colour;
uniform highp vec2 flashlightPos;
uniform highp vec2 flashlightSize;
uniform vec2 flashlightPos;
uniform vec2 flashlightSize;
uniform lowp float flashlightDim;
const float smoothness = 1.1;
const mediump float smoothness = 1.1;
vec4 getColourAt(vec2, vec2, vec4);
lowp vec4 getColourAt(highp vec2, highp vec2, lowp 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);
}

View File

@@ -1,10 +1,10 @@
#include "sh_Flashlight.h"
vec4 getColourAt(vec2 diff, vec2 size, vec4 originalColour)
lowp vec4 getColourAt(highp vec2 diff, highp vec2 size, lowp vec4 originalColour)
{
diff = abs(diff);
float alpha = length(smoothstep(size, size * smoothness, diff));
lowp float alpha = length(smoothstep(size, size * smoothness, diff));
return originalColour * vec4(1.0, 1.0, 1.0, alpha);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

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