818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
144812669d
Use static local functions.
2019-11-12 19:56:54 +08:00
dcfa98414f
Use ??=.
2019-11-12 19:56:51 +08:00
31cc0d13da
Use 'out var'.
2019-11-12 19:55:26 +08:00
758c304d92
Merge branch 'master' into fallback-to-skin-combo-colours
2019-11-12 19:00:05 +09:00
3f8928ca25
Suppress warnings
2019-11-12 13:41:54 +09:00
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
e9b8cbb516
Apply other styles.
2019-11-11 20:27:04 +08:00
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
b4cb4c1243
Remove previous samples on change
2019-11-08 16:19:55 +09:00
a9b4106075
Remove unnecessary (for now) scheduling
2019-11-08 16:19:43 +09:00
53e6186b6d
Fix drawable hitobject samples not updating
2019-11-08 14:59:47 +09:00
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
cee16e9419
Merge remote-tracking branch 'refs/remotes/upstream/master' into fallback-to-skin-combo-colours
2019-11-07 19:11:29 +03:00
808543885f
Change ComboColours type to IReadOnlyList<Color4>
...
Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)
2019-11-07 15:54:30 +03:00
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration
2019-10-21 18:44:34 +09:00
9f004186d5
Ensure DrawableHitObject's HitObject is not null
2019-10-21 17:56:39 +09:00
b157aaead1
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:09:43 +09:00
dc222b5e4d
Add common path for duplicated code
2019-10-21 13:52:55 +09:00
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
89f50b26f7
Fix hitobject combo colour potentially not getting adjusted
2019-10-18 17:32:11 +09:00
5d3d25d3b6
Make method private for now
2019-10-18 13:24:28 +09:00
9a896d52bf
Fix nested hitobjects not updating
2019-10-18 13:18:41 +09:00
f429a8f7c2
Add back/obsolete old AddNested() method
2019-10-17 14:02:08 +09:00
d8f3678c3c
Rename parameter
2019-10-17 12:53:54 +09:00
8d7453c251
Rework construction of nested hitobjects
2019-10-16 22:10:50 +09:00
ad6b8d3e04
Add result offset bounding to result itself, rather than just transforms
2019-10-09 19:08:55 +09:00
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
897b3233af
Add start time tracking to EditorBeatmap
2019-10-03 14:23:48 +09:00
45f2bcc440
Fix combo bindings not being bound to nested hitobjects
2019-09-26 17:39:19 +09:00
706e884cc0
Update accent colour on combo index change
2019-09-26 17:13:13 +09:00
bbf0544a8d
Add bindables for IHasComboInformation properties
2019-09-26 16:55:08 +09:00
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… ( #6236 )
...
Fix mania scrolling speed not including beatmap slider multiplier
Co-authored-by: Dean Herbert <pe@ppy.sh >
2019-09-25 22:34:46 +09:00
9323df26a1
Decouple bar line hitobjects from generator
...
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.
This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
75cceb9e30
Fix LifetimeChanged being invoked before lifetime is set
2019-09-24 16:47:34 +09:00
762adb783a
Fix duplicate invocation of updateState on load complete
2019-09-19 14:15:06 +09:00
5901a915e7
Always update drawable hitobject state on skin change
2019-09-18 20:19:57 +09:00
b81b162ee1
Update InitialLifetimeOffset comment
2019-09-12 19:30:27 +09:00
9fc60aeefc
Merge branch 'master' into reset-dho-lifetimes
2019-09-12 19:29:14 +09:00
f21e47d6d2
Move expire to DrawableHitObject
2019-09-12 19:29:08 +09:00
af3bb5a2cd
Centralise and share bar line generation code between rulesets
2019-09-10 13:30:54 +09:00
7f2d14416a
Reset DrawableHitObject lifetimes on state change
2019-09-07 14:44:44 +09:00
a50284a5eb
Merge pull request #6019 from peppy/hit-window-refactor
...
Refactor HitWindows for legibility
2019-09-06 16:10:04 +09:00
c379480e7b
Merge branch 'master' into remove-judgement-occurred
2019-09-06 15:32:34 +09:00
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
07f662071d
Remove judgementOccurred
2019-09-04 18:14:55 +09:00
bebc3309ce
Refactor skin configuration to be infinitely extensible
2019-09-03 17:57:34 +09:00
1e7528c2b3
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-02 19:13:00 +09:00
f20e07136a
Add attribute to catch potential future nullrefs
2019-09-02 17:48:41 +09:00
