yugecin a6540044b6 Merge remote-tracking branch 'remotes/original/master' into upstream ...

# Conflicts:
#	src/itdelatrisu/opsu/Container.java
#	src/itdelatrisu/opsu/GameData.java
#	src/itdelatrisu/opsu/Options.java
#	src/itdelatrisu/opsu/audio/MusicController.java
#	src/itdelatrisu/opsu/objects/Circle.java
#	src/itdelatrisu/opsu/objects/Slider.java
#	src/itdelatrisu/opsu/render/CurveRenderState.java
#	src/itdelatrisu/opsu/states/Game.java
#	src/itdelatrisu/opsu/states/MainMenu.java
#	src/itdelatrisu/opsu/states/SongMenu.java
#	src/itdelatrisu/opsu/ui/Colors.java
#	src/itdelatrisu/opsu/ui/MenuButton.java

2016-12-24 14:35:20 +01:00

..

alpha.png

Implemented "Flashlight" mod.

2015-03-15 15:38:04 -04:00

applause.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

approachcircle.png

Initial commit.

2014-06-29 22:17:04 -04:00

button-left.png

Initial commit.

2014-06-29 22:17:04 -04:00

button-middle.png

Initial commit.

2014-06-29 22:17:04 -04:00

button-right.png

Initial commit.

2014-06-29 22:17:04 -04:00

chevron-down.png

Added a dropdown menu class, similar to the one in osu!.

2015-09-08 23:46:30 -04:00

chevron-right.png

Added a dropdown menu class, similar to the one in osu!.

2015-09-08 23:46:30 -04:00

combobreak.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

comboburst-0.png

Initial commit.

2014-06-29 22:17:04 -04:00

comboburst-1.png

Initial commit.

2014-06-29 22:17:04 -04:00

comboburst-2.png

Initial commit.

2014-06-29 22:17:04 -04:00

comboburst-3.png

Initial commit.

2014-06-29 22:17:04 -04:00

control-check-off.png

checkboxes, sliders

2016-12-11 02:08:35 +01:00

control-check-on.png

checkboxes, sliders

2016-12-11 02:08:35 +01:00

control-sliderball.png

checkboxes, sliders

2016-12-11 02:08:35 +01:00

count1.png

Initial commit.

2014-06-29 22:17:04 -04:00

count1s.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

count2.png

Initial commit.

2014-06-29 22:17:04 -04:00

count2s.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

count3.png

Initial commit.

2014-06-29 22:17:04 -04:00

count3s.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

cursor2.png

Replaced native cursors with skinnable ones.

2014-07-01 19:32:03 -04:00

cursor.png

Replaced native cursors with skinnable ones.

2014-07-01 19:32:03 -04:00

cursormiddle.png

Replaced native cursors with skinnable ones.

2014-07-01 19:32:03 -04:00

cursortrail2.png

Replaced native cursors with skinnable ones.

2014-07-01 19:32:03 -04:00

cursortrail.png

Replaced native cursors with skinnable ones.

2014-07-01 19:32:03 -04:00

default-0.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-1.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-2.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-3.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-4.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-5.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-6.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-7.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-8.png

Initial commit.

2014-06-29 22:17:04 -04:00

default-9.png

Initial commit.

2014-06-29 22:17:04 -04:00

delete.png

Implemented an internal beatmap downloader (using Bloodcat).

2015-02-01 02:10:17 -05:00

download.png

Updater UI improvements.

2015-08-12 19:06:58 -05:00

downloads.png

Implemented an internal beatmap downloader (using Bloodcat).

2015-02-01 02:10:17 -05:00

DroidSansFallback.ttf

Changed font to Droid Sans Fallback v2.55b. (fixes #65)

2015-05-15 01:33:53 -04:00

drum-hitclap.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

drum-hitfinish.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

drum-hitnormal.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

drum-hitwhistle.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

drum-sliderslide.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

drum-slidertick.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

drum-sliderwhistle.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

dummy.png

add forgotten dummy img

2016-09-30 19:58:45 +02:00

epiwarning.png

add epilepsy warning img

2016-11-17 00:12:44 +01:00

fail-background.png

Initial commit.

2014-06-29 22:17:04 -04:00

failsound.wav

Added configurable game key bindings.

2014-07-17 23:58:37 -04:00

followpoint.png

Implemented follow points.

2015-03-18 22:20:37 -04:00

go.png

Initial commit.

2014-06-29 22:17:04 -04:00

gos.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

history.png

Display time since achieving recent scores.

2015-01-29 03:05:09 -05:00

hit0.png

Initial commit.

2014-06-29 22:17:04 -04:00

hit50.png

Initial commit.

2014-06-29 22:17:04 -04:00

hit100.png

Initial commit.

2014-06-29 22:17:04 -04:00

hit100k.png

Initial commit.

2014-06-29 22:17:04 -04:00

hit300.png

Initial commit.

2014-06-29 22:17:04 -04:00

hit300g.png

Initial commit.

2014-06-29 22:17:04 -04:00

hit300k.png

Initial commit.

2014-06-29 22:17:04 -04:00

hitcircle.png

Initial commit.

2014-06-29 22:17:04 -04:00

hitcircleoverlay.png

Initial commit.

2014-06-29 22:17:04 -04:00

hitcircleselect.png

Initial commit.

2014-06-29 22:17:04 -04:00

icon16.png

Initial commit.

2014-06-29 22:17:04 -04:00

icon32.png

Initial commit.

2014-06-29 22:17:04 -04:00

icon48dp.png

Added 48x48dp icon. (by @kouyang)

2015-02-11 17:44:20 -05:00

lighting.png

Changed lighting texture

2015-04-07 03:00:14 +01:00

loader.png

Major track length-related updates.

2014-07-17 21:16:15 -04:00

logo2.png

add new logo/buttons (credits to @Chaaoos)

2016-11-13 01:50:52 +01:00

logo2piece2.png

add logopiece

2016-11-13 01:51:04 +01:00

logo.png

Initial commit.

2014-06-29 22:17:04 -04:00

menu-back.png

Initial commit.

2014-06-29 22:17:04 -04:00

menu-background.jpg

Initial commit.

2014-06-29 22:17:04 -04:00

menu-button-background.png

Initial commit.

2014-06-29 22:17:04 -04:00

menu-exit2.png

use the old menubuttons, but greyscale. the new buttons are a bit small :x

2016-11-13 01:57:28 +01:00

menu-exit.png

Initial commit.

2014-06-29 22:17:04 -04:00

menu-play2.png

use the old menubuttons, but greyscale. the new buttons are a bit small :x

2016-11-13 01:57:28 +01:00

menu-play.png

Initial commit.

2014-06-29 22:17:04 -04:00

menuback.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

menuclick.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

menuhit.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

music-next.png

Initial commit.

2014-06-29 22:17:04 -04:00

music-note.png

Initial commit.

2014-06-29 22:17:04 -04:00

music-pause.png

Initial commit.

2014-06-29 22:17:04 -04:00

music-play.png

Initial commit.

2014-06-29 22:17:04 -04:00

music-previous.png

Initial commit.

2014-06-29 22:17:04 -04:00

normal-hitclap.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

normal-hitfinish.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

normal-hitnormal.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

normal-hitwhistle.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

normal-sliderslide.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

normal-slidertick.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

normal-sliderwhistle.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

options-background.png

Bug fixes and tweaks.

2015-08-08 12:04:15 -05:00

pause-back.png

Initial commit.

2014-06-29 22:17:04 -04:00

pause-continue.png

Initial commit.

2014-06-29 22:17:04 -04:00

pause-overlay.png

Initial commit.

2014-06-29 22:17:04 -04:00

pause-replay.png

Allow showing a replay after a game.

2015-03-11 15:53:19 -04:00

pause-retry.png

Initial commit.

2014-06-29 22:17:04 -04:00

play-skip.png

Initial commit.

2014-06-29 22:17:04 -04:00

play-unranked.png

Added support for default playfield image and an override option.

2014-07-03 01:05:23 -04:00

play-warningarrow.png

Initial commit.

2014-06-29 22:17:04 -04:00

playback-double.png

Follow-up to #68.

2015-04-03 18:08:35 -04:00

playback-half.png

Follow-up to #68.

2015-04-03 18:08:35 -04:00

playback-normal.png

Follow-up to #68.

2015-04-03 18:08:35 -04:00

playfield.png

Added support for default playfield image and an override option.

2014-07-03 01:05:23 -04:00

ranking-A-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-A.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-accuracy.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-B-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-B.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-C-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-C.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-D-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-D.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-maxcombo.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-panel.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-perfect.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-S-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-S.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-SH-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-SH.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-title.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-X-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-X.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-XH-small.png

Initial commit.

2014-06-29 22:17:04 -04:00

ranking-XH.png

Initial commit.

2014-06-29 22:17:04 -04:00

ready.png

Initial commit.

2014-06-29 22:17:04 -04:00

readys.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

repo.png

Added a button to link to GitHub repository in main menu.

2015-01-16 13:42:54 -05:00

reversearrow.png

Misc. bug fixes and improvements.

2014-07-02 23:38:30 -04:00

score-0.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-1.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-2.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-3.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-4.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-5.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-6.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-7.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-8.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-9.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-comma.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-dot.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-percent.png

Initial commit.

2014-06-29 22:17:04 -04:00

score-x.png

Initial commit.

2014-06-29 22:17:04 -04:00

scorebar-bg.png

Initial commit.

2014-06-29 22:17:04 -04:00

scorebar-colour.png

Initial commit.

2014-06-29 22:17:04 -04:00

scorebar-ki.png

Initial commit.

2014-06-29 22:17:04 -04:00

scorebar-kidanger2.png

Initial commit.

2014-06-29 22:17:04 -04:00

scorebar-kidanger.png

Initial commit.

2014-06-29 22:17:04 -04:00

search-background.jpg

Implemented an internal beatmap downloader (using Bloodcat).

2015-02-01 02:10:17 -05:00

section-fail.png

Initial commit.

2014-06-29 22:17:04 -04:00

section-pass.png

Initial commit.

2014-06-29 22:17:04 -04:00

sectionfail.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

sectionpass.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

selection-mod-autoplay.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-doubletime.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-easy.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-flashlight.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-halftime.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-hardrock.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-hidden.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-nofail.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-relax2.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-relax.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-spunout.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mod-suddendeath.png

Initial commit.

2014-06-29 22:17:04 -04:00

selection-mods-over.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-mods.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-options-over.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-options.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-random-over.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-random.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-selectoptions-over.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-selectoptions.png

Song menu graphical updates.

2015-02-15 21:38:54 -05:00

selection-tab.png

Improved appearance of tabs.

2015-01-10 22:49:23 -05:00

shutter.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

sliderb0.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb1.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb2.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb3.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb4.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb5.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb6.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb7.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb8.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderb9.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderfollowcircle.png

Initial commit.

2014-06-29 22:17:04 -04:00

slidergradient.png

fix blending... and update slidergradient

2016-12-05 20:48:38 +01:00

sliderpoint10.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderpoint30.png

Initial commit.

2014-06-29 22:17:04 -04:00

sliderscorepoint.png

Initial commit.

2014-06-29 22:17:04 -04:00

soft-hitclap.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

soft-hitfinish.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

soft-hitnormal.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

soft-hitwhistle.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

soft-sliderslide.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

soft-slidertick.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

soft-sliderwhistle.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

spinner-approachcircle.png

Initial commit.

2014-06-29 22:17:04 -04:00

spinner-circle.png

Initial commit.

2014-06-29 22:17:04 -04:00

spinner-clear.png

Initial commit.

2014-06-29 22:17:04 -04:00

spinner-metre.png

Initial commit.

2014-06-29 22:17:04 -04:00

spinner-osu.png

Initial commit.

2014-06-29 22:17:04 -04:00

spinner-osu.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

spinner-rpm.png

Spinner updates and animated score percentage display.

2015-02-20 16:56:41 -05:00

spinner-spin.png

Initial commit.

2014-06-29 22:17:04 -04:00

spinnerbonus.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

spinnerspin.wav

Added initial sound effect support.

2014-07-01 01:14:03 -04:00

star2.png

Draw an animated star stream in the song menu.

2015-09-04 22:36:25 -05:00

star.png

Draw star rating stars in the song menu inside each song node.

2015-09-02 23:10:31 -05:00

theme.mp3

New theme song.

2016-12-22 18:36:31 -05:00

update.png

Updater UI improvements.

2015-08-12 19:06:58 -05:00

version

fix internal download path

2016-11-21 10:06:51 +01:00

volume-bg.png

Implemented volume-bg and master volume setting.

2015-01-20 14:52:02 -05:00