1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 23:27:32 +08:00
Commit Graph

14886 Commits

Author SHA1 Message Date
Dean Herbert
a6d05febff Attempt with different key source 2018-10-17 16:26:41 +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
Dean Herbert
717e490fd1
Merge pull request #3599 from smoogipoo/optimise-diffcalc
Reduce beatmap difficulty processing time
2018-10-17 14:47:15 +09:00
smoogipoo
08e3fe1def Add PlacementStarted event, rename placement methods 2018-10-17 14:37:45 +09:00
smoogipoo
1bebceada7 Unroll loop for the last control point 2018-10-17 11:55:34 +09:00
smoogipoo
336b6fa38e Perform a custom binary search to remove thread-unsafeness 2018-10-17 11:23:18 +09:00
smoogipoo
d431dd59a8 Cleanups 2018-10-17 10:53:21 +09:00
smoogipoo
e8ce5a7e6c Fix crashes when manually creating sliders 2018-10-16 18:27:09 +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
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
HoLLy
eb9199e07a Run database migration unconditionally, remove downwards migration 2018-10-16 08:29:47 +02:00
smoogipoo
41391a6627 Fix beatmap conversion tests failing 2018-10-16 12:01:58 +09:00
smoogipoo
3ad93d5a07 Remove redundant type specifications 2018-10-16 11:40:51 +09:00
smoogipoo
060cc24dba Cleanup slidercurve calculation 2018-10-16 11:11:04 +09:00
smoogipoo
72aaaa4a74 PointSearch -> SearchPoint 2018-10-16 10:29:53 +09:00
smoogipoo
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
smoogipoo
657bd5e371 Add some xmldocs 2018-10-15 12:32:59 +09:00
smoogipoo
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
smoogipoo
26b91c96fb Fix wrong number of ticks on some legacy beatmaps 2018-10-15 12:27:58 +09:00
miterosan
3517d738d8
Merge branch 'master' into Cakefy_osu! 2018-10-14 23:16:41 +02:00
HoLLy
710b0a4664 Remove unnecessary PathSanitise call 2018-10-12 15:30:24 +02:00
Dean Herbert
33d4ec876a
Merge pull request #3467 from smoogipoo/fix-catch-scale
Adjust catcher size
2018-10-12 21:43:24 +09:00
HoLLy
bb07630743
Merge branch 'master' into database-standardize-paths 2018-10-12 14:08:25 +02: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
4606f0d017
Merge branch 'master' into Cakefy_osu! 2018-10-12 19:26:25 +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
f585684038 Merge branch 'tighten-diffcalc-tolerances' into optimise-diffcalc 2018-10-12 16:51:37 +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
smoogipoo
e130204a3b Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-12 12:26:15 +09:00