smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
Kyle Chang
|
6d00aff9fd
|
Add type parameter to IApplicableToBeatmap
|
2018-10-30 00:13:33 -04:00 |
|
Kyle Chang
|
df6fc4013a
|
Add interface to adjust Beatmaps
|
2018-10-28 02:21:25 -04:00 |
|
smoogipoo
|
9656186b64
|
Make the hitobject masks move within their placement/selection
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
|
2018-10-26 13:45:31 +09:00 |
|
smoogipoo
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|
smoogipoo
|
060cc24dba
|
Cleanup slidercurve calculation
|
2018-10-16 11:11:04 +09:00 |
|
smoogipoo
|
5095fbcdf7
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-16 10:27:18 +09:00 |
|
Dean Herbert
|
468f7fd1ea
|
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
|
2018-10-12 19:25:08 +09:00 |
|
Dean Herbert
|
ad42f2244d
|
Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer
|
2018-10-12 19:15:11 +09:00 |
|
Dean Herbert
|
1de770e093
|
Merge branch 'master' into fix-sv
|
2018-10-12 18:13:50 +09:00 |
|
smoogipoo
|
e130204a3b
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-12 12:26:15 +09:00 |
|
Dean Herbert
|
5d26c1b771
|
Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
Various performance improvements around hitobjects
|
2018-10-11 22:16:48 +09:00 |
|
smoogipoo
|
d282d16e1c
|
Use SortedList again
|
2018-10-11 20:49:12 +09:00 |
|
smoogipoo
|
83fd251c7b
|
Pass sub-controlpoints as span slices
|
2018-10-11 17:44:25 +09:00 |
|
Dean Herbert
|
1b6f37f3eb
|
Merge branch 'master' into wiggle-repeat-points
|
2018-10-10 19:42:10 +09:00 |
|
Dean Herbert
|
ed0dcb2e73
|
Add comment explaining why
|
2018-10-10 19:41:40 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
smoogipoo
|
f53bb81723
|
Remove unnecessary lambda allocation
|
2018-10-10 14:58:54 +09:00 |
|
smoogipoo
|
417ebaeb85
|
Reduce hitobject size by removing lazy
|
2018-10-10 13:03:18 +09:00 |
|
smoogipoo
|
1125075b37
|
Use list with post-sort for nested hitobjects
|
2018-10-10 13:02:27 +09:00 |
|
Dean Herbert
|
06ea174f34
|
Merge branch 'master' into fix-sv
|
2018-10-09 18:00:34 +09:00 |
|
smoogipoo
|
ff559a3a1b
|
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-10-05 10:40:16 +09:00 |
|
ekrctb
|
b9d0fc927b
|
Remove duplicated code
|
2018-10-04 18:03:34 +09:00 |
|
Dean Herbert
|
593dee202c
|
Fix gameplay mouse button disable setting no longer having any effect
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
|
2018-10-04 03:07:00 +09:00 |
|
ekrctb
|
b7a2ad1aa5
|
Use UIEvent level getters for modifier keys.
|
2018-10-02 13:26:36 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
Dan Balasescu
|
0f51007867
|
Merge branch 'master' into judgement-cleanup
|
2018-10-02 09:37:04 +09:00 |
|
Dan Balasescu
|
87d8945af9
|
Give the body a size
|
2018-10-02 09:33:31 +09:00 |
|
smoogipoo
|
b68eeae777
|
Fix scrolling rulesets not accounting for slider multiplier
|
2018-10-01 18:12:30 +09:00 |
|
Hanamuke
|
6c1b3cf1a5
|
Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch
|
2018-09-30 16:09:27 +02:00 |
|
Hanamuke
|
b983e20067
|
Merge branch 'master' into AR_Catch
|
2018-09-30 16:01:55 +02:00 |
|
Kyle Chang
|
88b0c234cc
|
Move judgement text to internal container
|
2018-09-30 04:01:33 -04:00 |
|
Dean Herbert
|
d3eb24e70a
|
Fix score retrieval no longer working
|
2018-09-28 18:29:49 +09:00 |
|
Dean Herbert
|
2ed7785cfc
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-26 19:50:48 +09:00 |
|
Dean Herbert
|
a77a55d71d
|
Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework
|
2018-09-26 19:49:41 +09:00 |
|
Dan Balasescu
|
3a5e380e46
|
Merge branch 'master' into judgement-size-fix
|
2018-09-26 18:36:12 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Paul Teng
|
319ed1bf0f
|
Reorder if statement
|
2018-09-24 21:35:13 -04:00 |
|
Paul Teng
|
dd36b6a381
|
Remove unused field storage
|
2018-09-24 21:08:58 -04:00 |
|
Paul Teng
|
b95cc798b2
|
Remove unused fallback
|
2018-09-24 20:56:18 -04:00 |
|
Paul Teng
|
62df0ec7d4
|
Handle external files with File instead
|
2018-09-24 07:16:19 -04:00 |
|
Kyle Chang
|
7a43677849
|
Make judgements scale with cs
|
2018-09-22 22:54:38 -04:00 |
|
smoogipoo
|
0bc2bcaf14
|
Remove GetAspectAdjustedSize() and PlayfieldArea
|
2018-09-21 15:14:49 +09:00 |
|
smoogipoo
|
368ceec47c
|
Simplify creation of a playfield
|
2018-09-21 14:35:50 +09:00 |
|
smoogipoo
|
826dc6ceb7
|
Make Playfield not a ScalableContainer
|
2018-09-21 14:02:32 +09:00 |
|
Dan Balasescu
|
4b907336c5
|
Move readonly field above ctor
|
2018-09-20 13:17:17 +09:00 |
|
Hanamuke
|
309d8c8cb4
|
CI
|
2018-09-19 18:43:39 +02:00 |
|
Hanamuke
|
e7d78b94ae
|
Remove ScrollingVisualisation from settings
|
2018-09-19 18:30:25 +02:00 |
|
ekrctb
|
a3e6973b41
|
Replace usage of now removed TriggerKeyPress and similar methods.
|
2018-09-19 11:36:55 +09:00 |
|