1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 11:32:55 +08:00
Commit Graph

15 Commits

Author SHA1 Message Date
Dan Balasescu
31ce66bfdc Trim whitespace. 2017-04-15 01:31:42 +09:00
Dan Balasescu
3de3b94978 Merge branch 'master' into song-progress-graph 2017-04-15 01:29:02 +09:00
Dean Herbert
acd7a5b254
Hook up beatmap object density to progress display. 2017-04-14 17:58:37 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
smoogipooo
3054697f98 Expose AccentColour/GlowColour from hud elements, and set from HudOverlay. 2017-04-13 10:04:12 +09:00
Dean Herbert
c615762da6
wip 2017-04-11 18:56:25 +09:00
Dean Herbert
06a655af5d
Move initial position of KeyCounter upwards. 2017-04-07 20:51:37 +09:00
DrabWeb
ca2816f9c8 Formatting 2017-03-23 07:24:43 -03:00
DrabWeb
546a3d0914 Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph 2017-03-23 07:15:53 -03:00
DrabWeb
0337f18fb9 Cleaning 2017-03-23 06:37:12 -03:00
DrabWeb
e4af30bd15 Line endings 2017-03-22 09:38:40 -03:00
DrabWeb
8703e5a962 More formatting 2017-03-22 09:35:08 -03:00
DrabWeb
818bdd8e88 SongProgress in HudOverlay 2017-03-22 09:27:04 -03:00
smoogipooo
529cabb001 Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00
smoogipooo
75a5da62d0 Fix filenames. 2017-03-10 16:11:38 +09:00