Commit Graph

15554 Commits

Author SHA1 Message Date
f6f18e2fe2 Merge pull request #2671 from Tom94/fix-vscode
Add build tasks for visual tests and fix broken launch tasks
2018-05-29 15:49:44 +09:00
4f73f6e0e0 Add build tasks for visual tests and fix broken launch tasks 2018-05-29 08:38:43 +02:00
8595c821b4 Add TestCaseMatchHeader. 2018-05-29 03:34:02 -03:00
b4b4a8a157 Add TestCaseMatchInfo. 2018-05-29 03:24:38 -03:00
94b54a0520 Adjust design of ReadyButton. 2018-05-29 03:03:51 -03:00
3915cb7f2f Add Match Participants, change Room.Users to IEnumerable. 2018-05-29 02:42:52 -03:00
77ff0640c2 Add a gradient over the cover in Header. 2018-05-29 01:53:45 -03:00
c8ce34b6d4 Add Match Info. 2018-05-29 01:51:04 -03:00
98819880c4 Add match screen header. 2018-05-29 01:16:39 -03:00
ab3ac49a2d Add empty Match screen. 2018-05-29 01:16:39 -03:00
d090323c00 Add ParticipantCount to share with the Match screen. 2018-05-29 00:51:56 -03:00
852d7ef48d Use ?: expression instead of if/else. 2018-05-29 00:07:33 -03:00
7beac3a712 Cleanup DrawableRoom. 2018-05-28 23:56:00 -03:00
dcc39d96e2 BeatmapModeInfo -> BeatmapTypeInfo. 2018-05-28 23:45:59 -03:00
bd9af745dd Cleanup.
(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
2018-05-28 23:41:50 -03:00
8b8d10349e Move RoomInspector info panel content to BeatmapModeInfo to share with Match.
(cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)
2018-05-28 23:41:42 -03:00
8b36e1dad0 Add BeatmapTitle to encapsulate multiplayer beatmap title display logic.
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
2018-05-28 23:41:07 -03:00
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
e920b8d577 Add UpdateableBeatmapSetCover. 2018-05-28 19:11:26 -03:00
2b3a630270 add OverlayActivation enum
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
5be46307fd Fix results screen parallax being cut off
Alternative to / closes #2549.

Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09:00
1572635fc8 Merge pull request #2660 from smoogipoo/fix-holdnote-judgement
Fix mania hold notes displaying judgements
2018-05-28 18:35:02 +09:00
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +09:00
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
3a5228af43 Make GameBeatmap late-bind its AudioManager for ctor Beatmap access 2018-05-28 17:55:41 +09:00
ce8a6cfc53 Merge pull request #2603 from DrabWeb/multiplayer-lounge
Multiplayer lounge
2018-05-28 14:39:19 +09:00
ed7c860802 Adjust transitions of DrawableRoom 2018-05-28 13:30:29 +09:00
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
0ca6d73f0e Add a delay before the osu! logo appears when exiting multiplayer 2018-05-28 13:30:17 +09:00
3c3412791c Merge remote-tracking branch 'upstream/release' into multiplayer-lounge 2018-05-28 13:30:04 +09:00
b267ec3178 Fix failing test 2018-05-28 03:48:09 +09:00
3abfd4711d Fix wrong clock being seeked when unpausing 2018-05-28 03:42:53 +09:00
8ae2a3696f Apply platform universal offset at player level 2018-05-28 03:31:46 +09:00
b2b3976e9d Merge pull request #2644 from peppy/fix-osu-autoplay
Ensure autoplay tests actually increase score above zero
2018-05-27 15:35:26 +09:00
4f0d7bd63e Update framework 2018-05-27 15:14:25 +09:00
916c9e7e89 Merge remote-tracking branch 'ppy/master' into fix-osu-autoplay 2018-05-27 15:12:52 +09:00
95315e46f0 Make drawable rooms fade in when first displayed
Stops filtered rooms from briefly displaying.
2018-05-27 14:12:20 +09:00
12b5ca1b0d Merge branch 'master' into multiplayer-lounge 2018-05-27 11:15:03 +09:00
9abde7e91a Merge pull request #2622 from smoogipoo/fix-playlist-pause
Fix selecting song in playlist not starting the audio
2018-05-27 11:13:04 +09:00
bcdbd97da9 Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
b0d2af16f1 Merge pull request #2611 from frankhjwx/catch_spinner
Fixed banana generation on catch specific maps
2018-05-26 12:48:47 +09:00
8b2a6b8cce Fix formatting 2018-05-26 12:38:33 +09:00
8a5cd85ecd Merge branch 'master' into catch_spinner 2018-05-26 12:36:42 +09:00
18c3339cd2 Merge pull request #2637 from HoutarouOreki/CursorOverrideContainer-rename
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-26 12:31:58 +09:00
79442ad238 Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
b8b7e2cd9f Merge pull request #2636 from smoogipoo/diffcalc-fixes
Bring pp calculations more in-line with osu!stable
2018-05-26 12:18:41 +09:00
e016f98841 Merge branch 'master' into diffcalc-fixes 2018-05-26 12:10:31 +09:00
a87c26028f Merge pull request #2633 from peppy/fix-failing-tests
Fix quit button test occasionally failing
2018-05-26 11:56:57 +09:00
d850e34003 Actually cast to int 2018-05-26 09:25:16 +09:00