Commit Graph

928 Commits

Author SHA1 Message Date
72e82b660d Adjust blinds animations based on player feedback 2018-10-28 01:14:16 +02:00
3b08ad0742 Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
2018-10-27 16:34:48 +02:00
a9e5a4351e Merge branch 'master' into fix-diffcalc-slider-distance 2018-10-21 20:33:50 +09:00
f19cc98e6a Add slightly more explanation 2018-10-20 23:10:33 +09:00
0952c20c84 Adjust comment slightly 2018-10-20 23:06:48 +09:00
d284f29637 Add comment describing the speed multiplier 2018-10-18 14:16:46 +09:00
cd718812b2 Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-18 14:01:47 +09:00
1cf6cd10bb Fix slider travel distances sometimes not being considered 2018-10-18 11:29:50 +09:00
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
657bd5e371 Add some xmldocs 2018-10-15 12:32:59 +09:00
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
26b91c96fb Fix wrong number of ticks on some legacy beatmaps 2018-10-15 12:27:58 +09:00
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
460c943958 Merge branch 'master' into mod-fl2 2018-10-12 11:44:55 +02:00
8e66f9a85d Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-12 17:35:33 +09:00
f585684038 Merge branch 'tighten-diffcalc-tolerances' into optimise-diffcalc 2018-10-12 16:51:37 +09:00
72c8ae8705 Port the old stacking algorithm 2018-10-12 16:47:27 +09:00
d6043a6cd3 Merge remote-tracking branch 'upstream/master' into smooth-path 2018-10-12 16:03:36 +09:00
e130204a3b Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-12 12:26:15 +09:00
ec9f23ab73 Make IBeatmap.HitObjects an IReadOnlyList 2018-10-11 19:53:07 +09:00
83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +09:00
7d20efed2c Fix missing stack position 2018-10-11 13:53:29 +09:00
f675c93935 Stably-sort hitobjects 2018-10-10 23:11:28 +09:00
e0a8157d92 Merge branch 'master' into mod-fl2 2018-10-10 19:48:46 +09:00
1b6f37f3eb Merge branch 'master' into wiggle-repeat-points 2018-10-10 19:42:10 +09:00
841b2e8692 Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
4e37b5c4a7 50ms cap shouldn't be included in the strain decay 2018-10-10 18:53:54 +09:00
d8f77feddd Fix using the wrong slider's travel distance 2018-10-10 18:52:57 +09:00
03a9511399 Apparently stable does use stacking 2018-10-10 18:08:46 +09:00
d6784c818e Fix jump/travel distances in some scenarios 2018-10-10 11:49:54 +09:00
0a3be0d253 Adjust comments slightly 2018-10-09 12:03:47 +09:00
9facf707be Add diffcalc beatmap decoder 2018-10-09 11:49:24 +09:00
edf87bfdd8 Merge branch 'master' into wiggle-repeat-points 2018-10-08 15:23:45 -06:00
f8eaccddda Stable doesn't use stacked positions 2018-10-08 18:37:49 +09:00
0116db95d0 Fix progress calculation 2018-10-08 18:37:30 +09:00
35f45e74dc Calculate scaled positions prior to square-rooting 2018-10-08 17:39:10 +09:00
1ad5090ad6 Separate travel distance from jump distance 2018-10-08 17:38:12 +09:00
61e7ada977 Use ints + fix position calculation 2018-10-08 17:36:06 +09:00
da97600076 Fix inaccurate section lengths for first hitobject 2018-10-08 16:46:58 +09:00
42664f1c19 Make SliderBody use the new SmoothPath 2018-10-05 15:45:45 +09:00
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
d0007c047a PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
2ed7785cfc Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:50:48 +09:00
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
2069467434 Use HitObject scale to determine judgement size 2018-09-24 21:18:55 -04:00
7a43677849 Make judgements scale with cs 2018-09-22 22:54:38 -04:00
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00