Commit Graph

1338 Commits

Author SHA1 Message Date
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
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
1fa87521f6 fix restarting with a different track in the same BeatmapSet 2019-01-26 07:29:30 +01:00
3d5520d277 correctly loop from preview point in SongSelect 2019-01-26 07:09:01 +01: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
097062caf7 Addresses requested changes 2019-01-08 17:57:03 +01:00
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
562c9e56fb Fix naming 2019-01-06 13:38:43 +01:00
472325b885 Verify leaderboard scope to be local 2019-01-06 13:37:30 +01:00
a93c26ccfd Filename does not match contained type 2019-01-04 20:40:07 +01:00
3879348ee4 Implement clear scores on beatmap 2019-01-04 20:23:06 +01: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
8a2cc64bfa Split results screen to allow for extensibility 2018-12-21 16:34:03 +09:00
eec5afa382 Change inspection and add redundant parenthesis to appease codefactor 2018-12-15 16:37:37 +09:00
3892454ecc Improve the way text search works at song select 2018-12-15 16:34:48 +09:00
d9fc7c7d66 Separate out Leaderboard into BeatmapLeaderboard 2018-12-14 19:51:27 +09:00
5f0069eb83 Fix incorrect ruleset being sent to API 2018-12-14 17:35:05 +09:00
56fd4b95cd Fix mod/beatmap selection not always working 2018-12-14 13:38:27 +09:00
208273f16a Merge branch 'timeshift'
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-13 17:06:20 +09:00