1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:17:24 +08:00
Commit Graph

409 Commits

Author SHA1 Message Date
Dean Herbert
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
HoutarouOreki
e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
Dean Herbert
adeb23d54b
Merge branch 'master' into fix-failing-tests 2018-05-25 19:36:05 +09:00
Dean Herbert
8977670088 Update framework 2018-05-25 19:21:49 +09:00
Dean Herbert
7d06a08c3a Fix quit button test occasionally failing 2018-05-25 17:44:56 +09:00
jorolf
8fbda5bc59 add license header 2018-05-22 15:41:10 +02:00
jorolf
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
Dean Herbert
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button 2018-05-21 23:45:06 +09:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
DrabWeb
136c57b824 Don't set size in ctor. 2018-05-19 02:27:33 -03:00
DrabWeb
ad878003f7 Add null room support to RoomInspector. 2018-05-19 02:23:09 -03: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
Dean Herbert
28df77e838 Simplify code and remove generic 2018-05-15 21:10:26 +09:00
Dean Herbert
0def847f60
Merge branch 'master' into screen-breadcrumbs 2018-05-15 19:39:03 +09:00
Dean Herbert
fc192c8998 Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons 2018-05-15 19:23:51 +09:00
smoogipoo
9536c324fa Rename aborted -> fired 2018-05-14 19:08:00 +09:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation 2018-05-14 18:13:40 +09:00
DrabWeb
518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
Dean Herbert
f1fd2ae7be
Merge branch 'master' into modmouseup 2018-05-11 21:41:14 +09:00
Dean Herbert
7cb0d328e6 Make mods screen dynamically testable 2018-05-11 21:40:48 +09:00
Dean Herbert
c19432dc6d
Merge branch 'master' into ruleset-beatmap-statistics 2018-05-11 17:37:50 +09:00
DrabWeb
fa403e4e2a Add test step to test pushing after a previous screen is made current. 2018-05-11 04:49:40 -03:00
smoogipoo
73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
DrabWeb
ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
DrabWeb
6f7d0c19ef Remove redundant default value. 2018-05-10 22:02:27 -03:00
DrabWeb
a294f187ee Add steps and asserts to TestCaseScreenBreadcrumbs. 2018-05-10 21:52:26 -03:00
DrabWeb
b9adeeb063 Add ScreenBreadcrumbControl. 2018-05-10 21:35:26 -03:00
DrabWeb
a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
DrabWeb
2d206d258a Move multiplayer screen components to osu.Game/Screens/Multi/Components 2018-05-10 20:44:24 -03:00
DrabWeb
c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework 2018-05-10 19:10:07 +08:00
Dean Herbert
9e26bcd571 Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap 2018-05-10 19:51:52 +09:00
smoogipoo
c03ab9014f Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
2018-05-10 18:48:48 +09:00
Dean Herbert
fadb1a5e0b Add tests and expand functionality to ensure single fire 2018-05-10 17:31:16 +09:00
smoogipoo
c7bc79bce3 Remove explicit clock in TestCaseBreakOverlay 2018-05-09 12:40:04 +09:00
smoogipoo
09c70a9362 Add info label tests to TestCaseBeatmapInfoWedge 2018-05-07 15:51:08 +09:00
smoogipoo
6a9f139d9b Instantiate convertible hitobjects for beatmap info wedge 2018-05-07 15:51:08 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
27c8591d48 Fix reference to old name 2018-05-07 10:07:50 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
20509b1cc2 Fix non-IBeatmap usage 2018-05-07 09:59:45 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Roman Kapustin
b0e556d83f Actualize QuitButton visual test 2018-05-04 00:01:00 +03:00
Roman Kapustin
39db1e8cbb Rename HoldToQuit to QuitButton 2018-05-03 23:50:30 +03:00