Dean Herbert
d7426bdc32
Merge branch 'master' into taiko_drumroll_tick_judgements
2017-03-24 09:09:16 +09:00
Dean Herbert
f218066f83
Merge branch 'master' into parallax-requires-position
2017-03-23 22:52:06 +09:00
Dean Herbert
1c404cba5c
Update framework.
2017-03-23 22:42:50 +09:00
Dean Herbert
0bcb463acf
ParallaxContainer should always know the mouse position.
2017-03-23 22:42:40 +09:00
Dan Balasescu
c533650c26
Merge branch 'master' into song-select-improvements
2017-03-23 20:36:18 +09:00
Dean Herbert
c52ad6c6ee
Attempt to speed up CI by excluding some file types from analysis.
2017-03-23 20:34:24 +09:00
smoogipooo
c3adbb9b41
Fix nullref.
2017-03-23 20:34:11 +09:00
Dan Balasescu
8901d6137e
Merge branch 'master' into song-select-improvements
2017-03-23 20:25:38 +09:00
smoogipooo
60dcf2d14d
Make readonly.
2017-03-23 19:43:49 +09:00
smoogipooo
315deb6f12
Fix post-merge errors.
2017-03-23 19:43:00 +09:00
smoogipooo
217fd14595
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
2017-03-23 19:40:14 +09:00
smoogipooo
a0c0a0fcfe
Fix post-merge errors.
2017-03-23 19:39:30 +09:00
smoogipooo
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
smoogipooo
35f1f06ee2
Rename drum roll tick judgement.
2017-03-23 19:36:58 +09:00
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting.
2017-03-23 19:35:46 +09:00
smoogipooo
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
Dan Balasescu
672fda79bd
Merge pull request #543 from peppy/rename-judgement-info
...
JudgementInfo -> Judgement.
2017-03-23 19:34:43 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie.
2017-03-23 19:32:58 +09:00
smoogipooo
322a78830e
Implement Taiko score processing.
2017-03-23 19:24:23 +09:00
smoogipooo
768bc2bb5f
Make TaikoHitObject store whether the hit object is a finisher.
2017-03-23 19:14:21 +09:00
Dean Herbert
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
Dean Herbert
93915ba527
Fix regression of osu! judgement animation.
2017-03-23 18:56:27 +09:00
smoogipooo
7d3846692a
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
2017-03-23 17:58:12 +09:00
smoogipooo
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
Dan Balasescu
2d5bb326f0
Merge branch 'master' into taiko_drumroll_drawable
2017-03-23 17:55:08 +09:00
smoogipooo
0ac33b59e3
Add DrumRoll tick judgement info.
2017-03-23 17:52:46 +09:00
Dean Herbert
6e42a75fca
Merge pull request #541 from smoogipooo/use_more_accentcolour
...
Use more accentcolour
2017-03-23 17:42:50 +09:00
Dean Herbert
770188fee1
Merge pull request #512 from smoogipooo/taiko_hitobject_drawable
...
Base DrawableTaikoHitObject Implementation
2017-03-23 17:42:34 +09:00
Dean Herbert
19e438566f
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:36:50 +09:00
Dean Herbert
d52ac33e7c
Merge branch 'master' into use_more_accentcolour
2017-03-23 17:36:19 +09:00
Dean Herbert
a61cb078e3
Increase timeout on IPC wait.
2017-03-23 17:32:57 +09:00
Dean Herbert
96fc8eef30
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:23:22 +09:00
Dean Herbert
76ae3a8a03
Merge pull request #503 from smoogipooo/taiko_conversion
...
Taiko conversion
2017-03-23 17:21:18 +09:00
Dan Balasescu
50543a164c
Merge pull request #539 from DrabWeb/beatmap-detail-tabs
...
Beatmap detail area
2017-03-23 17:20:47 +09:00
Dean Herbert
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
Dan Balasescu
e9a061c709
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 17:13:02 +09:00
Dean Herbert
4644f6afdb
Fix SliderBody's accent colour and thread-safety.
2017-03-23 17:11:51 +09:00
Dean Herbert
554b36c6eb
Merge branch 'master' into taiko_conversion
2017-03-23 16:57:23 +09:00
Dean Herbert
43032ef694
Fix missing class renames.
2017-03-23 16:56:42 +09:00
Dean Herbert
1766497728
Update framework.
2017-03-23 16:53:39 +09:00
Dean Herbert
1e1c46765a
Merge branch 'master' into taiko_conversion
2017-03-23 16:52:15 +09:00
Dean Herbert
315994f2b3
Merge pull request #538 from smoogipooo/taiko_base_hit
...
Add Hit class, make TaikoHitObject abstract.
2017-03-23 16:51:45 +09:00
Dean Herbert
644e9ae9d5
Increase padding to make flyte happy.
2017-03-23 16:36:52 +09:00
Dean Herbert
6bcbd116c8
Only get APIAccess from DI (it's all we need).
2017-03-23 16:32:35 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
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
smoogipooo
2c76a2350c
Use AccentColour everywhere in drawable osu! hit objects.
2017-03-23 16:19:12 +09:00
Dan Balasescu
cb51256bd4
Merge pull request #517 from smoogipooo/taiko_playfield_2
...
Taiko Playfield Implementation
2017-03-23 15:43:59 +09:00
Dean Herbert
0863efb2c8
Remove unused variable.
2017-03-23 15:35:42 +09:00
