Merge remote-tracking branch 'origin/master' into taiko

Browse Source

Conflicts:
	osu.Game.Resources/osu.Game.Resources.csproj

master

smoogipooo 8 years ago

parent b4e7f04eaf 51f2b9b37f

commit 7efa7135f6

203 changed files with 45320 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

45134

osu.Game.Resources/Fonts/Noto.fnt

View File

File diff suppressed because it is too large Load Diff

BIN

osu.Game.Resources/Fonts/Noto_000.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 72 KiB

BIN

osu.Game.Resources/Fonts/Noto_001.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 121 KiB

BIN

osu.Game.Resources/Fonts/Noto_002.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 111 KiB

BIN

osu.Game.Resources/Fonts/Noto_003.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 113 KiB

BIN

osu.Game.Resources/Fonts/Noto_004.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 KiB

BIN

osu.Game.Resources/Fonts/Noto_005.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 115 KiB

BIN

osu.Game.Resources/Fonts/Noto_006.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 KiB

BIN

osu.Game.Resources/Fonts/Noto_007.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_008.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 101 KiB

BIN

osu.Game.Resources/Fonts/Noto_009.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 122 KiB

BIN

osu.Game.Resources/Fonts/Noto_010.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 118 KiB

BIN

osu.Game.Resources/Fonts/Noto_011.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 KiB

BIN

osu.Game.Resources/Fonts/Noto_012.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 124 KiB

BIN

osu.Game.Resources/Fonts/Noto_013.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 124 KiB

BIN

osu.Game.Resources/Fonts/Noto_014.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 118 KiB

BIN

osu.Game.Resources/Fonts/Noto_015.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 KiB

BIN

osu.Game.Resources/Fonts/Noto_016.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 KiB

BIN

osu.Game.Resources/Fonts/Noto_017.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 114 KiB

BIN

osu.Game.Resources/Fonts/Noto_018.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 KiB

BIN

osu.Game.Resources/Fonts/Noto_019.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 111 KiB

BIN

osu.Game.Resources/Fonts/Noto_020.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 113 KiB

BIN

osu.Game.Resources/Fonts/Noto_021.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 KiB

BIN

osu.Game.Resources/Fonts/Noto_022.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_023.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 KiB

BIN

osu.Game.Resources/Fonts/Noto_024.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 KiB

BIN

osu.Game.Resources/Fonts/Noto_025.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 KiB

BIN

osu.Game.Resources/Fonts/Noto_026.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 117 KiB

BIN

osu.Game.Resources/Fonts/Noto_027.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 111 KiB

BIN

osu.Game.Resources/Fonts/Noto_028.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 113 KiB

BIN

osu.Game.Resources/Fonts/Noto_029.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 114 KiB

BIN

osu.Game.Resources/Fonts/Noto_030.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 KiB

BIN

osu.Game.Resources/Fonts/Noto_031.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 98 KiB

BIN

osu.Game.Resources/Fonts/Noto_032.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 96 KiB

BIN

osu.Game.Resources/Fonts/Noto_033.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_034.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_035.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 104 KiB

BIN

osu.Game.Resources/Fonts/Noto_036.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 106 KiB

BIN

osu.Game.Resources/Fonts/Noto_037.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_038.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 104 KiB

BIN

osu.Game.Resources/Fonts/Noto_039.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_040.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 97 KiB

BIN

osu.Game.Resources/Fonts/Noto_041.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 99 KiB

BIN

osu.Game.Resources/Fonts/Noto_042.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 95 KiB

BIN

osu.Game.Resources/Fonts/Noto_043.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 87 KiB

BIN

osu.Game.Resources/Fonts/Noto_044.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 95 KiB

BIN

osu.Game.Resources/Fonts/Noto_045.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 91 KiB

BIN

osu.Game.Resources/Fonts/Noto_046.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 83 KiB

BIN

osu.Game.Resources/Fonts/Noto_047.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 82 KiB

BIN

osu.Game.Resources/Fonts/Noto_048.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 81 KiB

BIN

osu.Game.Resources/Fonts/Noto_049.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 78 KiB

BIN

osu.Game.Resources/Fonts/Noto_050.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 86 KiB

BIN

osu.Game.Resources/Fonts/Noto_051.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 115 KiB

BIN

osu.Game.Resources/Fonts/Noto_052.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 126 KiB

BIN

osu.Game.Resources/Fonts/Noto_053.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 KiB

BIN

osu.Game.Resources/Fonts/Noto_054.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 KiB

BIN

osu.Game.Resources/Fonts/Noto_055.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 118 KiB

BIN

osu.Game.Resources/Fonts/Noto_056.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 117 KiB

BIN

osu.Game.Resources/Fonts/Noto_057.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 111 KiB

BIN

osu.Game.Resources/Fonts/Noto_058.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 111 KiB

BIN

osu.Game.Resources/Fonts/Noto_059.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 KiB

BIN

osu.Game.Resources/Fonts/Noto_060.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 124 KiB

BIN

osu.Game.Resources/Fonts/Noto_061.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 116 KiB

BIN

osu.Game.Resources/Fonts/Noto_062.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 104 KiB

BIN

osu.Game.Resources/Fonts/Noto_063.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_064.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_065.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_066.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 110 KiB

BIN

osu.Game.Resources/Fonts/Noto_067.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 104 KiB

BIN

osu.Game.Resources/Fonts/Noto_068.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_069.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 98 KiB

BIN

osu.Game.Resources/Fonts/Noto_070.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 KiB

BIN

osu.Game.Resources/Fonts/Noto_071.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 103 KiB

BIN

osu.Game.Resources/Fonts/Noto_072.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_073.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 103 KiB

BIN

osu.Game.Resources/Fonts/Noto_074.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 109 KiB

BIN

osu.Game.Resources/Fonts/Noto_075.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_076.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 112 KiB

BIN

osu.Game.Resources/Fonts/Noto_077.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 104 KiB

BIN

osu.Game.Resources/Fonts/Noto_078.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 112 KiB

BIN

osu.Game.Resources/Fonts/Noto_079.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 107 KiB

BIN

osu.Game.Resources/Fonts/Noto_080.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 108 KiB

BIN

osu.Game.Resources/Fonts/Noto_081.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_082.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 106 KiB

BIN

osu.Game.Resources/Fonts/Noto_083.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 106 KiB

BIN

osu.Game.Resources/Fonts/Noto_084.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 105 KiB

BIN

osu.Game.Resources/Fonts/Noto_085.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

osu.Game.Resources/Fonts/Noto_086.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 99 KiB

BIN

osu.Game.Resources/Fonts/Noto_087.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 96 KiB

BIN

osu.Game.Resources/Fonts/Noto_088.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 97 KiB

BIN

osu.Game.Resources/Fonts/Noto_089.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 94 KiB

BIN

osu.Game.Resources/Fonts/Noto_090.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 98 KiB

BIN

osu.Game.Resources/Fonts/Noto_091.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 101 KiB

BIN

osu.Game.Resources/Fonts/Noto_092.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 99 KiB

BIN

osu.Game.Resources/Fonts/Noto_093.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 100 KiB

BIN

osu.Game.Resources/Fonts/Noto_094.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 97 KiB

BIN

osu.Game.Resources/Fonts/Noto_095.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 95 KiB

BIN

osu.Game.Resources/Fonts/Noto_096.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 94 KiB

BIN

osu.Game.Resources/Fonts/Noto_097.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 97 KiB

BIN

osu.Game.Resources/Fonts/Noto_098.png

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 99 KiB

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

Write Preview

Loading…

Cancel

Save