1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 02:07:24 +08:00
Commit Graph

415 Commits

Author SHA1 Message Date
Dean Herbert
97796a8578 Attempt to fix failing tests by delaying starting of the gameplay clock 2019-05-10 18:10:07 +09:00
smoogipoo
7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
David Zhao
9da13cb463
Merge branch 'master' into flashlight-dim 2019-04-25 23:15:15 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dan Balasescu
9fa8f62077
Merge branch 'master' into update-framework 2019-04-25 12:25:17 +09:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim 2019-04-24 17:01:11 +09:00
smoogipoo
6add395288 Fix gameplay cursor being hidden in tests/replays 2019-04-23 13:32:44 +09:00
Dean Herbert
52336e9062 Fix pause tests 2019-04-23 11:54:41 +09:00
Dean Herbert
8ffb2f4224 Remove black box blocking some visual tests from being visible 2019-04-22 10:55:01 +09:00
Dean Herbert
879f6152b0 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-04-17 22:17:10 +08:00
David Zhao
69748abedc Rename to TestCaseOsuFlashlight 2019-04-12 15:09:43 +09:00
David Zhao
dba4ccdf74 Add back flashlight testcase 2019-04-12 14:53:23 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
smoogipoo
1c952e58cc Fix testcase failures 2019-04-09 13:15:48 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
5495a0a70f Add content to ScreenTestCase as protection against overwriting 2019-03-29 14:34:58 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags 2019-03-29 13:45:45 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dean Herbert
61b8fb0366 Allow ScreenTestCase to support content 2019-03-27 22:28:32 +09:00
Dean Herbert
1a0d1b238e Fix storage regression 2019-03-27 20:58:07 +09:00
Dean Herbert
a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
Dean Herbert
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert
868367511e Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:26:55 +09:00
David Zhao
5169f7a43c Change default for null screen parallax, apply reviews 2019-03-24 16:21:43 +09:00
Dean Herbert
db89796752 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-22 16:05:39 +09:00
David Zhao
dcae86e39a Add a new test for OsuScreenStack, fix parallax 2019-03-22 14:10:38 +09:00
Dean Herbert
acbcca4462
Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
Dean Herbert
9ca6699c64 Merge remote-tracking branch 'upstream/master' into player-test-flexibility 2019-03-19 20:33:39 +09:00
Dean Herbert
def15645f7 Update framework 2019-03-19 17:32:36 +09:00
Dean Herbert
15dd132c92 Use SetUpSteps attribute 2019-03-18 20:32:36 +09:00
Dean Herbert
a81461ba12 Add ability to test without nofail enabled 2019-03-18 20:32:28 +09:00
Dean Herbert
8df47bc23e Increase flexibility of player test cases 2019-03-18 17:09:48 +09:00
Dean Herbert
300cb70859
Merge branch 'master' into multi-background-stack 2019-03-18 09:54:27 +09:00
Dean Herbert
7d56ce63d3 Fix test case failures 2019-03-14 12:31:17 +09:00
David Zhao
2e1b274fda No need for player var 2019-03-12 17:59:11 +09:00
David Zhao
e6a55cd674 Fix TestCaseEditor as well 2019-03-12 17:45:16 +09:00
David Zhao
9368081b99 Fix TestCasePlayer 2019-03-12 17:33:16 +09:00
David Zhao
921c4ce242 Make tests use new OsuScreenStack 2019-03-12 16:33:35 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
7fde21b51a Rename testcase 2019-02-25 16:09:12 +09:00
Dean Herbert
490fb86f9e Make base class abstract and add documentation 2019-02-23 14:14:34 +09:00
Dean Herbert
3495aa645f Update headers 2019-02-23 14:14:34 +09:00
David Zhao
d59ba8cfe9 Rename base player test class to RateAdjustedBeatmap, refactor input tests 2019-02-23 14:14:34 +09:00
David Zhao
1fdb8ca37a Fix auto-generated lisence header 2019-02-23 14:14:34 +09:00
David Zhao
8e09c66cbb Split out testcase player for use in slider input tests 2019-02-23 14:14:34 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
Dean Herbert
87dd7bcf6b Fix one more test regression 2019-02-19 13:02:33 +09:00
Dean Herbert
f8033a3b35 Give TestWorkingBeatmap a reference clock 2019-02-19 12:27:30 +09:00
Dean Herbert
65721a01ab Fix regressed screen test cases 2019-02-15 17:01:06 +09:00
Dean Herbert
490d48fa5e Fix MultiplayerTestCase not being abstract 2019-02-15 13:48:14 +09:00
Dean Herbert
3ec94e4ab3 Remove disable setting 2019-02-13 15:14:34 +09:00
Dean Herbert
43843ac558 Remove explicit dispose 2019-02-13 14:58:40 +09:00
Dean Herbert
19bef01dd0 Attempt to maybe fix tests 2019-02-13 11:05:02 +09:00
Dean Herbert
b967b93b88 Fix regressions in tests 2019-02-12 19:53:08 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
smoogipoo
7aca0f4a1d Fix failing test cases 2019-02-08 16:08:23 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
smoogipoo
b90207fa54 Give ScreenTestCase a background stack 2019-01-31 14:55:48 +09:00
Dean Herbert
e8c39b9c37 Fix test screen loading 2019-01-31 11:00:44 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
smoogipoo
1a3c06f2d9 Fix OsuTestCase beatmap not having a correct default beatmap 2018-12-05 20:33:27 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
4dec2d1db0 Merge remote-tracking branch 'upstream/master' into note-placement 2018-11-14 18:29:31 +09:00
Dean Herbert
a83efe225e Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase 2018-11-14 18:11:53 +09:00
smoogipoo
7274908059 Implement interface 2018-11-14 15:33:09 +09:00
smoogipoo
3d8ef97e81 Add testcase 2018-11-12 19:41:06 +09:00
smoogipoo
3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
smoogipoo
2e0e1befe9 Add selection mask testcases
# Conflicts:
#	osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
2018-11-12 17:40:09 +09:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
4277cb0d59 Adjust some missed renames 2018-11-07 15:04:48 +09:00
smoogipoo
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
smoogipoo
b3fa7c111b Rename testcases 2018-11-06 18:06:20 +09:00
smoogipoo
bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
smoogipoo
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
smoogipoo
951a309d04 Increase placement testcase circlesize 2018-10-26 15:36:09 +09:00
smoogipoo
2f42112d87 Add placement mask testcase 2018-10-25 19:11:57 +09:00
smoogipoo
4ecd4ca462 Add selection mask test cases 2018-10-25 19:10:52 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dean Herbert
02313c6d6e Wait longer before confirming test players are cleaned up 2018-09-11 13:21:05 +09:00
Dean Herbert
2169a47325 Prevent fatal failures on delete failures 2018-07-23 10:39:43 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
7be3a5d466 Centralise test storage logic 2018-07-19 14:07:55 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
smoogipoo
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +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
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +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
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
AlFasGD
e44062b77a Fix tests and implementation 2018-05-08 16:37:06 +03: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
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
smoogipoo
d5ce618d9b Update with framework changes 2018-04-18 15:12:48 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
6e35910419 Remove start/stop clock logic
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
2018-04-12 14:06:36 +09:00
smoogipoo
fbc50d6030 Merge master into editor-clock 2018-04-12 13:35:53 +09:00
smoogipoo
070e68f235 Give the test case clock an accurate IsRunning value 2018-04-06 19:14:04 +09:00
smoogipoo
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
smoogipoo
b238130fe4 DI beat divisors to test cases with editor clocks 2018-04-06 18:23:22 +09:00
smoogipoo
fdb3227fd7 Fix + cleanup testcases 2018-04-06 18:12:44 +09:00
smoogipoo
e97349fd63 Derive ScreenTestCase + use LoadComponentAsync 2018-03-13 16:00:56 +09:00
smoogipoo
0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
smoogipoo
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
smoogipoo
7406cb290f Split out test beatmap from TestCasePlayer into instantiable class 2018-03-12 19:41:09 +09:00
Dean Herbert
ab4c527ebc
Merge branch 'master' into decoders 2018-03-12 13:38:22 +09:00
HoLLy
9c75c392f2 Only check by null instead of sign 2018-03-11 21:27:49 +01:00
HoLLy
a321bcf3af Fix check against LegacyID for non-default rulesets 2018-03-11 20:19:03 +01:00
Dean Herbert
217dd2ecdc Initial push for better decoders 2018-03-09 21:24:15 +09:00
Dean Herbert
f2b3d9a0e8 Change some missed instances 2018-02-22 14:17:35 +09:00
Dan Balasescu
c5b71d2cb7
Remove unused using 2018-02-14 23:15:34 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
Dean Herbert
789e25069f Fix non-visual tests not cleaning up previous executions 2018-02-08 17:07:59 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
61c2bf7ebe Fix TestCasePerformancePoints binding to global beatmap
and never unbinding
2018-01-03 13:34:27 +09:00
Dean Herbert
324a7d6377 Merge remote-tracking branch 'upstream/master' into better-testcase-player 2017-12-27 20:26:38 +09:00
Dean Herbert
99a44e6d79 Allow testbrowser's rate adjust to affect TestCasePlayer 2017-12-26 15:03:45 +09:00
Dean Herbert
9fb958eadc Make TestCasePlayer more usable
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
Dean Herbert
3c1654e5e4 Fix many instances of non-osu-prefixed text classes being used
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
c871a25dfa Remove unnecessary constructure and make ruleset required 2017-12-20 20:41:01 +09:00
Aergwyn
e07b85311b removed unnecessary using 2017-12-01 22:15:10 +01:00
Aergwyn
c466296b14 reverted split at Decoder, moved logic down
I'm done experimenting, sorry
- `Decoder` only returns a "Beatmap"`Decoder` now
- "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
- moved parse methods down in the hierarchy where I forgot to do that
- renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`
2017-12-01 22:05:01 +01:00
Aergwyn
a49f3479a2 Split retrieving of beatmap and storyboard decoder
Storyboard works again. Not satisfied with the solution though.
2017-12-01 19:11:52 +01:00
Aergwyn
c16925059c split parsing a beatmap and parsing a storyboard 2017-11-30 19:16:13 +01:00
Dean Herbert
801d81ecfc Add a notice when not logged in 2017-11-29 19:00:08 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator 2017-11-29 18:37:07 +09:00
Dean Herbert
bad970d1d1 Add wait steps to ensure the player is completely loaded before continuing 2017-11-29 17:25:55 +09:00
Dean Herbert
d1afbf8055 Load Player-based TestCases asynchronously 2017-11-29 13:10:33 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
Dean Herbert
95fbe6a4a2 Update framework 2017-11-23 23:43:27 +09:00
Dean Herbert
9565a9c352 Fix TestCasePlayer not working as expected 2017-11-23 20:42:07 +09:00
Dean Herbert
288c21dfec Move TestCase descriptions to attributes
Depends on https://github.com/ppy/osu-framework/pull/1186.
2017-11-23 16:09:32 +09:00
smoogipoo
f9ad4b6acb Make categoryDifficulties return doubles to improve decimal accuracy 2017-11-21 19:55:09 +09:00
smoogipoo
5d753427f6 Fix up DT not affecting hitobject densities 2017-11-17 17:28:22 +09:00
smoogipoo
bf44b3d0ef Cleanups 2017-11-17 16:54:50 +09:00
smoogipoo
1ed2ce324f Further improvements to TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
smoogipoo
1e023f0419 Implement PerformanceCalculator testcase 2017-11-17 14:37:19 +09:00
smoogipoo
38fe95d94a Add basic display for pp in TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
Dean Herbert
22b3f5dd19 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-23 22:03:37 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
5b2219a692 Add back test cleanup before run 2017-10-22 16:20:04 +09:00
Dean Herbert
f9d5eadd05 Fix TestCase failing in an infinite loop 2017-10-20 12:21:18 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
0dac770e38 Remove TestCase cleanup temporarily until context disposal is sorted 2017-10-18 19:52:08 +09:00
Dean Herbert
ad54ca9268 Fix TestCasePlaySongSelect 2017-10-17 16:04:54 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Dean Herbert
1f4a943f74 Fix test case runs not being correctly isolated on mono 2017-10-16 15:23:28 +09:00
Dean Herbert
8a0b184dd6 Revert "Return back DatabaseBackedStore's query and populate functions"
This reverts commit 7cf5d63cd3.
2017-10-16 12:59:59 +09:00
TocoToucan
7cf5d63cd3 Return back DatabaseBackedStore's query and populate functions 2017-10-15 00:40:41 +03:00
smoogipoo
9924f518b7 Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/BeatmapMetadata.cs
#	osu.Game/osu.Game.csproj
#	osu.Game/packages.config
2017-10-14 16:36:37 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
smoogipoo
b83d7cd4df Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
smoogipoo
a5817e6e75 Add a way to change the IconButton icon colour 2017-10-12 18:17:23 +09:00
smoogipoo
f08f7a4ecb Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline 2017-10-12 17:52:40 +09:00
Dan Balasescu
18c67dd936 Merge branch 'master' into editor-waveform 2017-10-12 17:32:42 +09:00
smoogipoo
622659336d Merge + update framework 2017-10-12 17:02:39 +09:00
Dean Herbert
00f7007036 Merge remote-tracking branch 'upstream/master' into fix-medal-overlay 2017-10-12 16:56:40 +09:00
smoogipoo
de8f9325a3 Implement TimelineButton and use for the magnification buttons 2017-10-12 16:10:33 +09:00