Andrey Zavadskiy
e51fdd3c86
Added container whose visibility will be changable
2017-04-03 11:41:17 +03:00
Andrey Zavadskiy
8d28c54ff3
Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
2017-04-03 11:07:14 +03:00
Dean Herbert
c005cf82c1
Merge pull request #587 from smoogipooo/fix_slider_velocities
...
Fix slider velocities
2017-04-03 15:13:37 +09:00
Dean Herbert
8fb92e6754
Merge pull request #586 from smoogipooo/taiko-fixes
...
Taiko fixes
2017-04-03 15:09:51 +09:00
Dean Herbert
c539e514f5
Merge branch 'master' into fix_slider_velocities
2017-04-03 15:08:54 +09:00
smoogipooo
a03cffab58
No need to compute end time manually anymore.
2017-04-03 15:05:12 +09:00
smoogipooo
774e15b89d
Set RequiredHits at conversion time to remove HitMultiplier.
2017-04-03 15:02:21 +09:00
Dean Herbert
6043c4787b
Merge branch 'master' into taiko-fixes
2017-04-03 14:47:43 +09:00
Dean Herbert
486e14e0f6
Merge pull request #570 from smoogipooo/taiko-drawable-generation
...
Taiko drawable generation
2017-04-03 14:45:51 +09:00
smoogipooo
ebbf381cd6
Fix kiai not working during gameplay.
2017-04-03 14:40:12 +09:00
smoogipooo
6e612bbefc
Reduce complexity of instantiating circle pieces in hits.
2017-04-03 14:39:56 +09:00
smoogipooo
ef992b03bf
Merge remote-tracking branch 'origin/master' into taiko-fixes
2017-04-03 14:34:47 +09:00
smoogipooo
501d52dd89
Good catch resharper 👍 .
2017-04-03 14:28:28 +09:00
smoogipooo
6a3601efdc
Fix post-merge errors.
2017-04-03 14:22:22 +09:00
smoogipooo
27132958c8
Merge remote-tracking branch 'origin/master' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-03 14:19:31 +09:00
smoogipooo
74bd427997
Remove SliderVelocityAt, compute it manually inside hit objects.
2017-04-03 14:12:15 +09:00
Dean Herbert
83322dc5cb
Merge branch 'master' into hud_visibility
2017-04-03 11:51:11 +09:00
smoogipooo
ffe4d0ae4a
Remove BeatDistanceAt (does not express distance) and BeatVelocityAt.
2017-04-03 11:48:42 +09:00
smoogipooo
f1b0a12ee3
Rename BPMMultiplierAt -> SpeedMultiplierAt.
2017-04-03 11:48:15 +09:00
Dean Herbert
b8dbc697f0
Merge pull request #564 from smoogipooo/taiko_drumroll_drawing
...
Taiko drumroll drawing
2017-04-03 11:18:04 +09:00
Dean Herbert
8ae4d0f7a7
Merge branch 'master' into taiko_drumroll_drawing
2017-04-03 11:10:47 +09:00
smoogipooo
8aa723b6a3
General fixes.
2017-04-03 11:05:15 +09:00
smoogipooo
cd6fdcf029
Rename spinnerRotationRatio -> baseHitMultiplier.
2017-04-03 11:00:59 +09:00
smoogipooo
3920758981
Rename all occurrences of finishers to strong.
2017-04-03 10:59:49 +09:00
smoogipooo
33e10adfa6
Rewrite beatmap conversion to allow converting sliders to normal hits.
2017-04-03 10:54:13 +09:00
smoogipooo
3b672fd842
Lengthen drum rolls as required by conversion.
2017-04-03 10:29:35 +09:00
smoogipooo
b027d0d3b4
Changing duration is wrong, add HitMultiplier.
...
I don't know if this is the best way to handle this/if there's a better way, but this seems pretty sane?
This could be expanded on in the future to make swells harder/require more hits with a smaller duration.
2017-04-03 10:28:52 +09:00
smoogipooo
1a66755694
Fix second hit displaying two judgements, move hitobjects above playfield when hit.
2017-04-03 10:20:20 +09:00
Dan Balasescu
0e52bead75
Merge pull request #582 from peppy/general-fixes
...
Update async load usage to new style.
2017-04-03 09:41:29 +09:00
Andrey Zavadskiy
ed476a79f8
Move posting notification in HudOverlay
2017-04-02 16:18:01 +03:00
Dean Herbert
263374a357
Remove unnecessary using.
2017-04-02 17:11:31 +09:00
Dean Herbert
a7f48e0eda
Update framework.
2017-04-02 17:07:25 +09:00
Dean Herbert
bfa2e68bfb
Container->Wrapper.
2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Andrey Zavadskiy
9d027a61cd
Move input to HudOverlay
2017-04-01 14:46:45 +03:00
Andrey Zavadskiy
06850f7e1f
Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
2017-04-01 14:04:48 +03:00
smoogipooo
efb589cc08
(de)creases for misses.
2017-04-01 16:34:30 +09:00
smoogipooo
b5ef0ae0d8
consecutiveHits -> rollingHits.
2017-04-01 16:32:31 +09:00
Dean Herbert
d1e3bbb5f4
Don't call Reset() from within TestCaseTaikoHitObjects.
2017-04-01 16:16:34 +09:00
Dean Herbert
782c6bf28e
Remove unnecessary usings.
2017-04-01 16:07:54 +09:00
Dean Herbert
d610b9e884
Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-04-01 16:02:32 +09:00
Dan Balasescu
9bd19e99ee
Merge pull request #579 from peppy/general-fixes
...
Framework & VisualTests update
2017-04-01 15:44:13 +09:00
Dean Herbert
062d99607b
Merge branch 'master' into general-fixes
2017-04-01 15:40:20 +09:00
Dean Herbert
041e4f921a
Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing
2017-04-01 14:53:25 +09:00
Andrey Zavadskiy
d7c39a00b4
Hud Visibility
2017-03-31 16:43:31 +03:00
Dean Herbert
904efb2916
Update framework again.
2017-03-31 18:13:24 +09:00
Dean Herbert
01538ed7d7
Fix nullref.
2017-03-31 18:05:24 +09:00
Dean Herbert
2b847aa2f4
Bring VisualTests up-to-date.
2017-03-31 18:00:14 +09:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox.
2017-03-31 17:38:33 +09:00
Dean Herbert
ba7f1233b3
Merge pull request #568 from smoogipooo/taiko_replays
...
Taiko replays
2017-03-31 17:27:25 +09:00
