RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,701 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

1115 Commits

Author SHA1 Message Date
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 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