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

279 Commits

Author SHA1 Message Date
smoogipoo
b4e1b5fa98 Explose + use the full calculated length of the path 2019-12-06 15:53:19 +09:00
smoogipoo
a89a23fe08 Use linq to simplify some expressions 2019-12-06 13:08:35 +09:00
smoogipoo
247609388f Clean up unused/unnecessary properties 2019-12-06 12:31:22 +09:00
smoogipoo
3ebbf62b2a Initial game-wide update with the new SliderPath 2019-12-05 19:53:36 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
smoogipoo
031b686ee9 Only accept input while hovered 2019-11-13 17:38:34 +09:00
smoogipoo
d835def4ab Add point count to the menu item text 2019-11-13 17:36:46 +09:00
smoogipoo
c56503ee88 Select single control point on right click 2019-11-13 17:29:00 +09:00
smoogipoo
9c52d239b4 Return null to allow passthrough 2019-11-13 16:56:48 +09:00
smoogipoo
4c0bca5c07 Add ability to delete control points via right-click option 2019-11-13 16:38:15 +09:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
smoogipoo
a0884fe9d4 Fix being able to add while not selected 2019-11-12 15:07:54 +09:00
smoogipoo
93d8cd38ca Implement addition via ctrl+click 2019-11-12 15:02:27 +09:00
smoogipoo
407ca41ba4 Simplify using existing tools 2019-11-12 15:02:27 +09:00
smoogipoo
316dcae614 Use squared distance 2019-11-12 15:02:27 +09:00
smoogipoo
13b11996e0 Improve closest segment algorithm 2019-11-12 15:02:27 +09:00
smoogipoo
10fd5ef5a7 Merge context menus 2019-11-12 15:02:27 +09:00
smoogipoo
461f76926f Add right-click menu to support control point addition 2019-11-12 15:02:01 +09:00
Dean Herbert
8402fb1490 Move to const and add some xmldoc for future visitors 2019-11-12 10:02:42 +09:00
smoogipoo
3b13ad480a Increase fade-out time of hitobjects in the editor 2019-11-11 13:06:41 +09:00
smoogipoo
b1da81571f Implement slider head control point snapping 2019-11-07 14:00:12 +09:00
smoogipoo
2c1bfd62ef Disallow selections to be moved outside of the playfield 2019-11-06 17:28:04 +09:00
smoogipoo
2588534eda Skin entire selection, add xmldocs 2019-11-06 16:04:20 +09:00
smoogipoo
020b08b450 Initial implementation of limited distance snap 2019-11-06 15:27:48 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion (#6679)
Implement slider control point deletion

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +09:00
smoogipoo
d77882c21b Fix slider selection input handled outside path 2019-11-05 17:31:52 +09:00
smoogipoo
7c20a589f2 Remove unused usings 2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f Use PlatformAction.Delete instead of Delete key 2019-11-05 13:26:44 +09:00
smoogipoo
08bd811326 Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
2019-11-05 13:07:06 +09:00
Dean Herbert
66253a0bd4 Handle selection on mouse down instead of click
This is how other elements work, and feels better with drag preselection
2019-11-05 02:21:50 +09:00
Dean Herbert
bcf8a6d514 Fix slider creation regressing with path selection changes 2019-11-03 19:59:37 +09:00
Dean Herbert
f69a641d35
Merge branch 'master' into slider-controlpoint-deletion 2019-11-03 19:32:10 +09:00
Dean Herbert
1155aacd90
Update sliders when control points change (#6680)
Update sliders when control points change
2019-11-03 19:05:48 +09:00
Dean Herbert
f849926049
Merge branch 'master' into slider-controlpoint-deletion 2019-11-03 19:05:17 +09:00
Dean Herbert
4dbdfcdd3c Change control to toggle rather than always select 2019-11-03 18:41:29 +09:00
smoogipoo
41ae66d517 Update slider when control points change 2019-10-31 18:24:38 +09:00
smoogipoo
18f374eec6 Deselect deleted control points 2019-10-31 17:58:33 +09:00
smoogipoo
78194cfa6e Implement slider control point deletions 2019-10-31 17:54:09 +09:00
smoogipoo
43b2cbb865 Implement slider control point deletion 2019-10-31 17:39:57 +09:00
smoogipoo
20aeb7aaff Implement multiple selection 2019-10-31 17:25:30 +09:00
smoogipoo
8d50b155e8 Make selection happen on click only 2019-10-31 17:13:10 +09:00
smoogipoo
cfdf710676 Add test 2019-10-31 16:51:58 +09:00
smoogipoo
e23a75c64a Implement control point selection 2019-10-31 16:23:54 +09:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
smoogipoo
da6ee05dd6 Fix not being able to drag non-snaked sliders 2019-10-25 18:37:44 +09:00
smoogipoo
607b4d874a Refactor flow of snapping through HitObjectComposer 2019-10-25 16:40:30 +09:00
smoogipoo
a6458fdeab Re-use slider type 2019-10-24 19:04:24 +09:00
smoogipoo
b7af4acdbf Allow not having a composer 2019-10-24 19:04:00 +09:00
smoogipoo
0af5706db6 Snap path during control point movement 2019-10-24 19:02:59 +09:00
smoogipoo
f45f17339c Implement slider path distance snapping 2019-10-24 18:17:30 +09:00
smoogipoo
436941cda3 Add comment 2019-10-23 17:58:44 +09:00
smoogipoo
b903edca45 Don't snap slider control point placement 2019-10-23 16:03:16 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration 2019-10-21 18:44:34 +09:00
smoogipoo
c34d3362df Fix hit circles selection area being too large 2019-10-21 17:14:08 +09:00
Dean Herbert
b157aaead1 Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration 2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff Rename HitObject -> DrawableObject in selection blueprints 2019-10-21 17:04:56 +09:00
smoogipoo
96649e0a6a Fix selection blueprints not respecting stacking 2019-10-21 15:03:49 +09:00
smoogipoo
5dd5a070e0 Show placement grid from hitobjects at the current time 2019-10-18 19:03:19 +09:00
Dean Herbert
99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
Implement osu!'s beat snapping grid
2019-10-18 16:27:03 +09:00
smoogipoo
f1d7e7e7f6 Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration 2019-10-18 13:49:09 +09:00
smoogipoo
c4704f6a29 Add beat snap grid to the composer 2019-10-18 12:47:52 +09:00
smoogipoo
5ccdd2b203 Mask the osu! beatsnap grid 2019-10-18 12:38:43 +09:00
Dean Herbert
f3ed71d336 Move scoring distance constant to a central/shared location 2019-10-17 16:36:47 +09:00
Dean Herbert
f92331531c Rename grid to DistanceSnap to be more in line with its purpose 2019-10-17 15:32:02 +09:00
smoogipoo
79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid 2019-10-13 18:38:57 +09:00
smoogipoo
45835f97a1 Split out grids into separate files 2019-10-11 18:41:17 +09:00
smoogipoo
2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +09:00
smoogipoo
8b661e624d Remove drag from class/method namings + refactor 2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447 Move selection relative to the hitobject start positions 2019-10-08 18:57:03 +09:00
smoogipoo
e265beb289 Fix merge error 2019-10-07 18:49:59 +09:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates 2019-10-06 15:00:56 +08:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
smoogipoo
90ad1c5166 Add more tests for slider selection blueprint 2019-10-01 19:33:27 +09:00
smoogipoo
ba5c9547e1 Add more tests for hitcircle selection blueprint 2019-10-01 19:33:15 +09:00
smoogipoo
bddaead72e Make hitobject pieces able to update dynamically 2019-09-27 18:45:22 +09:00
smoogipoo
4fc37d1137 Remove SliderPiece + HitObjectPiece 2019-09-27 18:01:55 +09:00
smoogipoo
f64fe22f36 Remove bindables from osu! selection blueprints 2019-09-27 18:00:24 +09:00
smoogipoo
6641811125 Add EditorWorkingBeatmap for reuse of the playable beatmap 2019-08-29 19:41:12 +09:00
Dean Herbert
e50b70d615 Centralise osu! circle radius specification 2019-07-22 14:40:02 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
d53e6f7e0e Remove unused references 2019-03-31 01:34:50 +09:00
Dean Herbert
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dean Herbert
fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
Dean Herbert
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert
7254b765b0 Fix gameplay cursor showing in editor 2019-03-20 19:26:24 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00
Dean Herbert
340997f505 Rename remaining usage of PathWidth naming convention 2019-03-07 20:21:59 +09:00
David Zhao
b3e046c4d1 Rename PathWidth to PathRadius 2019-03-07 17:39:19 +09:00
Dean Herbert
62716851a1 Revert some unnecessary changes 2019-03-06 17:41:54 +09:00
Dean Herbert
acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00