1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Commit Graph

3315 Commits

Author SHA1 Message Date
Jorolf
f9bf1c69bf add Flags to BarDirection and remove unused "using" 2017-04-04 18:23:29 +02:00
Jorolf
cd2fc3148e added TestCaseGraphAndBar 2017-04-04 18:10:57 +02:00
Jorolf
502afc0a48 some fixes to BarGraph so Direction works properly 2017-04-04 18:09:16 +02:00
Jorolf
b2731bb0a1 some formatting 2017-04-04 17:27:08 +02:00
Jorolf
078d44aec3 some changes to the testcase 2017-04-04 17:17:37 +02:00
Jorolf
58f8dc8254 add direction to graphs 2017-04-04 17:17:22 +02:00
Jorolf
8e689a06d8 change font 2017-04-03 23:03:49 +02:00
Jorolf
5a694e0c9d changed location of BarGraph to be more generic 2017-04-03 19:29:13 +02:00
Jorolf
f3946bebb4 Merge branch 'master' of git://github.com/ppy/osu into details 2017-04-03 18:33:47 +02:00
Dean Herbert
a742664675 Merge pull request #588 from smoogipooo/fix_slider_velocities
Fix slider velocities
2017-04-03 20:42:01 +09:00
smoogipooo
2e80ecfda8 Don't need explicit null value. 2017-04-03 20:33:10 +09:00
smoogipooo
5cb16f6e7c Renamings + comments. 2017-04-03 20:32:03 +09:00
smoogipooo
15db37d9e0 Cleanup. 2017-04-03 20:27:25 +09:00
smoogipooo
2be7458532 Commenting (+ version check for speed adjustment). 2017-04-03 20:27:11 +09:00
smoogipooo
19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
smoogipooo
91eec9e8fc Fix incorrect split hit circle start time. 2017-04-03 17:54:48 +09:00
smoogipooo
a32eb66538 Fix missing speed multiplier + split onto multiple lines. 2017-04-03 17:31:08 +09:00
smoogipooo
0c57299066 Rewrite drum roll -> hit conversion to match osu-stable. 2017-04-03 17:30:49 +09:00
smoogipooo
d7ed392f27 Add a velocity multiplier to taiko hit objects.
This will be usable from the editor moving forward also - where every hit object can have its own velocity multiplier on top of the control point one.
2017-04-03 17:19:46 +09:00
smoogipooo
aad8851460 Define TickRate to adjust rate of ticks externally, removing todo. 2017-04-03 15:32:38 +09:00
smoogipooo
293ea6fbd7 Fix up beatmap converter error. 2017-04-03 15:24:30 +09:00
smoogipooo
63ca68793e Merge remote-tracking branch 'origin/master' into fix_slider_velocities 2017-04-03 15:23:02 +09: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
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
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