Commit Graph

2074 Commits

Author SHA1 Message Date
a6dfed9668 Formatting 2017-03-24 00:41:56 -03:00
0edee04200 Use OsuColour instead of static colours 2017-03-24 00:41:14 -03:00
f1f6f2041f Null track handling in player 2017-03-23 23:57:33 -03:00
befbc63c35 Merge https://github.com/ppy/osu into song-progress-graph 2017-03-23 23:42:06 -03:00
b56fb310bf More cleanup 2017-03-23 23:38:23 -03:00
e3071894f4 Merge branch 'master' into song-select-improvements 2017-03-24 09:21:26 +09:00
f218066f83 Merge branch 'master' into parallax-requires-position 2017-03-23 22:52:06 +09:00
0bcb463acf ParallaxContainer should always know the mouse position. 2017-03-23 22:42:40 +09:00
0a11d035fe Formatting 2017-03-23 09:07:13 -03:00
b429d8f1b3 More proper fix 2017-03-23 09:05:53 -03:00
3364801221 Fix for the fix 2017-03-23 08:32:24 -03:00
8901d6137e Merge branch 'master' into song-select-improvements 2017-03-23 20:25:38 +09:00
bbca6cf602 Fix bottom square being clipped 2017-03-23 08:13:03 -03:00
938f5eaf58 Dragging 2017-03-23 07:38:08 -03:00
63d7c5a5a3 Pressing back while mod select is visible should close mod select before exiting. 2017-03-23 19:35:46 +09:00
8c4fd44a85 Tidy up song select footer and fix depth of mod select vs osu! cookie. 2017-03-23 19:32:58 +09:00
ca2816f9c8 Formatting 2017-03-23 07:24:43 -03:00
3923892863 Delete SongProgressGraphColumn.cs 2017-03-23 07:20:16 -03:00
546a3d0914 Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph 2017-03-23 07:15:53 -03:00
2cb801317d JudgementInfo -> Judgement.
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
2017-03-23 19:00:18 +09:00
93915ba527 Fix regression of osu! judgement animation. 2017-03-23 18:56:27 +09:00
0337f18fb9 Cleaning 2017-03-23 06:37:12 -03:00
b5d661b53a some fixing and restyling. 2017-03-23 18:20:00 +09:00
4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00
96fc8eef30 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 17:23:22 +09:00
e9a061c709 Merge branch 'master' into beatmap-detail-tabs 2017-03-23 17:13:02 +09:00
644e9ae9d5 Increase padding to make flyte happy. 2017-03-23 16:36:52 +09:00
6bcbd116c8 Only get APIAccess from DI (it's all we need). 2017-03-23 16:32:35 +09:00
3ae7d0cb98 Better handle the passing of Beatmap and updating of scores.
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
2017-03-23 16:31:08 +09:00
a561611125 Set default tab to global scores.
This will need to be saved to the config file eventually.
2017-03-23 16:29:10 +09:00
022fd625df Remove transitions for now
If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.
2017-03-23 16:28:45 +09:00
0863efb2c8 Remove unused variable. 2017-03-23 15:35:42 +09:00
02fba000bc Tidy up and tweak transitions of DrawableJudgementInfo. 2017-03-23 15:07:45 +09:00
88d878e1d5 Formatting 2017-03-23 02:47:27 -03:00
3d1dad8185 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 14:40:06 +09:00
b8129526a4 Typo 2017-03-23 02:29:23 -03:00
d441114011 Merge branch 'master' into taiko_playfield_2 2017-03-23 14:28:42 +09:00
e77229b34b Merge branch 'master' into beatmap-detail-tabs 2017-03-23 14:26:00 +09:00
681ed38941 Use const whenever possible. 2017-03-23 13:52:38 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
b8b45262c5 Formatting 2017-03-23 01:35:55 -03:00
67421cdf1c Even though it was 5 minutes ago what was I thinking 2017-03-23 01:34:06 -03:00
677b8afc1f Integration 2017-03-23 01:19:29 -03:00
aa2b22ff12 Fix usings. 2017-03-23 13:02:34 +09:00
c9fe9e681d Make judgement text generic to be used between game modes. 2017-03-23 12:49:28 +09:00
87b8015e8f Cleanup 2017-03-23 00:29:28 -03:00
c173c4b7ee Tab control 2017-03-23 00:22:31 -03:00
8b71d70633 Add a way to get the score string from JugementInfo. 2017-03-23 12:21:09 +09:00
39134d79a8 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 11:03:42 +09:00
1d9da8facd Merge pull request #520 from smoogipooo/use_equilateral_triangles
Update framework + use EquilateralTriangle in Triangles.
2017-03-23 10:27:21 +09:00