Commit Graph

1434 Commits

Author SHA1 Message Date
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00
e6449db8e3 Null metrics on null beatmap for transition animation 2019-03-13 14:13:42 +09:00
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
8230d5b52e Ensure initial blur is set on song select background creation
We do not want the blur transition to play here
2019-03-12 17:27:20 +09:00
1954eaca4c Populate an initial beatmap 2019-03-12 14:01:27 +09:00
9df27f3a5f Merge branch 'master' into prevent-null-lookup 2019-03-09 11:14:54 +09:00
8e5816805c Fix showing outdated data for non-online beatmaps 2019-03-08 18:44:35 +09:00
c34e110a2c Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
054db48089 Move online id null check to only bypass metrics lookup 2019-03-07 16:59:43 +09:00
e5e454ddcd Don't perform lookup of beatmap stats unless an online id is present 2019-03-07 16:17:12 +09:00
e13516c2ba Only attempt to restore CurrentItem state if present 2019-03-07 14:09:28 +09:00
6e5ea78ca2 Fix some nullref crashes when escaping out of new room creation 2019-03-06 20:03:37 +09:00
fd147dae21 Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master
# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
a37445a938 Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
4c8aa65200 private + renaming 2019-02-28 17:02:45 +09:00
6e821a426d Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +09:00
0788a7e9f1 Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
a3f71d69a9 Ensure ruleset and mods are set correctly when leaving MatchSongSelect 2019-02-27 16:16:13 +09:00
7c2ffb1826 Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
5b4319a80f Fix home button being cancelled by mod select again 2019-02-26 21:01:28 -08:00
56697339b3 Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
d9872dda12 Use fade instead of negative margin 2019-02-26 16:10:06 +09:00
2d6d9dd723 Add better easing 2019-02-26 16:09:45 +09:00
c1432b2ed5 Add back newline 2019-02-26 15:48:34 +09:00
97dc7f9819 Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +09:00
6881563346 Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00
ad1bce3585 Fix song select backround not being exited in time 2019-02-25 18:40:19 +09:00
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
3015d40f8f Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
9b3f2fdd24 Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
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
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00