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

..

audio

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

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

beatmap

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

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

db

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

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

downloads

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

2016-12-10 11:00:58 +01:00

io

Added some missing @param and @throws Javadoc comments.

2015-09-09 23:51:16 -04:00

objects

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

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

render

nullcheck to fix #106

2016-12-13 00:01:01 +01:00

replay

Added some missing @param and @throws Javadoc comments.

2015-09-09 23:51:16 -04:00

skins

support prefixes (HitCirclePrefix, ScorePrefix), and use dummy instead of complaining when image can't be found

2016-09-30 15:54:07 +02:00

states

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

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

ui

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

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

Container.java

Added "favorites" and "last played" beatmap groups, and more sorts.

2016-12-22 05:26:09 -05:00

ErrorHandler.java

Merge branch 'master' of https://github.com/itdelatrisu/opsu into 'upstream'

2016-12-10 01:19:31 +01:00

GameData.java

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

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

GameImage.java

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

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

GameMod.java

auto activate auto

2016-09-30 19:39:47 +02:00

NativeLoader.java

Added some missing @param and @throws Javadoc comments.

2015-09-09 23:51:16 -04:00

Opsu.java

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

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

Options.java

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

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

ScoreData.java

Follow-up to #155.

2016-10-13 14:41:58 -04:00

Utils.java

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

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