1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 10:22:56 +08:00
Commit Graph

3031 Commits

Author SHA1 Message Date
Dean Herbert
687d5d5ff1
Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
smoogipoo
268ea6a836 Wrong line 2019-03-02 13:28:16 +09:00
smoogipoo
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
Dean Herbert
796f6c3092 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-02 13:13:51 +09:00
Joehu
7077e405ab Use same size labels from song select 2019-03-01 15:48:58 -08:00
Joehu
e5bc927354 Add beatmap status on direct list panels 2019-02-28 19:38:05 -08:00
Joehu
f4a6612d48 Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08:00
Shane Woolcock
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
Shane Woolcock
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
Shane Woolcock
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00
Shane Woolcock
94199e628c Only display SupportedWindowModes in settings 2019-02-28 20:20:12 +09:00
Jamie Taylor
1f273a4c3a
Use local variables where appropriate 2019-02-28 19:58:48 +09:00
Dean Herbert
4ad3d76b13
Merge branch 'master' into beatmapsetoverlay-bindables 2019-02-28 19:19:36 +09:00
Dean Herbert
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
Jamie Taylor
b7f7174055
Refactor BeatmapSetOverlay to use chained bindables instead of accessors to distribute changes 2019-02-28 18:46:28 +09:00
Dean Herbert
93a4229ba6
Merge pull request #4357 from Joehuu/toquantity-1
Use ToQuantity instead for words with number prefixes
2019-02-28 16:37:36 +09:00
Jamie Taylor
8cf83e2f4a
Fix the check of beatmapset local availability 2019-02-28 16:14:50 +09:00
Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
Joehu
2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
99e2e6cf1c Align text 2019-02-28 14:46:52 +09:00
Dean Herbert
774116923b A few fixes 2019-02-28 14:45:59 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Shane Woolcock
ce17e37c74 Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
Dean Herbert
0faf83f7d1 Fix nullref in tests 2019-02-27 23:30:13 +09:00
smoogipoo
1006c539be Fix looping not being checked 2019-02-27 17:03:09 +09:00
smoogipoo
30815ace62 Fix crossthread operations due to Track.Completed 2019-02-27 16:52:34 +09:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert
2fbb0b4e6f Don't use this 2019-02-25 19:34:03 +09:00
Dean Herbert
140de26a56 Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure 2019-02-25 19:30:35 +09:00
Dean Herbert
ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
287870f1e1 Remove limitation stopping search updates when no query present in direct
Closes #4310.
2019-02-24 23:35:18 +09:00
Roman Kapustin
8b4aa708fa Resolve merge conflict 2019-02-22 23:04:45 +03:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
8853f7ad76 Explicitly set exo typeface in a few places 2019-02-21 19:26:02 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
062196c7da Cleanup 2019-02-20 20:52:56 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dan Balasescu
96590156cd
Merge branch 'master' into add-button-tooltip 2019-02-20 11:37:55 +09:00
Dean Herbert
f0743ebecf Merge remote-tracking branch 'upstream/master' into tournament-tools
# Conflicts:
#	osu.Game.Tournament.Tests/TestCaseDrawings.cs
#	osu.Game/osu.Game.csproj
2019-02-17 17:25:09 +09:00
Dean Herbert
5d502250d8 Fix account creation overlay not working
Regressed with screen stack changes.
2019-02-15 17:01:51 +09:00
Dean Herbert
1550908edb Add tooltip to key configuration button 2019-02-15 11:56:33 +09:00
Dean Herbert
813b36e98e
Merge pull request #4191 from peppy/leased-bindables-dont-work
Add screen leased bindables via DependencyContainer
2019-02-14 17:05:39 +09:00
Dean Herbert
a5f1f9830b Fix potential schedule race case and regression in enum setting 2019-02-14 16:21:01 +09:00
Roman Kapustin
a289cb7c6a Handle beatmapset removal in DownloadTrackingComposite 2019-02-13 22:11:46 +03:00
Roman Kapustin
99046f16e8 Revert "Update direct download button state on beatmap import and removal"
This reverts commit 11234d3c60.
2019-02-13 22:04:49 +03:00
Roman Kapustin
11234d3c60 Update direct download button state on beatmap import and removal 2019-02-12 21:20:49 +03:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
EVAST9919
4d489da032 small visual improvements 2019-02-10 04:16:56 +03:00
EVAST9919
04e57d7d3d Refactor to make things more flexible 2019-02-09 06:23:58 +03:00
EVAST9919
105053e91b TestCase fix 2019-02-09 00:56:41 +03:00
EVAST9919
107e0a5239 Warning fixes 2019-02-08 20:43:11 +03:00
EVAST9919
bd1f4f9549 Small design fixes 2019-02-08 20:35:07 +03:00
EVAST9919
13c154a0b3 Fix background colour and a bug with removing scores 2019-02-08 20:07:21 +03:00
EVAST9919
7a3ae0f479 update drawable score inline with the latest design 2019-02-08 19:50:02 +03:00
UselessToucan
b5e04f6161
Merge branch 'master' into notify_track_completion_failure 2019-02-08 19:37:23 +03:00
EVAST9919
f43ee6b6a3 update drawable top score inline with the latest design 2019-02-08 19:06:46 +03:00
EVAST9919
9cca11fb0d Warning fixes 2019-02-06 01:48:43 +03:00
EVAST9919
c85dc1a236 update another scores design 2019-02-05 19:32:33 +03:00
EVAST9919
f560dde157 Add some flow for info containers 2019-02-05 15:26:45 +03:00
EVAST9919
559960036e update top score design 2019-02-05 14:48:35 +03:00
Dan Balasescu
84ab16c7c8
Merge branch 'master' into keybindings-settings-groups 2019-02-05 11:42:53 +09:00
EVAST9919
d6d5bb5ecf remove useless nullcheck 2019-02-03 17:20:35 +03:00
EVAST9919
eeecbfcbe0 Fix warnings 2019-02-03 17:09:04 +03:00
Roman Kapustin
71efbcf603 Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure 2019-02-03 16:14:04 +03:00
EVAST9919
4b17ca0857 Fix wrong icons 2019-02-03 14:50:03 +03:00
EVAST9919
3b529b7bda Enable the sidebar and move "back" button to the key binding overlay 2019-02-03 14:34:04 +03:00
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Roman Kapustin
4c866e7940 Add PlaylistItemHandle.HandlePositionalInput override 2019-02-01 22:37:27 +03:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dan Balasescu
9968bdc0e4
Merge branch 'master' into download-tracking-component 2019-01-31 21:18:03 +09:00
Dan Balasescu
b85e119bae
Merge branch 'master' into reg-screen-focus-fix 2019-01-31 21:08:12 +09:00
Dean Herbert
c7cf3ef1cd Update licence headers 2019-01-31 19:17:42 +09:00
Dean Herbert
7c6512118e Fix importing progress bar not displaying 2019-01-31 19:15:17 +09:00
Dean Herbert
0b8bd520ab Shake in all cases 2019-01-31 19:15:04 +09:00
Dean Herbert
b89694a969 Fix "importing" state display 2019-01-31 19:09:04 +09:00
Dean Herbert
041e3bf823 Handle unbinding better 2019-01-31 19:08:54 +09:00
Dean Herbert
b69a19f810 Attach progress immediately 2019-01-31 19:08:45 +09:00
Dean Herbert
c54a515b3e Change where BindValueChange is immediately run 2019-01-31 18:49:54 +09:00
Dean Herbert
7f2fdac50e Update signatures 2019-01-31 18:47:30 +09:00
Dean Herbert
327a34f12a Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
Dean Herbert
23d0399e51 Allow deselection of textboxes on registration screen on mobile devices 2019-01-29 17:23:23 +09:00
Dan Balasescu
610c2df2d4
Merge branch 'master' into dont-always-focus-textboxes 2019-01-28 13:40:08 +09:00
Dean Herbert
a208874e74 Fix incorrect handling of download failures 2019-01-28 11:59:25 +09:00
jorolf
648ed0e467 update license headers 2019-01-27 23:45:00 +01:00
jorolf
54d8e4043f Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-01-27 23:32:48 +01:00
Dean Herbert
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
Dean Herbert
82d944dc89 Fix textbox colours not always being set corrrectly 2019-01-25 19:20:29 +09:00
Dean Herbert
a5f1aa644b Fix cursor sensitivity tooltip not updating instantly 2019-01-25 17:30:35 +09:00
Dean Herbert
a25dce53cd
Fix logical regression 2019-01-25 15:03:32 +09:00
Dean Herbert
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-25 14:55:28 +09:00
Dean Herbert
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
Dean Herbert
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal 2019-01-25 12:14:58 +09:00
Unknown
2bbaa2ac60 silently return instead of throwing 2019-01-24 16:02:47 +01:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545 Add overflow padding to account for parallax shifting
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Unknown
93c9037394 fix crash when config doesn't have tracked settings 2019-01-23 13:09:03 +01:00
Dean Herbert
1025c51e0d Allow filtering settings matching based on dropdown content 2019-01-23 17:30:05 +09:00
Dean Herbert
7d6d7cf457 Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +09:00
jorolf
14d2ed7085 fix codefactor issue that I didn't notice and has been there for 12 days 2019-01-22 19:50:42 +01:00
Dean Herbert
09553550a3 Remove remaining supporter check 2019-01-23 00:19:39 +09:00
Dean Herbert
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
Bear Daniel
7cdb823c87 Moved "Use beatmap hitsounds" button 2019-01-21 08:04:06 -06:00
Bear Daniel
858541bcf4 Added "Use beatmap hitsounds" button to volume section of settings 2019-01-18 02:33:39 -06:00
Dean Herbert
f489718e25 Fix non-matching filename 2019-01-18 14:35:32 +09:00
Dean Herbert
21e79f51b1 Remove necessity of BeatmapSetDownloader 2019-01-18 14:28:06 +09:00
Dean Herbert
8848fa8b1b Improve UX of download buttons on beatmap set overlay 2019-01-18 12:04:49 +09:00
Dean Herbert
b62630ecd2 Centralise download tracking logic so we can show it in multiple scenarios 2019-01-18 11:28:10 +09:00
nwabear
42fa04beee
Update SkinSection.cs
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
Dean Herbert
93a08bdb23 Remove stray using 2019-01-17 20:23:15 +09:00
Dean Herbert
d16f4af92b Use TransferValueOnCommit for mouse sensitivity 2019-01-17 19:18:40 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
jorolf
6ba7e2b670 split the profile header into several components 2019-01-11 01:12:19 +01:00
Dean Herbert
2c2ed1ae47
Merge branch 'master' into profile-header-update 2019-01-10 18:34:39 +09:00
Dean Herbert
5e4bea9d99 Fix extra newline 2019-01-10 12:11:14 +09:00
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
Dan Balasescu
8214faeacc
Merge branch 'master' into fix-over-inclusive-channel-search 2019-01-08 19:54:31 +09:00
smoogipoo
2c44b928d3 Remove unused references 2019-01-08 16:38:34 +09:00
smoogipoo
daeba63242 Remove more unused code 2019-01-08 16:37:18 +09:00
Dean Herbert
a2a7aa708f Use better logic for setting slider bar settings 2019-01-08 14:56:42 +09:00
Dean Herbert
01aa4c2a72 Use TransferOnCommit 2019-01-08 13:48:38 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
jorolf
52994c7ee8 Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update 2019-01-04 22:52:29 +01:00
jorolf
a33a1458a5 update design and make play styles an enum 2019-01-04 22:52:00 +01:00
Dean Herbert
01f6199c49
Merge branch 'master' into profile-header-update 2019-01-04 16:38:42 +09:00
Dean Herbert
3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b Size -> scale 2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642 Delay updates when changes would affect mouse position 2019-01-04 14:55:59 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
8b25e4c9ee Fix searching for "channel" matching all channels 2019-01-03 12:04:36 +09:00
FreezyLemon
0047f29ec8 move missing newline to front of "Plays with..." 2018-12-30 22:40:17 +01:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +09:00
Dean Herbert
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
jorolf
e05fbd4136 address some comments and improve ui 2018-12-25 01:09:49 +01:00
jorolf
360c17e2c7 appease CodeFactor and AppVeyor 2018-12-22 22:50:19 +01:00
jorolf
da99161736 add some missing stuff 2018-12-22 22:34:39 +01:00
jorolf
2fe80d5568 Update ProfileHeader to the new design 2018-12-22 21:50:25 +01:00
jorolf
15ae0cd70a Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2018-12-22 16:54:39 +01:00
jorolf
b4fa2d9049 WIP 2018-12-22 16:51:24 +01:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
Dean Herbert
c6b37c45b5
Merge pull request #3902 from smoogipoo/disable-chat-avatar-click
Disable avatar clicks in chat tabs
2018-12-22 20:11:01 +09:00
smoogipoo
40db23ff4c Disable avatar clicks in chat tabs 2018-12-22 19:30:52 +09:00
smoogipoo
0757beb3b8 Test for null before loading 2018-12-22 17:54:08 +09:00
smoogipoo
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat 2018-12-22 16:07:27 +09:00
smoogipoo
0e9991b81a Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 15:36:36 +09:00
Dean Herbert
e3308010c0
Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
2018-12-22 15:36:12 +09:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
Dean Herbert
870d843fff Fix username not displaying correctly in overlay 2018-12-22 14:40:55 +09:00
smoogipoo
f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00
smoogipoo
d93421b796 Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
Dean Herbert
81104f4803 Make standalone chat reuse more code from main chat overlay 2018-12-21 17:54:12 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
smoogipoo
104a3c8ffc Add click to avatar 2018-12-20 20:08:22 +09:00
Dean Herbert
bb4b54799f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-20 15:57:20 +09:00
Styphix
bacc07f5ec Changed OsuFocusedOverlayContainer to WaveOverlayContainer from ChannelSelectionOverlay
Not sure what colour i shouldve gone for but im certain that this should be fine
2018-12-18 19:44:31 -05:00
Dean Herbert
e9f661bbf5
Merge branch 'master' into user-registration 2018-12-17 05:05:06 +09:00
Dean Herbert
0b5f3c00bf Revert "Fix WaveOverlayContainer always being present"
This reverts commit a6fc128094.
2018-12-14 20:50:27 +09:00
Dean Herbert
13cabac386 Update in line with framework changes 2018-12-14 19:56:21 +09:00
smoogipoo
d9fc7c7d66 Separate out Leaderboard into BeatmapLeaderboard 2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration 2018-12-14 19:45:27 +09:00
Dean Herbert
f083b18663 Update in line with framework changes 2018-12-14 17:59:42 +09:00
Dean Herbert
a6fc128094 Fix WaveOverlayContainer always being present 2018-12-14 15:41:05 +09:00
smoogipoo
2aafaf9ce2 Merge branch 'timeshift-api-integration' 2018-12-13 17:07:39 +09:00
smoogipoo
208273f16a Merge branch 'timeshift'
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-13 17:06:20 +09:00
Dean Herbert
4fc9902cd2 Fix reverting to default skin via settings button causing a hard crash 2018-12-12 21:30:21 +09:00
smoogipoo
450e4cd223 Hook up API 2018-12-12 19:04:11 +09:00
smoogipoo
9af2b49c01 Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
41c7d10dff Fix compilation issues (+ use updated framework) 2018-12-10 13:48:05 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dean Herbert
2122966cd4 Show channel selector when no channels are joined 2018-12-07 13:26:31 +09:00
Dean Herbert
b0e2b56e85 Don't show warning screen if no previous account is detected 2018-12-06 16:54:08 +09:00
Dean Herbert
de8c5a6df0 Block input and show loading when submitting registration 2018-12-06 16:29:41 +09:00
Dean Herbert
09f985c721 Add warning lines 2018-12-06 15:49:06 +09:00
Dean Herbert
d5de5d1cb7 Fix textbox focus issues 2018-12-06 14:57:00 +09:00
Dean Herbert
cc3ccc4c40 Affix logo in place better 2018-12-06 12:53:35 +09:00
Dean Herbert
88052dcea1 Reset to welcome screen on exiting mid-process 2018-12-06 12:38:11 +09:00
Dean Herbert
d3f5111fa1 Use relative URL 2018-12-06 12:18:21 +09:00
Dean Herbert
e56f4cc8a5 Add remaining steps to registration screen 2018-12-06 11:58:09 +09:00