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
Dean Herbert
ebb64e01d1
Add constant for HitTarget line thickness and make slightly thicker (displays better at lower resolutions).
2017-03-23 15:32:41 +09:00
Dean Herbert
ef8830aa7f
Adjust InputDrum's appearance a touch.
2017-03-23 15:28:17 +09:00
Dean Herbert
1af17fc108
Remove cross-reference to osu.Game.Modes.Osu from Taiko.
2017-03-23 15:12:08 +09:00
Dean Herbert
b83db18551
HitExplosion -> DrawableOsuJudgementInfo.
2017-03-23 15:11:22 +09:00
Dean Herbert
02fba000bc
Tidy up and tweak transitions of DrawableJudgementInfo.
2017-03-23 15:07:45 +09:00
Dean Herbert
acfa4a4aac
JudgementText -> DrawableTaikoJudgementInfo.
2017-03-23 14:52:18 +09:00
DrabWeb
88d878e1d5
Formatting
2017-03-23 02:47:27 -03:00
smoogipooo
16787a6ac2
Merge branch 'taiko_hitobject_drawable' into use_more_accentcolour
2017-03-23 14:41:43 +09:00
smoogipooo
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
Dean Herbert
9a3fd8bcf1
Add readonly attributes.
2017-03-23 14:37:00 +09:00
Dan Balasescu
a40338614a
Merge branch 'master' into taiko_note_circle
2017-03-23 14:29:24 +09:00
DrabWeb
b8129526a4
Typo
2017-03-23 02:29:23 -03:00
Dean Herbert
d441114011
Merge branch 'master' into taiko_playfield_2
2017-03-23 14:28:42 +09:00
Dean Herbert
acfa0c4762
Merge branch 'master' into taiko_base_hit
2017-03-23 14:26:35 +09:00
Dean Herbert
63948564c6
Merge branch 'master' into taiko_conversion
2017-03-23 14:26:24 +09:00
Dean Herbert
e77229b34b
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 14:26:00 +09:00
Dean Herbert
afb4019921
Merge pull request #540 from peppy/enforce_private_readonly
...
Enforce readonly private members where possible.
2017-03-23 14:17:52 +09:00
Dean Herbert
41dddcfc2f
Update framework.
2017-03-23 14:08:35 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5
Formatting
2017-03-23 01:35:55 -03:00
DrabWeb
67421cdf1c
Even though it was 5 minutes ago what was I thinking
2017-03-23 01:34:06 -03:00
DrabWeb
8c99a8b103
Remove visual test(pretty useless)
2017-03-23 01:25:30 -03:00
smoogipooo
8e1eef25b4
Fix some lone newlines.
2017-03-23 13:20:17 +09:00
DrabWeb
677b8afc1f
Integration
2017-03-23 01:19:29 -03:00
smoogipooo
aa2b22ff12
Fix usings.
2017-03-23 13:02:34 +09:00
smoogipooo
cedcab1e26
s/Ring/Hit + privatize Judgement inside RingExplosion.
2017-03-23 13:02:01 +09:00
smoogipooo
00054f1573
Comment out unused container for now.
2017-03-23 12:56:32 +09:00
smoogipooo
7f33e10db0
Renaming + don't use List.
2017-03-23 12:53:38 +09:00
