Commit Graph

248 Commits

Author SHA1 Message Date
6fc1384927 Merge branch 'master' into taiko-fixes 2017-04-06 16:23:22 +09:00
9260d1c24d Fix incorrect scroll time calculation. 2017-04-06 16:21:18 +09:00
4783d17d94 Merge branch 'master' into better-hitsounds 2017-04-06 16:00:56 +09:00
042aa787a5 Fix typo. 2017-04-06 13:14:52 +09:00
eb82a4c090 Back to using SampleInfo + fix taiko beatmap conversion. 2017-04-06 11:41:16 +09:00
5f79df3697 Fix lifetimes being set too late. 2017-04-06 09:57:11 +09:00
d607207b69 Ability to contain multiple sample banks. Get default bank name from control point. 2017-04-05 21:59:07 +09:00
2d8239a3f7 Re-implement the SampleBank/Sample structure. No parsing support yet. 2017-04-05 21:34:28 +09:00
3b3455afb3 Fix incorrect ScrollTime calculation. 2017-04-05 16:51:21 +09:00
a4cc7fc6af Remove unused velocity variables. 2017-04-05 16:44:45 +09:00
87b8f8ef6e Fix incorrect relative mapping for CirclePiece's content. 2017-04-05 16:28:37 +09:00
57a068c5d1 Fix notes travelling backwards when hit.
Also improves the gravity curve.
2017-04-05 15:11:51 +09:00
fcea52dd3a Fix strong drumrolls (again). 2017-04-05 13:53:07 +09:00
0e0ab6904d Distance -> Duration. 2017-04-05 13:52:53 +09:00
3f20e2381f Fix potential tick overflow. 2017-04-05 13:52:22 +09:00
abf6dbc307 BarLine : TaikoHitObject. 2017-04-05 11:48:30 +09:00
1b2713239a Rename PreEmpt to ScrollTime and remove VelocityMultiplier for now. 2017-04-05 11:48:19 +09:00
a5cb233975 Use more suffixes. 2017-04-05 10:37:49 +09:00
028e941ab2 Major rsefinements to taiko drawable classes. 2017-04-05 10:01:40 +09:00
20a5648b05 Move CreateCirclePiece to DrawableTaikoHitObject and simplify strong creation. 2017-04-04 20:58:02 +09:00
2df360a5e9 Fix clashing namespace. 2017-04-04 12:38:55 +09:00
aebd953980 Merge branch 'master' into taiko_barlines 2017-04-03 20:43:15 +09:00
a32eb66538 Fix missing speed multiplier + split onto multiple lines. 2017-04-03 17:31:08 +09:00
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
aad8851460 Define TickRate to adjust rate of ticks externally, removing todo. 2017-04-03 15:32:38 +09:00
9ba230aa58 Merge branch 'master' into taiko_barlines 2017-04-03 15:15:29 +09:00
c005cf82c1 Merge pull request #587 from smoogipooo/fix_slider_velocities
Fix slider velocities
2017-04-03 15:13:37 +09:00
c539e514f5 Merge branch 'master' into fix_slider_velocities 2017-04-03 15:08:54 +09:00
774e15b89d Set RequiredHits at conversion time to remove HitMultiplier. 2017-04-03 15:02:21 +09:00
e7b55f9bea Fix bar line pre empt time calculation. 2017-04-03 14:49:26 +09:00
759869f551 Merge branch 'fix_slider_velocities' into taiko_barlines 2017-04-03 14:47:40 +09:00
ebbf381cd6 Fix kiai not working during gameplay. 2017-04-03 14:40:12 +09:00
6e612bbefc Reduce complexity of instantiating circle pieces in hits. 2017-04-03 14:39:56 +09:00
ef992b03bf Merge remote-tracking branch 'origin/master' into taiko-fixes 2017-04-03 14:34:47 +09:00
74bd427997 Remove SliderVelocityAt, compute it manually inside hit objects. 2017-04-03 14:12:15 +09:00
8aa723b6a3 General fixes. 2017-04-03 11:05:15 +09:00
cd6fdcf029 Rename spinnerRotationRatio -> baseHitMultiplier. 2017-04-03 11:00:59 +09:00
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
0745098783 Cleanup. 2017-04-03 10:04:13 +09:00
2510a9fd32 Cleanups. 2017-04-02 02:06:58 +09:00
b4ed8aeb98 Merge remote-tracking branch 'origin/master' into taiko_barlines
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-01 23:57:02 +09:00
efb589cc08 (de)creases for misses. 2017-04-01 16:34:30 +09:00
b5ef0ae0d8 consecutiveHits -> rollingHits. 2017-04-01 16:32:31 +09:00
041e4f921a Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing 2017-04-01 14:53:25 +09:00
1110747648 Merge branch 'master' into taiko_replays 2017-03-31 17:10:56 +09:00
14fcc197e9 Merge branch 'master' into partial-judgements 2017-03-31 16:53:49 +09:00
50c328f1b4 Merge remote-tracking branch 'upstream/master' into partial-judgements
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-03-31 16:46:40 +09:00
fb6f27a439 Merge branch 'master' into taiko_replays 2017-03-31 16:11:58 +09:00
9be60e7a25 Merge branch 'master' into accented-interface 2017-03-31 15:08:22 +09:00
43c306d658 IAccented -> IHasAccentColour. 2017-03-31 15:06:31 +09:00