2a87b851fa
Add proper transaction rollback logic on exception
2018-05-29 16:23:27 +09: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
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
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
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
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
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
79442ad238
Merge branch 'master' into CursorOverrideContainer-rename
2018-05-26 12:19:47 +09:00
63fb9ddec4
Forgot file name
2018-05-25 21:20:42 +02:00
e2d840c2de
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-25 21:13:40 +02:00
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
cc69f07172
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
2018-05-25 18:52:05 +09:00
1cb7d50407
Add and use default size (smaller than before)
2018-05-25 18:51:57 +09:00
1b5bb79fe9
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
2018-05-25 18:50:30 +09:00
28aa6faef9
Merge branch 'master' into player_loader_input_toggles
2018-05-25 18:38:12 +09:00
385c2c5c86
Merge branch 'master' into musiccontroller-nullref
2018-05-25 11:01:09 +09:00
568d4882c6
Remove unnecessary null coalesce
2018-05-25 11:00:56 +09:00
7961c56239
Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change
2018-05-25 10:55:01 +09:00
b649025e86
beginUserDrag/endUserDrag
2018-05-24 14:36:48 +09:00
d4f68e0b67
Fix possible NaN values due to trackvirtual infinite length
2018-05-24 14:31:31 +09:00
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
5a517bad63
Move beatmap cleanup to Dispose()
2018-05-24 12:53:32 +09:00
542eb848b0
Fix GetBoundCopy on IGameBeatmap not working
2018-05-24 12:42:58 +09:00
0c0f86fe26
fix incorrect default values keeping overlays in wrong state
2018-05-23 16:25:10 +02:00
fb78854485
Fix audio playback getting paused if playlist changes beatmap
2018-05-23 19:41:13 +09:00
a5d2d74447
Remove whitespace
2018-05-23 19:01:27 +09:00
a25462e10f
Fix testcase audio + dependency overrides not working
2018-05-23 18:52:09 +09:00
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
6c0c932c48
Reorder OsuGameBase methods
2018-05-23 14:56:40 +09:00
f894d73501
Fix possible MusicController nullref
2018-05-23 14:36:09 +09:00
a30f72b477
Add helper methods for seeking/scrolling
2018-05-23 14:32:00 +09:00
6b0eeb3436
Rework seeking interactions to support smooth scrolling
2018-05-23 14:14:32 +09:00
