Commit Graph

2624 Commits

Author SHA1 Message Date
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
7bb56a198a Merge branch 'master' into MissingSource 2019-02-17 19:54:43 +00:00
94ceb1e32b Move screen change allowance to local usage 2019-02-14 13:28:21 +09:00
e604806398 Fix regression in screen change allowance logic 2019-02-13 19:43:01 +09:00
ab3adafafd Fix crashes after entering player 2019-02-13 14:13:54 +09:00
5fbdbcf209 removed 'unknown source' line 2019-02-12 15:30:42 -05:00
e2e615cc5c Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
cfe14dcdb1 Options for handing unknown beatmap source 2019-02-10 18:31:39 -05:00
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
8c1f8ee596 restart correctly when leaving player (without noises) 2019-01-31 12:33:08 +01:00
e2347ae7bf Merge branch 'master' into correct-preview-loop 2019-01-31 10:53:09 +01:00
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
d34aa50613 Merge branch 'master' into iscreen 2019-01-31 01:08:06 +09:00