Commit Graph

14863 Commits

Author SHA1 Message Date
33d4ec876a Merge pull request #3467 from smoogipoo/fix-catch-scale
Adjust catcher size
2018-10-12 21:43:24 +09:00
bb07630743 Merge branch 'master' into database-standardize-paths 2018-10-12 14:08:25 +02:00
ffbc88c1bf Merge branch 'master' into fix-catch-scale 2018-10-12 20:56:37 +09:00
f1ea094d7c Merge pull request #3466 from smoogipoo/playfield-scaling-rework
Rework playfield scaling/aspect ratio adjustment
2018-10-12 20:42:10 +09:00
a314a561d0 Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00
3f2957f7e0 Merge pull request #3586 from peppy/update-dependencies
Update nuget dependencies (version mismatches)
2018-10-12 19:32:31 +09:00
4606f0d017 Merge branch 'master' into Cakefy_osu! 2018-10-12 19:26:25 +09:00
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
ad42f2244d Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer 2018-10-12 19:15:11 +09:00
4a64cb7f85 Remove nuget includes im props 2018-10-12 18:56:18 +09:00
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
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
e09e38148b Merge branch 'master' into fix-scroll-speeds 2018-10-12 18:25:24 +09:00
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
1de770e093 Merge branch 'master' into fix-sv 2018-10-12 18:13:50 +09:00
079c4457f3 Merge pull request #3566 from smoogipoo/debounce-seeks
Debounce music controller seeks
2018-10-12 18:01:22 +09:00
f7c887cf79 Merge branch 'master' into debounce-seeks 2018-10-12 17:50:39 +09:00
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
8e66f9a85d Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-12 17:35:33 +09:00
8d16fa4ea8 Merge pull request #3585 from peppy/update-dependencies
Update nuget dependencies
2018-10-12 17:35:18 +09:00
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
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
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
c52a292935 Update framework 2018-10-12 16:10:32 +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
5d26c1b771 Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
Various performance improvements around hitobjects
2018-10-11 22:16:48 +09:00
d282d16e1c Use SortedList again 2018-10-11 20:49:12 +09:00
fb1760f580 Simplify linq from beatmap conversion 2018-10-11 20:29:37 +09:00
ec9f23ab73 Make IBeatmap.HitObjects an IReadOnlyList 2018-10-11 19:53:07 +09:00
7b2a30f5b4 Reduce some high-profile enumerator allocations 2018-10-11 19:52:03 +09:00
10fb1d20d1 Remove allocation of control point with every binarysearch 2018-10-11 19:08:00 +09:00
5b544a0c97 Remove allocation of string.IndexOf() 2018-10-11 18:37:48 +09:00
bd99a87298 Use ordinal comparison in LegacyBeatmapDecoder 2018-10-11 17:48:47 +09:00
83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +09:00
0c4403ef16 Don't apply version offset during diff calc 2018-10-11 13:53:49 +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
aac95523ec Merge branch 'master' into skinnable-spritetext 2018-10-10 20:26:27 +09:00
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
2babdc079c Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
3fad1c42bb Merge branch 'master' into result-no-gamemode-switch 2018-10-10 20:03:58 +09:00
9c0044ba05 Merge pull request #3442 from FayneAldan/wiggle-repeat-points
Don't wiggle repeat points independently
2018-10-10 20:01:56 +09:00
2181f34f74 Merge branch 'master' into result-no-gamemode-switch 2018-10-10 06:43:01 -04:00
1b6f37f3eb Merge branch 'master' into wiggle-repeat-points 2018-10-10 19:42:10 +09:00
99f25f2017 Merge pull request #3437 from Joehuu/consistent-terminology-format
Use consistent terminology format on settings
2018-10-10 19:41:59 +09:00
ed0dcb2e73 Add comment explaining why 2018-10-10 19:41:40 +09:00
d28b9860ff Don't use "beatmapset" terminology 2018-10-10 19:26:35 +09:00
841b2e8692 Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00