1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:42:54 +08:00
Commit Graph

76 Commits

Author SHA1 Message Date
Dean Herbert
03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
Dean Herbert
b78c516b74 Merge branch 'master' into scoring-revamp 2017-09-13 20:47:14 +09:00
smoogipooo
093d82ac45 Set depths from playfield add methods instead of DrawableHitObject 2017-09-13 16:17:01 +09:00
smoogipooo
d83a2d4dc6 Disable masking optimisations for scrolling hit objects
Lifetime is very tightly controlled here, so all should be okay.
2017-09-13 15:57:40 +09:00
smoogipooo
d5bd005c01 Remove unused code for now
I don't think we'll ever be using this anyway.
2017-09-12 18:52:15 +09:00
smoogipooo
92b3e203e8 judgementOccurred should be passed upwards
So only one hit object is ever judged in a single frame.
2017-09-12 18:50:30 +09:00
smoogipooo
a38e0062a4 Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement. 2017-09-12 18:49:50 +09:00
Dean Herbert
f32d444d68 Remove generics from Playfield (fixes catch) 2017-09-12 18:19:28 +09:00
Dean Herbert
d7ac02d090 Ensure judgements aren't updated when ArmedState is not idle 2017-09-12 18:00:41 +09:00
Dean Herbert
1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
smoogipooo
d6bf5c38b7 Move Kiai bool to HitObject. 2017-09-12 10:01:07 +09:00
Dean Herbert
7b92bbfa86 Merge branch 'master' into mania-hit-explosions 2017-09-11 17:34:14 +09:00
smoogipooo
0cadee998c Set default AccentColour for hit objects 2017-09-11 13:44:05 +09:00
smoogipooo
2086ed209d Fix hold note tick input. 2017-09-11 04:51:44 +09:00
smoogipooo
0cc443e618 Remove all generic judgements. 2017-09-06 18:05:51 +09:00
smoogipooo
f158ce814c Fix state never getting set. 2017-09-06 17:20:41 +09:00
smoogipooo
ac8ec31b61 Make judgements able to be "added" plus make everything compile and run. 2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5 Combine Judgement.HitResults into one. 2017-09-06 17:01:48 +09:00
Dean Herbert
52dadad1e1 Merge branch 'master' into fix-taiko-barlines 2017-08-21 16:46:25 +09:00
smoogipooo
7a5708ce92 Further support for null judgements. 2017-08-21 15:35:16 +09:00
smoogipooo
6a7b410bc3 Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147 2017-08-21 11:58:54 +09:00
Dean Herbert
bc7621607a Merge upstream/master in. 2017-08-18 22:20:45 +09:00
MillhioreF
e42c279229 More generic catching for broken hitobject strings 2017-08-10 01:50:20 -05:00
MillhioreF
c16dbc05aa Add new error for malformed (too many variables) hit objects during import 2017-08-09 23:41:22 -05:00
smoogipooo
d83c218e08 Remove various scrolling container optimisations (removing when not alive). 2017-08-09 16:19:09 +09:00
Dean Herbert
ee7bb1b4f5 Don't set RelativePositionAxes when setting ScrollingAxes
(cherry picked from commit debe13629f)
2017-08-08 13:02:23 +09:00
smoogipooo
f3c05fe232 CI fixes. 2017-08-07 17:34:57 +09:00
smoogipooo
933740664c SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming. 2017-08-07 16:43:54 +09:00
smoogipooo
a3efca9c35 Reduce implementation overhead in actually positioning hitobjects and making them scroll. 2017-08-07 16:02:38 +09:00
smoogipooo
e1dfe364b2 Fix lifetime performance regression. 2017-08-07 14:07:49 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
smoogipooo
3389c8a4dc CI fixes. 2017-06-21 20:17:15 +09:00
smoogipooo
34ac932fe2 Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject. 2017-06-19 10:54:23 +09:00
smoogipooo
28e48eab2b CI fixes. 2017-06-16 19:30:30 +09:00
smoogipooo
4afe83e74e Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
2017-06-16 19:21:54 +09:00
smoogipooo
c137ee822c Give velocity a sane default value. 2017-05-29 12:19:51 +09:00
smoogipooo
231b1ae610 We don't need a curve. 2017-05-29 12:19:38 +09:00
smoogipooo
6101fe98e1 Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state. 2017-05-29 12:10:29 +09:00
smoogipooo
cd1da469c7 Cleanup + actually fix possible nullrefs. 2017-05-29 11:14:37 +09:00
smoogipooo
9e5a53aae7 Fix possible nullrefs. 2017-05-29 10:53:55 +09:00
smoogipooo
3ec41a313b Add base DrawableHitObject + HitObjectStartTimeComparer. 2017-05-26 18:48:18 +09:00
smoogipooo
c2d3b6c05a Remove late initialization of head + tail, keep them updated with start time and end time. 2017-05-26 15:53:49 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
9565bb9572 Fix hold notes - remove glow for now.
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
smoogipooo
17466a662c Add hold note conversion. 2017-05-17 13:09:07 +09:00
Dean Herbert
6fd95e0c52 Fix post-merge breakage 2017-05-11 17:16:01 +09:00
Dean Herbert
bc54b3c85f Merge branch 'master' into mania-notes 2017-05-11 17:13:29 +09:00
Dean Herbert
b0e522345c Combine DrawableHitObject classes into one 2017-05-11 17:07:46 +09:00