1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 10:52:55 +08:00
Commit Graph

13724 Commits

Author SHA1 Message Date
DrabWeb
77ff0640c2 Add a gradient over the cover in Header. 2018-05-29 01:53:45 -03:00
DrabWeb
c8ce34b6d4 Add Match Info. 2018-05-29 01:51:04 -03:00
DrabWeb
98819880c4 Add match screen header. 2018-05-29 01:16:39 -03:00
DrabWeb
ab3ac49a2d Add empty Match screen. 2018-05-29 01:16:39 -03:00
DrabWeb
d090323c00 Add ParticipantCount to share with the Match screen. 2018-05-29 00:51:56 -03:00
DrabWeb
852d7ef48d Use ?: expression instead of if/else. 2018-05-29 00:07:33 -03:00
DrabWeb
7beac3a712 Cleanup DrawableRoom. 2018-05-28 23:56:00 -03:00
DrabWeb
dcc39d96e2 BeatmapModeInfo -> BeatmapTypeInfo. 2018-05-28 23:45:59 -03:00
DrabWeb
bd9af745dd Cleanup.
(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
2018-05-28 23:41:50 -03:00
DrabWeb
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
DrabWeb
8b36e1dad0 Add BeatmapTitle to encapsulate multiplayer beatmap title display logic.
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
2018-05-28 23:41:07 -03:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
DrabWeb
e920b8d577 Add UpdateableBeatmapSetCover. 2018-05-28 19:11:26 -03:00
Aergwyn
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
smoogipoo
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
Dean Herbert
1572635fc8
Merge pull request #2660 from smoogipoo/fix-holdnote-judgement
Fix mania hold notes displaying judgements
2018-05-28 18:35:02 +09:00
smoogipoo
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +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
ce8a6cfc53
Merge pull request #2603 from DrabWeb/multiplayer-lounge
Multiplayer lounge
2018-05-28 14:39:19 +09:00
Dean Herbert
ed7c860802 Adjust transitions of DrawableRoom 2018-05-28 13:30:29 +09:00
Dean Herbert
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
Dean Herbert
0ca6d73f0e Add a delay before the osu! logo appears when exiting multiplayer 2018-05-28 13:30:17 +09:00
Dean Herbert
3c3412791c Merge remote-tracking branch 'upstream/release' into multiplayer-lounge 2018-05-28 13:30:04 +09:00
smoogipoo
b267ec3178 Fix failing test 2018-05-28 03:48:09 +09:00
smoogipoo
3abfd4711d Fix wrong clock being seeked when unpausing 2018-05-28 03:42:53 +09:00
smoogipoo
8ae2a3696f Apply platform universal offset at player level 2018-05-28 03:31:46 +09:00
Dan Balasescu
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
Dean Herbert
4f0d7bd63e Update framework 2018-05-27 15:14:25 +09:00
Dean Herbert
916c9e7e89 Merge remote-tracking branch 'ppy/master' into fix-osu-autoplay 2018-05-27 15:12:52 +09:00
Dean Herbert
95315e46f0 Make drawable rooms fade in when first displayed
Stops filtered rooms from briefly displaying.
2018-05-27 14:12:20 +09:00
Dean Herbert
12b5ca1b0d
Merge branch 'master' into multiplayer-lounge 2018-05-27 11:15:03 +09:00
Dean Herbert
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
Dean Herbert
bcdbd97da9
Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
Dean Herbert
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
Dean Herbert
b0d2af16f1
Merge pull request #2611 from frankhjwx/catch_spinner
Fixed banana generation on catch specific maps
2018-05-26 12:48:47 +09:00
Dean Herbert
8b2a6b8cce Fix formatting 2018-05-26 12:38:33 +09:00
Dean Herbert
8a5cd85ecd
Merge branch 'master' into catch_spinner 2018-05-26 12:36:42 +09:00
Dean Herbert
18c3339cd2
Merge pull request #2637 from HoutarouOreki/CursorOverrideContainer-rename
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-26 12:31:58 +09:00
Dean Herbert
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
Dean Herbert
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
Dean Herbert
e016f98841
Merge branch 'master' into diffcalc-fixes 2018-05-26 12:10:31 +09:00
Dan Balasescu
a87c26028f
Merge pull request #2633 from peppy/fix-failing-tests
Fix quit button test occasionally failing
2018-05-26 11:56:57 +09:00
smoogipoo
d850e34003 Actually cast to int 2018-05-26 09:25:16 +09:00
Roman Kapustin
572c3f5189 Stop preview playback when an overlay is popping out 2018-05-25 23:51:05 +03:00
Roman Kapustin
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
HoutarouOreki
63fb9ddec4 Forgot file name 2018-05-25 21:20:42 +02:00
HoutarouOreki
e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
HoutarouOreki
39224931f8 Try satisfying AppVeyor 2018-05-25 14:25:12 +02:00
HoutarouOreki
71c04f4605 Add license header to the new file 2018-05-25 14:10:54 +02:00