1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 12:02:55 +08:00
Commit Graph

17485 Commits

Author SHA1 Message Date
Dean Herbert
6832e384a9 Simplify DT/HT/NC/DC 2019-03-12 18:14:41 +09:00
Dean Herbert
c1a356161f Allow use rate adjust to fallback to clock rate adjust 2019-03-12 18:14:01 +09:00
Dean Herbert
3c2d8cad0a Add better async logic for ScreenWithBeatmapBackground 2019-03-12 17:32:40 +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
ee7169a629 Use new non-immediate suspend logic in BackgroundScreenStack 2019-03-12 17:26:16 +09:00
Dan Balasescu
13f84e8d50
Merge pull request #4445 from Joehuu/direct-stats-offset
Fix direct panel stats being misaligned by one pixel
2019-03-12 17:22:30 +09:00
Dan Balasescu
e6e0cf1957
Merge branch 'master' into direct-stats-offset 2019-03-12 16:17:36 +09:00
smoogipoo
00191ca940 Actually set the beatmap difficulty 2019-03-12 15:24:35 +09:00
smoogipoo
059397ac50 Remove unnecessary early return for maching beatmap IDs 2019-03-12 14:40:13 +09:00
Dan Balasescu
47e28e8ad6
Merge pull request #4453 from peppy/ensure-import-sanity
Ensure import continues if an existing item's online IDs are in a bad state
2019-03-12 14:38:31 +09:00
Dan Balasescu
05358fa458
Merge branch 'master' into ensure-import-sanity 2019-03-12 14:24:07 +09:00
Dean Herbert
00feb34a3d Perform load even if default beatmap 2019-03-12 14:02:49 +09:00
Dean Herbert
1954eaca4c Populate an initial beatmap 2019-03-12 14:01:27 +09:00
Dan Balasescu
716df570bb
Merge pull request #4454 from peppy/4439-alternative
Refactor UpdateableBeatmapBackground lookup logic for clarity
2019-03-12 13:17:03 +09:00
Dan Balasescu
c92ecc4808
Merge branch 'master' into 4439-alternative 2019-03-12 13:07:06 +09:00
Dean Herbert
cc41618760 Reorganise class 2019-03-12 12:56:01 +09:00
Dean Herbert
5ba8388e54 Add load check to avoid double-loading 2019-03-12 12:55:54 +09:00
Dan Balasescu
8897739a53
Merge pull request #4456 from peppy/fix-direct-queries
Fix osu!direct firing excess queries during initial search characters
2019-03-12 12:54:31 +09:00
Dan Balasescu
448e3da429
Merge branch 'master' into fix-direct-queries 2019-03-12 12:47:33 +09:00
Dan Balasescu
fc7cb14388
Merge pull request #4459 from Joehuu/fix-chan-sel-dimming-forever
Fix channel selection overlay leaving background dimmed when popped out
2019-03-12 12:32:50 +09:00
Joehu
ad3b956cec Fix channel selection overlay dimming bg forever when popped out 2019-03-11 20:10:59 -07:00
Dan Balasescu
61ba39d89f
Merge branch 'master' into fix-direct-queries 2019-03-12 12:02:17 +09:00
Dan Balasescu
246b214fa6
Merge pull request #4457 from peppy/fix-hold-to-quit
Fix HoldForMenuButton getting stuck in a confirming state
2019-03-12 11:58:43 +09:00
Dean Herbert
cdeaa80fea Call ResetSpeedAdjustments before adjusting clock 2019-03-12 11:35:25 +09:00
Dean Herbert
13b3036ec6 Fix "wind" mods adjusting rate twice
This is a hotfix for incorrect framework behaviour.

Closes #4442
2019-03-12 02:45:45 +09:00
Dean Herbert
1be4c7b813 Fix excess newline 2019-03-12 02:23:23 +09:00
Dean Herbert
38e75421ab Fix HoldForMenuButton getting stuck in a confirming state
Closes #4446.
2019-03-12 02:21:34 +09:00
Dean Herbert
941a72d69a Fix osu!direct firing excess queries during initial search characters
Due to faulty debounce fire logic, a web request would always fire with a single character search, followed by the real search. This caused unwanted delays and display weirdness.
2019-03-12 01:49:47 +09:00
Dean Herbert
e9ab329e93 Fix backgrounds not correctly handling initial async load 2019-03-12 00:05:05 +09:00
Dean Herbert
81d9e391f4 Preload main menu background 2019-03-12 00:04:19 +09:00
Dean Herbert
59897bbeb5 Refactor UpdateableBeatmapBackground lookup logic for clarity
Closes #4401. Alternative to #4439.
2019-03-11 19:00:39 +09:00
Dean Herbert
d0ae75af6e Add tests and fix scenario where all matching are contained by duplicate candidate 2019-03-11 18:13:33 +09:00
Dean Herbert
3a8c32d41b Add the ability for ArchiveModelManager to re-import even when existing entry is present 2019-03-11 17:04:18 +09:00
Dan Balasescu
7805b95a1e
Merge pull request #4438 from peppy/extract-slider-tick-creation
Extract slider tick creation so it can be shared with osu!catch
2019-03-11 15:01:32 +09:00
Dean Herbert
63fea65c0c Clarify repeat index 2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a Add xmldoc and clarify struct variables 2019-03-11 14:36:29 +09:00
Dean Herbert
2029cf93fd Rename and reuse variables 2019-03-11 14:33:21 +09:00
Dean Herbert
26f78b659b Merge remote-tracking branch 'upstream/master' into extract-slider-tick-creation 2019-03-11 14:31:12 +09:00
Dean Herbert
61330a690e
Merge pull request #4448 from Joehuu/naming-convention-1
Fix file naming on ParticipantCountDisplay
2019-03-10 20:48:34 +09:00
Joehu
0fc6fa7245 Fix file naming on ParticipantCountDisplay 2019-03-09 20:29:56 -08:00
Joehu
7311ccabfb Fix direct panel stats being misaligned by one pixel 2019-03-08 20:27:50 -08:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup 2019-03-09 11:14:54 +09:00
Dean Herbert
312efbdc34
Merge pull request #4440 from peppy/update-framework
Update framework
2019-03-08 22:46:43 +09:00
Dean Herbert
10734b774c Update framework 2019-03-08 20:48:50 +09:00
Dean Herbert
c6194d5487
Merge branch 'master' into extract-slider-tick-creation 2019-03-08 20:40:03 +09:00
Dean Herbert
843a37721d
Merge pull request #4157 from LeNitrous/mod-wind
Add "Wind Up" and "Wind Down" mods
2019-03-08 20:32:43 +09:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dean Herbert
28a1baa07e Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation 2019-03-08 20:13:58 +09:00
Dean Herbert
eadd7ce913 Update catch dfificulty test
Likely the result of fixing https://github.com/ppy/osu/issues/4426.
2019-03-08 20:13:55 +09:00
Dean Herbert
93a999396e LegacyFinalTick -> LegacyLastTick to match existing variable 2019-03-08 20:13:11 +09:00