1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Commit Graph

14608 Commits

Author SHA1 Message Date
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
f42f9cffe3 Make HitCirclePlacementMask directly modify hitcircle position 2018-10-17 18:16:34 +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
f384c7228e Fix post-merge issues 2018-10-16 17:28:23 +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
Dean Herbert
33d4ec876a
Merge pull request #3467 from smoogipoo/fix-catch-scale
Adjust catcher size
2018-10-12 21:43:24 +09:00
Dean Herbert
ffbc88c1bf
Merge branch 'master' into fix-catch-scale 2018-10-12 20:56:37 +09:00
Dean Herbert
f1ea094d7c
Merge pull request #3466 from smoogipoo/playfield-scaling-rework
Rework playfield scaling/aspect ratio adjustment
2018-10-12 20:42:10 +09:00
Dean Herbert
a314a561d0
Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00
Dean Herbert
3f2957f7e0
Merge pull request #3586 from peppy/update-dependencies
Update nuget dependencies (version mismatches)
2018-10-12 19:32:31 +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
4a64cb7f85 Remove nuget includes im props 2018-10-12 18:56:18 +09:00
Dean Herbert
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
Dean Herbert
50bae8b526
Merge pull request #3513 from smoogipoo/fix-scroll-speeds
Adjust scroll speeds to better match osu!stable
2018-10-12 18:50:26 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds 2018-10-12 18:25:24 +09:00
Dean Herbert
73622d2efc
Merge pull request #3512 from smoogipoo/fix-sv
Fix scrolling rulesets not accounting for global slider multiplier
2018-10-12 18:24:42 +09:00
Dean Herbert
1de770e093
Merge branch 'master' into fix-sv 2018-10-12 18:13:50 +09:00
Dean Herbert
079c4457f3
Merge pull request #3566 from smoogipoo/debounce-seeks
Debounce music controller seeks
2018-10-12 18:01:22 +09:00
Dean Herbert
f7c887cf79
Merge branch 'master' into debounce-seeks 2018-10-12 17:50:39 +09:00
Dean Herbert
a1032a94bf
Merge pull request #3564 from smoogipoo/tighten-diffcalc-tolerances
Make difficulty calculation closer match osu!stable
2018-10-12 17:44:58 +09:00
Dean Herbert
8e66f9a85d
Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-12 17:35:33 +09:00
Dean Herbert
8d16fa4ea8
Merge pull request #3585 from peppy/update-dependencies
Update nuget dependencies
2018-10-12 17:35:18 +09:00
Dean Herbert
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
Dean Herbert
50aaad809a
Merge pull request #3546 from smoogipoo/smooth-path
Use the new SmoothedPath in sliders/user profile graph
2018-10-12 16:56:24 +09:00
smoogipoo
72c8ae8705 Port the old stacking algorithm 2018-10-12 16:47:27 +09:00
Dean Herbert
c52a292935 Update framework 2018-10-12 16:10:32 +09:00
Dean Herbert
d6043a6cd3 Merge remote-tracking branch 'upstream/master' into smooth-path 2018-10-12 16:03:36 +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
0c4403ef16 Don't apply version offset during diff calc 2018-10-11 13:53:49 +09:00
smoogipoo
7d20efed2c Fix missing stack position 2018-10-11 13:53:29 +09:00
smoogipoo
f675c93935 Stably-sort hitobjects 2018-10-10 23:11:28 +09:00
Dean Herbert
7137c01352
Merge pull request #3549 from plankp/result-no-gamemode-switch
Stop ruleset selector from propagating positional input
2018-10-10 20:15:30 +09:00
Dean Herbert
2babdc079c
Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
Dean Herbert
3fad1c42bb
Merge branch 'master' into result-no-gamemode-switch 2018-10-10 20:03:58 +09:00
Dean Herbert
9c0044ba05
Merge pull request #3442 from FayneAldan/wiggle-repeat-points
Don't wiggle repeat points independently
2018-10-10 20:01:56 +09:00
Paul Teng
2181f34f74
Merge branch 'master' into result-no-gamemode-switch 2018-10-10 06:43:01 -04:00
Dean Herbert
1b6f37f3eb
Merge branch 'master' into wiggle-repeat-points 2018-10-10 19:42:10 +09:00
Dean Herbert
99f25f2017
Merge pull request #3437 from Joehuu/consistent-terminology-format
Use consistent terminology format on settings
2018-10-10 19:41:59 +09:00
Dean Herbert
ed0dcb2e73 Add comment explaining why 2018-10-10 19:41:40 +09:00
Dean Herbert
d28b9860ff Don't use "beatmapset" terminology 2018-10-10 19:26:35 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00