1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 10:27:45 +08:00

1953 Commits

Author SHA1 Message Date
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +09:00
Dean Herbert
5d6c599129 Merge remote-tracking branch 'upstream/master' into changelog-overlay 2019-05-18 15:45:40 +09:00
Dean Herbert
98189b2b87
Merge branch 'master' into update-framework 2019-05-18 12:10:37 +09:00
Roman Kapustin
a538c94fed Update NuGet packages 2019-05-17 21:40:46 +03:00
smoogipoo
ccbf3ff812 Update framework 2019-05-17 22:35:23 +09:00
Tav TaOr
7575af6f42 Merged master into autopilot 2019-05-17 14:15:30 +03:00
Dean Herbert
2d56413e35 Update namespaces 2019-05-17 19:15:59 +09:00
Dean Herbert
c41ec20236 Improve load and switch logic between views 2019-05-17 18:31:53 +09:00
Dean Herbert
e94b9feebd Fix dynamic recompilation in TestSceneChangelogOverlay 2019-05-17 18:31:53 +09:00
David Zhao
fcffad6553 Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-05-17 11:35:35 +09:00
David Zhao
5bf513eba8 Don't track immediately when entering mode 2019-05-17 11:24:34 +09:00
Lucas A
5a72d509f2 Resolve merge conflicts 2019-05-16 18:48:15 +02:00
Dean Herbert
5d33a742c6 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-16 18:55:28 +09:00
Dean Herbert
1ccef61f7b Fix some missed instances of TestCase 2019-05-15 18:32:29 +09:00
Dean Herbert
19a179db92 Bring up-to-date with master 2019-05-15 18:30:02 +09:00
Dean Herbert
a717970e11 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 18:27:51 +09:00
Dean Herbert
60d244d2d6 Clean up events and states 2019-05-15 18:08:19 +09:00
Dean Herbert
f49b0dc16d Initial clean-up pass of breadcrumb and header 2019-05-15 17:55:26 +09:00
smoogipoo
5f56c38475 Merge remote-tracking branch 'origin/master' into rename_test_case 2019-05-15 15:52:06 +09:00
Dean Herbert
88528e797f Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-15 14:24:45 +09:00
Dean Herbert
e7409a28a3 Merge branch 'move-screen-dependencies' into tournament-tools 2019-05-15 13:05:12 +09:00
Dean Herbert
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Roman Kapustin
459a285cd8 Rename test cases to test scenes inline with the framework change 2019-05-14 22:37:25 +03:00
Lucas A
2d966682dc Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-14 18:09:58 +02:00
Dean Herbert
2200959dd0
Merge branch 'master' into remember-fps-display-state 2019-05-14 19:19:46 +09:00
Dean Herbert
4c221e43a9 Apply minimal changes to make framework compile 2019-05-14 18:39:56 +09:00
smoogipoo
d5e25c05b3 Increase loader animation test wait 2019-05-14 18:39:03 +09:00
Dan Balasescu
d3d20773ee
Merge branch 'master' into fullscreen-overlay 2019-05-14 17:40:20 +09:00
Dean Herbert
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
Dean Herbert
aff239a4fb Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay 2019-05-14 17:33:30 +09:00
Dan Balasescu
d040fe9635
Merge branch 'master' into tidy-osu-game 2019-05-14 16:52:56 +09:00
smoogipoo
f1c9073338 Fix commented line check not working with whitespace 2019-05-14 16:16:55 +09:00
Dean Herbert
a765f2502d Add simple test case for FullscreenOverlay 2019-05-14 15:14:00 +09:00
Dean Herbert
ca2662e941 Rename incorrectly named test cases 2019-05-14 14:58:36 +09:00
Dean Herbert
cc558cf073 Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay 2019-05-14 13:36:17 +09:00
Dan Balasescu
157ba01d60
Merge branch 'master' into tidy-osu-game 2019-05-14 12:19:39 +09:00
Dean Herbert
a98accb4d4 Add tests for cached types in OsuGame and OsuGameBase 2019-05-14 11:05:53 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
smoogipoo
19bc6b72cc More tests to showcase failures 2019-05-14 10:13:42 +09:00
smoogipoo
7aa10956b5 Add unit test 2019-05-14 09:46:42 +09:00
Dean Herbert
d18504bfe0 Attempt to fix pause test failures by reducing steps 2019-05-13 19:23:38 +09:00
Dean Herbert
8ecd1912e1 Split out web response classes into own files 2019-05-13 17:24:33 +09:00
Dean Herbert
4b8a9bae34 Remove unused test case 2019-05-13 17:17:20 +09:00
Dean Herbert
27ca094421 Update outdated licence headers 2019-05-13 17:14:52 +09:00
Lucas A
1fe4d20d9b Fix references to UserActivities in Tests 2019-05-12 17:47:02 +02:00
Dean Herbert
31b72f168d Fix deprecated calls and code styling (partly) 2019-05-13 00:46:22 +09:00
Lucas A
18fc965d7a Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 17:39:13 +02:00
Dean Herbert
34f54aa945 Resolve compile-time issues 2019-05-13 00:36:05 +09:00
Dean Herbert
943e1574a4
Merge branch 'master' into changelog-overlay 2019-05-13 00:24:18 +09:00