1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 22:22:54 +08:00
Commit Graph

205 Commits

Author SHA1 Message Date
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
smoogipoo
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
smoogipoo
c0c94e24b9 Use VirtualBeatmapTrack in testcases 2018-06-28 11:45:48 +09:00
Dean Herbert
018dcc98b4 Fix failing tests 2018-06-26 19:17:34 +09:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
smoogipoo
97057ced85 Merge remote-tracking branch 'origin/master' into full-mania-fix 2018-06-25 12:43:49 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
5f2d1d4a1e Dim TestCase background a bit 2018-06-21 12:48:44 +09:00
Dean Herbert
a20ec0d4cc Merge branch 'master' into timeline-audio-scrolling 2018-06-17 19:01:21 +09:00
Dean Herbert
e0ee5e2085 Merge branch 'master' into timeline-audio-scrolling 2018-06-17 19:01:16 +09:00
smoogipoo
47ae962099 Output only one mapping failure per mapping 2018-06-15 18:36:22 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +09:00
smoogipoo
e945186978 Expose the beatmap converter 2018-06-15 17:59:52 +09:00
smoogipoo
a4d2364083 Add one more newline 2018-06-14 21:29:08 +09:00
smoogipoo
b99b520656 Allow convertmapping to be extended 2018-06-14 21:25:33 +09:00
smoogipoo
024d2abfe0 Always generate mappings/convert values as soon as objects are converted
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
2018-06-14 21:25:23 +09:00
smoogipoo
8d0e7abdd6 Some rulesets don't have a beatmap processor 2018-06-14 21:23:11 +09:00
smoogipoo
5e66b02108 Process beatmap before generating mappings 2018-06-14 21:22:56 +09:00
smoogipoo
540b43313e Remove PP test cases (osu-tools/osu-server should be used instead) 2018-06-14 15:57:06 +09:00
Dean Herbert
0fdb04f57d Fix empty line 2018-06-13 15:43:18 +09:00
Dean Herbert
39738a997e Add check for player screens too 2018-06-13 15:26:23 +09:00
Dean Herbert
14f5c814a6 Add test for WorkingBeatmap leakage 2018-06-13 15:12:10 +09:00
smoogipoo
ca3186f34c Create dependencies before children are loaded 2018-06-12 19:51:35 +09:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert
621be3bbfc Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00
smoogipoo
ebcfe97ccf Expose Dependencies from base OsuTestCase 2018-06-06 20:25:40 +09:00
smoogipoo
f2ac5b8b2d CreatePlayer shouldn't receive a beatmap 2018-06-06 20:21:47 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
601ef3b6f7 Consume osu.Framework via nuget 2018-06-05 14:14:56 +09:00
Dean Herbert
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
smoogipoo
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
3a5228af43 Make GameBeatmap late-bind its AudioManager for ctor Beatmap access 2018-05-28 17:55:41 +09:00
Dean Herbert
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
Dean Herbert
699f661b02 Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix 2018-05-25 19:07:30 +09:00
smoogipoo
f1ac84d95b Fix base.CreateLocalDependencies sometimes not being called 2018-05-24 13:03:25 +09:00
smoogipoo
5a517bad63 Move beatmap cleanup to Dispose() 2018-05-24 12:53:32 +09:00
smoogipoo
a25462e10f Fix testcase audio + dependency overrides not working 2018-05-23 18:52:09 +09:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +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
AlFasGD
e44062b77a Fix tests and implementation 2018-05-08 16:37:06 +03:00
smoogipoo
6867886f4c Give conversion-tested beatmaps a ruleset 2018-05-07 14:04:37 +09:00
smoogipoo
794418432f Fix incorrect method name 2018-05-07 11:22:25 +09:00
smoogipoo
db3e48c194 Rename GetBeatmap() to GetPlayableBeatmap() 2018-05-07 10:40:30 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Dean Herbert
64ddee5646 Change load order to ensure runner is loaded before blocking op 2018-04-22 04:26:27 +09:00
Dean Herbert
44a9aa529a Test CI run with new changes 2018-04-22 03:51:17 +09:00