c3adbb9b41
Fix nullref.
2017-03-23 20:34:11 +09: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
60dcf2d14d
Make readonly.
2017-03-23 19:43:49 +09:00
315deb6f12
Fix post-merge errors.
2017-03-23 19:43:00 +09:00
217fd14595
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
2017-03-23 19:40:14 +09:00
a0c0a0fcfe
Fix post-merge errors.
2017-03-23 19:39:30 +09:00
938f5eaf58
Dragging
2017-03-23 07:38:08 -03:00
99cd215f56
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
...
Conflicts:
osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
2017-03-23 19:38:00 +09:00
35f1f06ee2
Rename drum roll tick judgement.
2017-03-23 19:36:58 +09:00
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting.
2017-03-23 19:35:46 +09:00
11fb404574
Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 19:35:36 +09:00
672fda79bd
Merge pull request #543 from peppy/rename-judgement-info
...
JudgementInfo -> Judgement.
2017-03-23 19:34:43 +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
322a78830e
Implement Taiko score processing.
2017-03-23 19:24:23 +09: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
768bc2bb5f
Make TaikoHitObject store whether the hit object is a finisher.
2017-03-23 19:14:21 +09: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
7d3846692a
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
2017-03-23 17:58:12 +09:00
71c74ee4c2
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
...
Conflicts:
osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgementInfo.cs
2017-03-23 17:55:52 +09:00
2d5bb326f0
Merge branch 'master' into taiko_drumroll_drawable
2017-03-23 17:55:08 +09:00
0ac33b59e3
Add DrumRoll tick judgement info.
2017-03-23 17:52:46 +09:00
4d61424abd
Merge branch 'master' into song-progress-graph
2017-03-23 17:44:22 +09:00
6e42a75fca
Merge pull request #541 from smoogipooo/use_more_accentcolour
...
Use more accentcolour
2017-03-23 17:42:50 +09:00
770188fee1
Merge pull request #512 from smoogipooo/taiko_hitobject_drawable
...
Base DrawableTaikoHitObject Implementation
2017-03-23 17:42:34 +09:00
19e438566f
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:36:50 +09:00
d52ac33e7c
Merge branch 'master' into use_more_accentcolour
2017-03-23 17:36:19 +09:00
a61cb078e3
Increase timeout on IPC wait.
2017-03-23 17:32:57 +09:00
96fc8eef30
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:23:22 +09:00
76ae3a8a03
Merge pull request #503 from smoogipooo/taiko_conversion
...
Taiko conversion
2017-03-23 17:21:18 +09:00
50543a164c
Merge pull request #539 from DrabWeb/beatmap-detail-tabs
...
Beatmap detail area
2017-03-23 17:20:47 +09:00
0785dd8528
Change default OsuHitObject combo colour to gray
...
This makes it easier to see additive elements in testcases.
2017-03-23 17:15:39 +09:00
e9a061c709
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 17:13:02 +09:00
4644f6afdb
Fix SliderBody's accent colour and thread-safety.
2017-03-23 17:11:51 +09:00
554b36c6eb
Merge branch 'master' into taiko_conversion
2017-03-23 16:57:23 +09:00
43032ef694
Fix missing class renames.
2017-03-23 16:56:42 +09:00
1766497728
Update framework.
2017-03-23 16:53:39 +09:00
1e1c46765a
Merge branch 'master' into taiko_conversion
2017-03-23 16:52:15 +09:00
315994f2b3
Merge pull request #538 from smoogipooo/taiko_base_hit
...
Add Hit class, make TaikoHitObject abstract.
2017-03-23 16:51:45 +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
