Commit Graph

3377 Commits

Author SHA1 Message Date
21317806c9 Merge remote-tracking branch 'upstream/master' into nwabear-master 2019-01-22 10:07:35 +09:00
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
b373d78143 Add slight easing 2019-01-22 09:47:51 +09:00
25b5bbcd8f Merge branch 'master' into score-panel-layout 2019-01-22 09:43:37 +09:00
86581feb4a Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H 2019-01-22 01:29:58 +01:00
d7d2e2fe44 trimmed whitespace 2019-01-21 19:22:19 +01:00
65fd69c817 Update HUDOverlay.cs
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
fb51578df3 Update PlayerSettingsOverlay.cs
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
e74f0057bd Automatically layout based on score display width 2019-01-21 17:07:56 +09:00
fa6dd8c99e Code sanity 2019-01-20 19:03:06 +10:30
521b11dfcb Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
2019-01-20 18:51:17 +10:30
5269ca31be Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
1d40d88f82 Merge branch 'master' into add-room-null-check 2019-01-17 21:34:25 +09:00
59f7c5a26e Fix room inspector cover not resetting when no room selected 2019-01-17 18:44:22 +09:00
ba9cdf2ce2 Add null check to fix crash on deselecting multiplayer room 2019-01-17 18:17:47 +09:00
491537b8ba Add fade duration
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
2019-01-17 18:13:05 +09:00
c1f5c0edc9 Merge branch 'master' into hide-multiplayer-match-room-tab 2019-01-17 18:02:17 +09:00
2bc3464802 Hide Room tab when Settings tab is active 2019-01-17 17:27:34 +09:00
f982b6da55 Don't hide 'hold for menu' even hud is hidden 2019-01-17 16:49:04 +09:00
99c963c56a Merge branch 'master' into cancel-request-on-disposal 2019-01-17 15:29:49 +09:00
b6fb3a5c05 Cancel request on disposal for RoomInspector 2019-01-17 15:14:30 +09:00
2ab0c4632e Merge branch 'master' into menu-background-skinning 2019-01-17 14:23:03 +09:00
75113db438 Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
Min
29e8c21c46 Merge branch 'master' into menu-background-skinning 2019-01-11 11:36:20 +09:00
aa68bbc1d9 Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
2dc185f249 Display avatars rather than full scores 2019-01-09 15:27:08 +09:00
0bf9e9b86b Merge branch 'master' into lounge-leaderboard 2019-01-09 10:28:55 +09:00
958840fe17 Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
6ce08312b2 Merge branch 'master' into fix-match-select-crash 2019-01-08 20:29:55 +09:00
2a4c91a6ab Remove unused using 2019-01-08 19:26:24 +09:00
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
49ba4e5a14 Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
b6dc6c4a74 Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +09:00
72482aff8d Whoops 2018-12-28 01:48:13 +09:00
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
12a93af156 Merge pull request #3939 from smoogipoo/fix-multi-mods
Fix plays with mods not submitting
2018-12-27 22:20:10 +09:00
a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00