Commit Graph

1195 Commits

Author SHA1 Message Date
6e821a426d Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +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
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
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
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
ac0bc53c4b Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
2019-01-31 00:02:05 +09:00
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
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11:00
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
dae710f9a6 Make leaderboard top not fade by default 2018-12-27 17:29:55 +09:00
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +09:00
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
2f32c4d4d1 Fix title of match song select 2018-12-25 17:17:51 +09:00
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
e6c197e9aa Merge branch 'master' into improve-text-search 2018-12-22 16:38:50 +09:00
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
ac0e6f8d42 Fix post-merge issues 2018-12-22 15:35:22 +09:00
bdb6e03dfb Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
# Conflicts:
#	osu.Game/Online/Leaderboards/Leaderboard.cs
#	osu.Game/Online/Leaderboards/LeaderboardScore.cs
#	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
#	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
787e65c3c5 Reduce generic-ness 2018-12-22 15:20:35 +09:00
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00