1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 12:22:55 +08:00
Commit Graph

2884 Commits

Author SHA1 Message Date
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
UselessToucan
b5e04f6161
Merge branch 'master' into notify_track_completion_failure 2019-02-08 19:37:23 +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
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
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
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