1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 22:27:39 +08:00
Commit Graph

1298 Commits

Author SHA1 Message Date
Dean Herbert
e2503888a4 Expose carousel's loaded flag 2019-03-21 20:51:06 +09:00
David Zhao
2646126d86 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-20 14:29:20 +09:00
David Zhao
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
Dean Herbert
e59917ed03 Merge remote-tracking branch 'upstream/master' into correct-preview-loop 2019-03-20 10:58:15 +09:00
David Zhao
f1b2073bf6 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-19 13:01:05 +09:00
Dean Herbert
14df9f94e2
Merge branch 'master' into fix-background-loading 2019-03-18 14:59:35 +09:00
David Zhao
eac7672c6b Clean up debug logging 2019-03-18 14:03:54 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework 2019-03-18 11:34:59 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability 2019-03-18 10:59:06 +09:00
Dean Herbert
c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
David Zhao
8cdfb1fd61 Remove BlurrableBackgroundScreen, rework tests 2019-03-14 16:09:17 +09:00
David Zhao
8714902349 Handle all blurring directly from background 2019-03-14 14:02:46 +09:00
Jamie Taylor
69eb4ef983
Change updateMetrics parameter to be optional 2019-03-14 13:35:49 +09:00
Dean Herbert
dd6fbccb56 Slight refactoring of order for readability 2019-03-13 19:57:45 +09:00
David Zhao
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00
Jamie Taylor
e6449db8e3
Null metrics on null beatmap for transition animation 2019-03-13 14:13:42 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
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
Dean Herbert
1954eaca4c Populate an initial beatmap 2019-03-12 14:01:27 +09:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup 2019-03-09 11:14:54 +09:00
Jamie Taylor
8e5816805c
Fix showing outdated data for non-online beatmaps 2019-03-08 18:44:35 +09:00
Jamie Taylor
c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
Jamie Taylor
054db48089
Move online id null check to only bypass metrics lookup 2019-03-07 16:59:43 +09:00
Jamie Taylor
e5e454ddcd
Don't perform lookup of beatmap stats unless an online id is present 2019-03-07 16:17:12 +09:00
Jamie Taylor
e13516c2ba
Only attempt to restore CurrentItem state if present 2019-03-07 14:09:28 +09:00
Jamie Taylor
6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation 2019-03-06 20:03:37 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
Dean Herbert
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
Dean Herbert
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
Dean Herbert
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
Dean Herbert
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
Dean Herbert
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
Dean Herbert
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
Dean Herbert
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
Dan Balasescu
a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
Jamie Taylor
4c8aa65200
private + renaming 2019-02-28 17:02:45 +09:00
Jamie Taylor
6e821a426d
Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +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
Dean Herbert
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Jamie Taylor
a3f71d69a9
Ensure ruleset and mods are set correctly when leaving MatchSongSelect 2019-02-27 16:16:13 +09:00
Jamie Taylor
7c2ffb1826
Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
Joehu
5b4319a80f Fix home button being cancelled by mod select again 2019-02-26 21:01:28 -08:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert
d9872dda12 Use fade instead of negative margin 2019-02-26 16:10:06 +09:00
Dean Herbert
2d6d9dd723 Add better easing 2019-02-26 16:09:45 +09:00
Dean Herbert
c1432b2ed5
Add back newline 2019-02-26 15:48:34 +09:00
Dean Herbert
97dc7f9819
Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
David Zhao
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00
David Zhao
ad1bce3585 Fix song select backround not being exited in time 2019-02-25 18:40:19 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +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
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
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +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
ThePyrotechnic
7bb56a198a
Merge branch 'master' into MissingSource 2019-02-17 19:54:43 +00:00
Dean Herbert
94ceb1e32b Move screen change allowance to local usage 2019-02-14 13:28:21 +09:00
Dean Herbert
e604806398 Fix regression in screen change allowance logic 2019-02-13 19:43:01 +09:00
Dean Herbert
ab3adafafd Fix crashes after entering player 2019-02-13 14:13:54 +09:00
Michael Manis
5fbdbcf209 removed 'unknown source' line 2019-02-12 15:30:42 -05:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
Michael Manis
cfe14dcdb1 Options for handing unknown beatmap source 2019-02-10 18:31:39 -05:00
smoogipoo
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Unknown
8c1f8ee596 restart correctly when leaving player (without noises) 2019-01-31 12:33:08 +01:00
Unknown
e2347ae7bf Merge branch 'master' into correct-preview-loop 2019-01-31 10:53:09 +01:00
Dean Herbert
f85518b175 Don't expose padding 2019-01-31 18:16:28 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen 2019-01-31 01:08:06 +09:00
smoogipoo
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
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
Unknown
1fa87521f6 fix restarting with a different track in the same BeatmapSet 2019-01-26 07:29:30 +01:00
Unknown
3d5520d277 correctly loop from preview point in SongSelect 2019-01-26 07:09:01 +01:00
phosphene47
5c70be07ab Display carousel over beatmap info wedge 2019-01-25 22:58:55 +11: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
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Microgolf
097062caf7 Addresses requested changes 2019-01-08 17:57:03 +01:00
smoogipoo
b17b88d071 Fix null beatmap possibly being selected 2019-01-08 18:06:46 +09:00
Matthias Coenraerds
562c9e56fb Fix naming 2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885 Verify leaderboard scope to be local 2019-01-06 13:37:30 +01:00
Matthias Coenraerds
a93c26ccfd Filename does not match contained type 2019-01-04 20:40:07 +01:00
Matthias Coenraerds
3879348ee4 Implement clear scores on beatmap 2019-01-04 20:23:06 +01:00
smoogipoo
dae710f9a6 Make leaderboard top not fade by default 2018-12-27 17:29:55 +09:00
Dean Herbert
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
Dean Herbert
8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +09:00
Dean Herbert
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
smoogipoo
2f32c4d4d1 Fix title of match song select 2018-12-25 17:17:51 +09:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
Dan Balasescu
e6c197e9aa
Merge branch 'master' into improve-text-search 2018-12-22 16:38:50 +09:00
smoogipoo
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
smoogipoo
ac0e6f8d42 Fix post-merge issues 2018-12-22 15:35:22 +09:00