Dean Herbert
47cd9065bf
Merge branch 'master' into screen-breadcrumbs
2018-05-16 18:42:17 +09:00
Dean Herbert
7765a1aa3a
Merge pull request #2563 from smoogipoo/fix-hitobject-order
...
Use a stable sort for hitobjects
2018-05-16 18:41:47 +09:00
smoogipoo
3f365c6621
Merge branch 'master' into editor-timeline-rework
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Compose.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
2018-05-16 18:04:24 +09:00
smoogipoo
5aadc35a25
Stably-sort difficulty hitobjects to prevent future issues
2018-05-16 14:47:50 +09:00
smoogipoo
0f817d18d4
Add explanatory comment
2018-05-16 13:59:51 +09:00
Dan Balasescu
ad81357fb5
Merge branch 'master' into fix-hitobject-order
2018-05-16 13:33:27 +09:00
Dean Herbert
452564d0e0
Merge branch 'master' into screen-breadcrumbs
2018-05-16 13:31:38 +09:00
Dean Herbert
222307eb8a
Merge pull request #2562 from smoogipoo/fix-conversion-tests
...
Fix conversion tests for ruleset-specific beatmaps not working
2018-05-16 13:31:05 +09:00
smoogipoo
cf44357bdb
Use a stable sort for hitobjects
2018-05-16 13:30:48 +09:00
Dean Herbert
095f937ddd
Merge branch 'master' into fix-conversion-tests
2018-05-16 13:19:38 +09:00
Dean Herbert
2297a53342
Merge pull request #2561 from smoogipoo/hitresult-namings
...
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 13:18:50 +09:00
smoogipoo
8d8b7e6fa2
Fix conversion tests for ruleset-specific beatmaps not working
...
TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...
2018-05-16 13:09:48 +09:00
smoogipoo
c1d9fcc140
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 12:46:31 +09:00
smoogipoo
edbb3a5a57
Rename to use new hit result namings
2018-05-16 12:44:11 +09:00
DrabWeb
8e053f2166
Add multiplayer screen test steps.
2018-05-15 21:20:34 -03:00
DrabWeb
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
DrabWeb
1450bf64f5
Add multiplayer screen header.
2018-05-15 20:34:14 -03:00
DrabWeb
dda253758b
Cleanup test step wording.
2018-05-15 19:56:47 -03:00
DrabWeb
f67ad7b8e8
Add exit test.
2018-05-15 19:52:28 -03:00
DrabWeb
b9d99b5f40
Fix nullref when exiting the last screen.
2018-05-15 19:42:50 -03:00
DrabWeb
c9cf0e6e8f
Merge branch 'screen-breadcrumbs' of https://github.com/DrabWeb/osu into screen-breadcrumbs
2018-05-15 19:29:45 -03:00
smoogipoo
de63a1b578
Remove construction of new ruleset
2018-05-16 01:43:58 +09:00
smoogipoo
ed902d9325
Cleanup
2018-05-16 01:36:28 +09:00
smoogipoo
1fdc77d579
Update with the rebalance changes
2018-05-16 01:34:07 +09:00
smoogipoo
4019683f6c
Implement osu!mania performance calculation
2018-05-16 01:24:53 +09:00
Dean Herbert
c0c449e453
Remove unused using
2018-05-15 22:53:33 +09:00
Dean Herbert
07e00fb7a1
Merge pull request #2556 from smoogipoo/more-diffcalc-improvements
...
Bring osu! difficulty calculation on par with osu!stable
2018-05-15 22:52:43 +09:00
smoogipoo
3f67d04429
Cap CS to 10 also
2018-05-15 21:57:08 +09:00
smoogipoo
cf08293be1
Remove extra newline
2018-05-15 21:49:44 +09:00
smoogipoo
4101b8ddde
Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements
2018-05-15 21:31:58 +09:00
smoogipoo
22f3bee55a
Fix incorrect iteration over difficulty sections
2018-05-15 21:26:06 +09:00
smoogipoo
bc197a88e1
Fix slider length calculation including slider head
2018-05-15 21:25:33 +09:00
smoogipoo
1acfc1bbab
Fix ModHardRock not properly clamping Drain/OD
2018-05-15 21:25:20 +09:00
smoogipoo
1b5c151e0e
Fix DeltaTime being capped incorrectly
2018-05-15 21:25:02 +09:00
smoogipoo
49c36787d7
Remove triangle pattern and remove not-implemented reading strain
2018-05-15 21:24:41 +09:00
Dean Herbert
28df77e838
Simplify code and remove generic
2018-05-15 21:10:26 +09:00
Dean Herbert
0325b1bd7a
Remove unused class
2018-05-15 19:42:30 +09:00
Dean Herbert
0def847f60
Merge branch 'master' into screen-breadcrumbs
2018-05-15 19:39:03 +09:00
Dean Herbert
457b98e68c
Merge pull request #2483 from smoogipoo/disable-mouse-buttons
...
Add keybind to disable mouse buttons
2018-05-15 19:38:50 +09:00
Dean Herbert
fc192c8998
Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons
2018-05-15 19:23:51 +09:00
Dean Herbert
da4c839119
Merge pull request #2540 from smoogipoo/enable-distance-overflow
...
Re-enable slider curve lengthening
2018-05-15 19:17:19 +09:00
Dean Herbert
6bf1092c7d
Merge branch 'master' into enable-distance-overflow
2018-05-15 18:56:51 +09:00
Dean Herbert
d6565fca0e
Merge pull request #2555 from smoogipoo/namespace-cleanup
...
Re-namespace performance/difficulty calculators
2018-05-15 18:30:24 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup
2018-05-15 18:10:48 +09:00
Dean Herbert
d7d3838ad6
Merge pull request #2524 from smoogipoo/convert-object-hitwindows
...
Use osu!stable hitwindows for converted hitobjects
2018-05-15 17:48:08 +09:00
smoogipoo
803200ff6a
Apply similar changes to other rulesets
2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f
Move base classes to osu.Game.Rulesets.Difficulty namespace
2018-05-15 17:38:08 +09:00
smoogipoo
9fd972e0a3
Rename OsuDifficulty -> Difficulty
2018-05-15 17:36:29 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows
2018-05-15 17:33:27 +09:00
Dean Herbert
6d87ff2595
Merge branch 'master' into enable-distance-overflow
2018-05-15 16:18:17 +09:00
