smoogipoo
|
27d82052f4
|
BorderLayer -> EditorPlayfieldBorder
|
2018-11-06 18:10:46 +09:00 |
|
smoogipoo
|
85f96ad62f
|
Fix a few missed renames
|
2018-11-06 18:07:53 +09:00 |
|
smoogipoo
|
bd775af274
|
PlacementMask -> PlacementBlueprint
|
2018-11-06 18:04:03 +09:00 |
|
smoogipoo
|
11be820efe
|
CreateMaskFor -> CreateBlueprintFor
|
2018-11-06 18:03:21 +09:00 |
|
smoogipoo
|
90c813618a
|
Merge PlacementContainer into BlueprintContainer
|
2018-11-06 18:02:55 +09:00 |
|
smoogipoo
|
f2a5f28ea2
|
SelectionMask -> SelectionBlueprint
|
2018-11-06 17:56:04 +09:00 |
|
smoogipoo
|
ad2836a61e
|
MaskSelection -> SelectionBox
|
2018-11-06 17:52:47 +09:00 |
|
smoogipoo
|
26c9390c16
|
HitObjectMaskLayer -> BlueprintContainer
|
2018-11-06 17:36:10 +09:00 |
|
smoogipoo
|
ace1dce281
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
|
2018-11-05 18:10:22 +09:00 |
|
smoogipoo
|
92d570342c
|
Fix sample additions not falling back to non-addition bank
|
2018-11-05 17:35:24 +09:00 |
|
smoogipoo
|
a4caaf56ef
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
|
2018-11-05 16:38:28 +09:00 |
|
smoogipoo
|
1fffa48aa0
|
Sort nested hitobjects post-creation
|
2018-11-05 12:15:45 +09:00 |
|
Dean Herbert
|
e6ee3dc73e
|
Use framework helper functions for path approximation
|
2018-11-02 19:26:29 +09:00 |
|
smoogipoo
|
1aae123ff5
|
Make approximators share an interface
|
2018-11-01 19:16:44 +09:00 |
|
Dean Herbert
|
c1304eca1b
|
Merge remote-tracking branch 'upstream/master' into slider-placement
|
2018-11-01 17:59:37 +09:00 |
|
Dean Herbert
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
Dean Herbert
|
9cb4374b51
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-11-01 02:37:31 +09:00 |
|
Dean Herbert
|
85a7325911
|
Fix placement masks handling scroll events
|
2018-10-31 17:23:27 +09:00 |
|
Dean Herbert
|
d38bf38606
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-10-31 15:23:30 +09:00 |
|
Dean Herbert
|
3207a585c6
|
Add missing xmldoc
|
2018-10-31 12:01:10 +09:00 |
|
Dean Herbert
|
b28c0cd128
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 06:46:48 +09:00 |
|
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 |
|
smoogipoo
|
08b16be3b8
|
Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
|
2018-10-29 15:55:38 +09:00 |
|
smoogipoo
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +09:00 |
|
smoogipoo
|
a9f1484e8b
|
Fix some post-rebase issues
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
8b36d9b482
|
Remove SliderCurve.Offset (unused)
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
b3e105ba93
|
Make curve approximators implement common interface
|
2018-10-29 15:26:07 +09:00 |
|
Kyle Chang
|
df6fc4013a
|
Add interface to adjust Beatmaps
|
2018-10-28 02:21:25 -04:00 |
|
smoogipoo
|
f674fcf2c8
|
Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
|
2018-10-26 14:05:30 +09: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
|
2b141a2bc1
|
Make PlacementMask abstract
|
2018-10-25 19:10:59 +09:00 |
|
smoogipoo
|
ea6db8b793
|
Make the hitobject masks move within their placement/selection
|
2018-10-25 18:16:25 +09:00 |
|
smoogipoo
|
0e841628b6
|
Implement hitobject deletion
|
2018-10-18 16:36:06 +09:00 |
|
smoogipoo
|
5a5e91eaed
|
Add a way to re-invoke ApplyDefaults on placement object
|
2018-10-17 18:36:47 +09:00 |
|
smoogipoo
|
b7435c0c5f
|
Fix border layer not working
|
2018-10-17 18:29:30 +09:00 |
|
smoogipoo
|
6eb7a030d0
|
Fix placement container not being refreshed upon placement
|
2018-10-17 18:11:44 +09:00 |
|
smoogipoo
|
d36ac59ca2
|
Reduce complexity of creating edit ruleset containers
|
2018-10-17 18:06:00 +09:00 |
|
smoogipoo
|
969477dadd
|
Remove placement events, make everything pass top-down
|
2018-10-17 17:43:16 +09:00 |
|
smoogipoo
|
62635c5ab8
|
Add container to handle placement mask
|
2018-10-17 16:17:49 +09:00 |
|
smoogipoo
|
4ea4ec0d25
|
Move placement handling events to a higher level
|
2018-10-17 15:46:30 +09:00 |
|
smoogipoo
|
08e3fe1def
|
Add PlacementStarted event, rename placement methods
|
2018-10-17 14:37:45 +09:00 |
|
smoogipoo
|
70f1d17b7e
|
Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2018-10-16 17:28:16 +09:00 |
|
smoogipoo
|
47be95ce0b
|
Fix slider nodes using the wrong samples
|
2018-10-16 17:10:24 +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
|
b56d09c83b
|
Set hitobject placement time manually
|
2018-10-10 15:32:59 +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 |
|
smoogipoo
|
e931aa3d9e
|
Move positional modifications to HitCirclePlacementMask
|
2018-10-04 13:43:50 +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 |
|
smoogipoo
|
7809ce9361
|
Fix 1-frame position discrepancy
|
2018-10-03 17:05:22 +09:00 |
|
smoogipoo
|
934b687965
|
Fix selection masks not being added for new objects
|
2018-10-03 16:49:59 +09:00 |
|
smoogipoo
|
34ed60830c
|
Keep the placement hitobject time up-to-date
|
2018-10-03 16:44:37 +09:00 |
|
smoogipoo
|
3420e0c7eb
|
Re-implement composition tools + implement placement masks
|
2018-10-03 16:27:26 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
smoogipoo
|
4cdb6dcea5
|
Rename HitObjectMask -> SelectionMask
|
2018-10-03 13:28: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 |
|
ekrctb
|
c8e9d9375f
|
Use new InputStateChangeEvent for RulesetInputManager
|
2018-09-19 11:36:55 +09:00 |
|
Hanamuke
|
6d229716e7
|
Remove unused using directives
|
2018-09-18 20:42:55 +02:00 |
|
Hanamuke
|
2afcdb1451
|
Add the file
|
2018-09-18 20:23:25 +02:00 |
|
Hanamuke
|
e3cc25a96a
|
Implement ConstantScrollingSpeedVisualiser
|
2018-09-18 20:21:10 +02:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
smoogipoo
|
356a60b561
|
Fix hitobjects in scrolling rulesets getting masked away
|
2018-09-12 15:14:51 +09:00 |
|
Dean Herbert
|
68a79f895a
|
Fix mania throwing an exception on start of map
|
2018-08-30 14:58:00 +09:00 |
|
smoogipoo
|
551581e5cd
|
Skip invalid hitobject types, log error instead
|
2018-08-22 15:59:58 +09:00 |
|
smoogipoo
|
fcf98390f5
|
Cleanup
|
2018-08-21 12:10:00 +09:00 |
|
Dean Herbert
|
6a4ff19c90
|
Merge branch 'master' into relax
|
2018-08-17 23:17:07 +09:00 |
|
smoogipoo
|
16d30f6756
|
Add explanatory comments
|
2018-08-17 13:31:12 +09:00 |
|
smoogipoo
|
eb6f1ae72c
|
Fix spinners providing one extra combo
|
2018-08-17 09:16:28 +09:00 |
|
Dean Herbert
|
ff0dfa7acf
|
Merge branch 'master' into relax
|
2018-08-16 17:36:24 +09:00 |
|
smoogipoo
|
4c3e551295
|
Fix first object not receiving new combo
Note: If a normal catch fruit is the first object, it does not receive a new combo...
|
2018-08-15 11:48:28 +09:00 |
|
smoogipoo
|
31f324945e
|
Implement combo offsets
|
2018-08-15 11:47:31 +09:00 |
|
smoogipoo
|
da3e2cfee2
|
Catch/osu! spinners should have combo
|
2018-08-15 11:13:23 +09:00 |
|
smoogipoo
|
4f0305ffeb
|
Taiko convert hitobjects should not have combo
|
2018-08-15 10:58:59 +09:00 |
|
smoogipoo
|
83f75ac896
|
Mania convert hitobjects should not have combo
|
2018-08-15 10:57:11 +09:00 |
|
smoogipoo
|
8faf12579a
|
Fix field not being set correctly
|
2018-08-15 10:53:25 +09:00 |
|
smoogipoo
|
d2709613bc
|
Add combo offset to ConvertHitObjectParser
|
2018-08-15 10:49:45 +09:00 |
|
smoogipoo
|
ce77473910
|
Simplify usage of ConvertHitObjectParser
|
2018-08-15 10:24:56 +09:00 |
|
smoogipoo
|
e04b2f4fa9
|
Fix hitobject results not rewinding
|
2018-08-14 18:31:32 +09:00 |
|
smoogipoo
|
60c94a8ea3
|
Fix ScoreProcessor.ApplyBeatmap never being called
|
2018-08-06 12:42:54 +09:00 |
|
Dan Balasescu
|
c1517e1521
|
Merge branch 'master' into judgement-rework
|
2018-08-06 12:30:46 +09:00 |
|
smoogipoo
|
2a54b5b78d
|
ResetResult -> RevertResult
|
2018-08-06 12:29:22 +09:00 |
|
smoogipoo
|
c48a4d9993
|
Add exception
|
2018-08-06 12:29:12 +09:00 |
|
smoogipoo
|
3a7488767c
|
Make HitObject not store the judgement
|
2018-08-06 11:50:18 +09:00 |
|
smoogipoo
|
0d6a8a2bf5
|
More xmldocs
|
2018-08-06 11:31:54 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
ab642b563f
|
CreateJudgementResult -> CreateResult
|
2018-08-06 11:07:41 +09:00 |
|
smoogipoo
|
754f3c8621
|
Move result creation to load(), add exceptions
|
2018-08-06 11:07:05 +09:00 |
|
smoogipoo
|
b35817c877
|
More xmldocs to hitobject/drawablehitobject
|
2018-08-06 10:55:38 +09:00 |
|
smoogipoo
|
5fd4ed2f4e
|
Rename judgement-related methods/events + commenting
|
2018-08-06 10:55:25 +09:00 |
|
Dean Herbert
|
0c920fe486
|
Merge branch 'master' into mania-mask-container
|
2018-08-06 04:22:21 +09:00 |
|
tgi74000
|
b1d1a2400b
|
Remove IUpdatableByHitObject completely
|
2018-08-05 09:52:19 +02:00 |
|
tgi74000
|
07d6a75e23
|
Rename variables to be human readable
|
2018-08-04 00:18:09 +02:00 |
|
tgi74000
|
7310c38df9
|
Add relax mod
|
2018-08-03 14:03:11 +02:00 |
|
smoogipoo
|
482526135f
|
Make IsHit not consider nested hitobjects
|
2018-08-03 16:07:20 +09:00 |
|
smoogipoo
|
2a4994e5ce
|
Make hitobjects only have one judgement + result
|
2018-08-03 15:38:48 +09:00 |
|
smoogipoo
|
35b4ab5456
|
Introduce the concept of a "MainResult"
|
2018-08-02 21:07:40 +09:00 |
|
smoogipoo
|
8d81e66f88
|
Fix osu score processor crashing
|
2018-08-02 21:07:11 +09:00 |
|
Dean Herbert
|
6ee06602b8
|
Merge branch 'master' into mania-mask-container
|
2018-08-02 20:41:27 +09:00 |
|
smoogipoo
|
3619290c34
|
Split out judgement definition from judgement result
|
2018-08-02 20:35:54 +09:00 |
|
smoogipoo
|
d51d0e8547
|
Initial structure for new hitobject judgement system
|
2018-08-01 21:45:59 +09:00 |
|
smoogipoo
|
41512667a8
|
Require all judgements to be present for map completion
|
2018-08-01 19:51:24 +09:00 |
|
Dean Herbert
|
3c06655672
|
Split out Special mods into Automation and Conversion
|
2018-07-31 18:00:42 +09:00 |
|
Dean Herbert
|
b7de922896
|
Merge branch 'master' into open-downloaded-beatmas
|
2018-07-28 12:44:34 +09:00 |
|
Dean Herbert
|
95cca046fb
|
Merge branch 'master' into open-downloaded-beatmas
|
2018-07-25 12:38:49 +02:00 |
|
Dean Herbert
|
da8fc0ee5d
|
ToLower -> ToLowerInvariant
|
2018-07-25 07:37:05 +02:00 |
|
Dean Herbert
|
5364a6148a
|
Use ToUpperInvariant
|
2018-07-24 14:42:06 +02:00 |
|
Dean Herbert
|
ab9340f4be
|
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
|
2018-07-24 11:37:43 +02:00 |
|
Dean Herbert
|
aead4be134
|
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
|
2018-07-23 06:36:10 +02:00 |
|