Commit Graph

2168 Commits

Author SHA1 Message Date
ac3b435f00 Merge remote-tracking branch 'upstream/master' into hud-improvements
# Conflicts:
#	osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
2017-04-14 19:29:59 +09:00
7f08c3c417 add IHasOverhangingTooltip 2017-04-14 00:18:17 +02:00
f6f75fac74 Merge branch 'master' of git://github.com/ppy/osu into tooltips
# Conflicts:
#	osu.Game/Graphics/Cursor/MenuCursor.cs
2017-04-13 23:12:07 +02:00
c2b2e5ec19 changed way the tool tip is found and displayed 2017-04-13 23:00:49 +02:00
13f057f900 Give CursorTrail its own clock for the time being. 2017-04-13 14:14:12 +09:00
3054697f98 Expose AccentColour/GlowColour from hud elements, and set from HudOverlay. 2017-04-13 10:04:12 +09:00
2987a57588 Use formatter to add zeroes. 2017-04-12 20:28:04 +09:00
157ad17606 Merge branch 'master' into details 2017-04-12 20:25:51 +09:00
5bf71aae9c Remove unused using. 2017-04-12 20:14:12 +09:00
ec6267c5b2 switch -> if. 2017-04-12 19:41:11 +09:00
d2affe6867 requested changes 2017-04-12 10:52:24 +02:00
2964c04c14 Add special SliderBar sound behaviour when at extents. 2017-04-12 12:07:29 +09:00
d6fa51dc5c Update SliderBar to use OnUserChange method. 2017-04-12 12:07:27 +09:00
ed2f5d210e condensed some commits because they were small or already reversed 2017-04-11 22:48:53 +02:00
50b6bcd574 Merge branch 'master' into details 2017-04-11 19:06:58 +02:00
d4e5f55091 the power of linq 2017-04-11 18:43:48 +02:00
fb5952186c changes and fixes 2017-04-11 14:02:56 +02:00
2bb50ff082 Add commas to score counter. 2017-04-11 19:21:05 +09:00
c615762da6 wip 2017-04-11 18:56:25 +09:00
9732110bd9 Update TransformTo methods in line with framework changes. 2017-04-11 17:25:56 +09:00
7ca0d6d117 Adjust cursor popin/out to make it less ugly. 2017-04-11 16:44:12 +09:00
f8c6ce15c3 Fix weird RollingCounter behaviour. 2017-04-11 16:37:36 +09:00
ad41fd5c1a more unnecessary stuff 2017-04-10 16:49:48 +02:00
412d6a14ca removed something unnecessary 2017-04-10 16:45:34 +02:00
a597149b7f Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-10 16:42:42 +02:00
24b4b3ad7d update to everything 2017-04-10 16:42:23 +02:00
c6a24bb549 Merge branch 'master' into details 2017-04-10 20:07:13 +09:00
5af4259ab4 Add back explicit binds. 2017-04-10 17:10:15 +09:00
f12b5a8954 Unify disable logic. 2017-04-10 16:22:36 +09:00
bb4a909de5 Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
963cd09bd0 Merge https://github.com/ppy/osu into playlist 2017-04-09 04:04:13 -03:00
f7a9a11ae5 Bar uses AccentColour aswell 2017-04-08 13:53:11 +02:00
5e56e84c4a change SRGBColour to Color4 and use IHasAccentColour in some places 2017-04-08 13:31:55 +02:00
c60a55285c updated TestCase and some null checks 2017-04-07 20:32:09 +02:00
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
eb4b3772e9 put Bar into its own file and let it only add a background if BackgroundColour is changed 2017-04-07 18:13:55 +02:00
e59c0a770f Merge branch 'master' into details 2017-04-06 15:42:00 +02:00
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
942699218a Merge branch 'master' into details 2017-04-06 15:44:43 +09:00
863dc44c4d Some minor improvements. 2017-04-06 09:57:34 +09:00
f9bf1c69bf add Flags to BarDirection and remove unused "using" 2017-04-04 18:23:29 +02:00
502afc0a48 some fixes to BarGraph so Direction works properly 2017-04-04 18:09:16 +02:00
b2731bb0a1 some formatting 2017-04-04 17:27:08 +02:00
58f8dc8254 add direction to graphs 2017-04-04 17:17:22 +02:00
7c74951454 Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
f6303d55ec Upodate some tab usages. 2017-04-04 11:13:09 +09:00
5a694e0c9d changed location of BarGraph to be more generic 2017-04-03 19:29:13 +02:00
a9baeddaa5 remove unused code 2017-04-02 21:12:49 +02:00
9db3fee4b4 make Screens work 2017-04-02 21:03:33 +02:00