eb135b2e85
Merge branch 'master' into participant-count-default
2018-06-03 03:05:17 +09:00
a0c643fae5
Fix SongProgressInfo timespan formatting
2018-06-02 11:25:49 +02:00
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
59762c0393
Change Room.Participants to an IEnumerable.
2018-06-01 06:15:23 -03:00
8dd36ee1a9
Default Max to null in ParticipantCount.
2018-06-01 06:08:57 -03:00
b9c601074d
Formatting fixes
2018-06-01 15:45:09 +09:00
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation
2018-06-01 15:31:19 +09:00
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover
2018-05-31 17:33:31 +09:00
29f3011f75
Merge branch 'master' into fix-osu-logo-discrepancies
2018-05-31 15:21:44 +09:00
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
4ff803d11d
Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
2018-05-31 14:47:47 +09:00
76567ae98b
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:42:58 +09:00
cd3ca68f03
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:38:04 +09:00
35d8ec8df6
Merge branch 'master' into fix-player-life-management
2018-05-31 14:34:31 +09:00
ff93a54a64
Default Type to Title, use ToLower for the screen type title.
2018-05-30 23:16:54 -03:00
74c52e0a7c
Merge branch 'master' into multiplayer-screen-type
2018-05-31 00:16:43 +09:00
0caf15166e
Remove unnecessary FinishTransforms
2018-05-30 20:05:31 +09:00
0dafcf00b7
Fix some discrepancies with the main menu logo transitions
2018-05-30 19:50:00 +09:00
6d6b186fb2
Fix delayed logo animations playing even if screen has already been exited
2018-05-30 19:25:39 +09:00
a28e71995d
Offload database query to task
...
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
5872b61988
Fix potential double-disposal of player if PlayerLoader is finalised
2018-05-30 15:48:26 +09:00
54e53f7190
Fix player getting loaded when exiting song select
2018-05-30 15:48:20 +09:00
7b8211e6db
Add MultiplayerScreen.Type
2018-05-29 04:23:29 -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
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
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
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
975ce82177
Ensure autoplay tests actually increase score above zero
2018-05-26 14:46:05 +09:00
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
28aa6faef9
Merge branch 'master' into player_loader_input_toggles
2018-05-25 18:38:12 +09:00
0c0f86fe26
fix incorrect default values keeping overlays in wrong state
2018-05-23 16:25:10 +02:00
76fbc656a1
fix disclaimer allowing notifications
2018-05-22 17:53:36 +02:00
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable
2018-05-22 19:00:42 +09:00
99163ca8ba
Merge branch 'master' into fix-main-menu-escape
2018-05-22 18:17:51 +09:00
0e122468db
Fix progress easing to 0 if aborting after confirmation
2018-05-22 18:06:40 +09:00
d43e4af8ea
Fix overlap between quit button at key input overlay
2018-05-22 16:45:42 +09:00
436067c01f
Handle scale back in a nicer way
2018-05-22 16:44:37 +09:00
7b770d03c5
Use OnMouseMove instead of Update logic
2018-05-22 16:26:59 +09:00
babb7d5158
Fix white ring flash when holding button post-confirmation
2018-05-22 16:23:05 +09:00
