1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:17:24 +08:00
Commit Graph

14575 Commits

Author SHA1 Message Date
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
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
smoogipoo
4e37b5c4a7 50ms cap shouldn't be included in the strain decay 2018-10-10 18:53:54 +09:00
smoogipoo
d8f77feddd Fix using the wrong slider's travel distance 2018-10-10 18:52:57 +09:00
smoogipoo
03a9511399 Apparently stable does use stacking 2018-10-10 18:08:46 +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
smoogipoo
d6784c818e Fix jump/travel distances in some scenarios 2018-10-10 11:49:54 +09:00
Paul Teng
a91dda1a89
Merge branch 'master' into result-no-gamemode-switch 2018-10-09 13:04:53 -04:00
Paul Teng
ae79c3832e Add base. for safety 2018-10-09 11:05:15 -04:00
Fayne Aldan
1e13bbe059
Merge branch 'master' into wiggle-repeat-points 2018-10-09 06:14:30 -06:00
Dean Herbert
06ea174f34
Merge branch 'master' into fix-sv 2018-10-09 18:00:34 +09:00
smoogipoo
6d24bde72b Fix beatmap details not displaying 2018-10-09 17:39:27 +09:00
smoogipoo
ccb6723711 Debounce music controller seeks 2018-10-09 16:50:29 +09:00
Dan Balasescu
3322eb47b3
Merge pull request #3565 from peppy/fix-joined-channel-state
Fix joined channels not appearing as joined in the channel list
2018-10-09 16:22:53 +09:00
Dean Herbert
a171ed3500 Fix joined channels not appearing as joined in the channel list 2018-10-09 16:12:20 +09:00
smoogipoo
0a3be0d253 Adjust comments slightly 2018-10-09 12:03:47 +09:00
smoogipoo
9facf707be Add diffcalc beatmap decoder 2018-10-09 11:49:24 +09:00
smoogipoo
b7499fa956 Allow TimingControlPoint to be overridden 2018-10-09 11:34:38 +09:00
Fayne Aldan
edf87bfdd8
Merge branch 'master' into wiggle-repeat-points 2018-10-08 15:23:45 -06:00