1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 14:13:21 +08:00
Commit Graph

3729 Commits

Author SHA1 Message Date
David Zhao
2e9d823af4 Add comment regarding HandlePositionalInput 2019-03-20 19:59:54 +09:00
David Zhao
2ff7aa6c2e Remove handle positional input 2019-03-20 19:49:37 +09:00
David Zhao
bc6e8ce7b4 Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container 2019-03-20 19:48:57 +09:00
Dean Herbert
01f795b046 Make restart public rather than reimplementing 2019-03-20 19:45:04 +09:00
David Zhao
8543e8c36f Put loadcomplete next to other protected overrides 2019-03-20 19:42:39 +09:00
Dean Herbert
cda5bc28c8 Add proper comment 2019-03-20 19:41:20 +09:00
David Zhao
9013afe412 Query for input manager once 2019-03-20 19:35:40 +09:00
David Zhao
fbfef844de Add test case for resuming PlayerLoader 2019-03-20 17:18:42 +09:00
David Zhao
a5916f995e Use the previous conditional instead 2019-03-20 16:54:42 +09:00
David Zhao
e9034c8a30 Move blurring logic into Update instead 2019-03-20 16:50:47 +09:00
David Zhao
1086688e0a Fix variable hiding 2019-03-20 15:13:59 +09:00
David Zhao
86658e357b Override add instead 2019-03-20 14:55:52 +09:00
David Zhao
9964644683 Fix merge 2019-03-20 14:37:32 +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
7b65d3437f
Merge branch 'master' into fix-background-loading 2019-03-20 10:33:53 +09:00
David Zhao
a1000524ee
Merge branch 'master' into visual-settings-container 2019-03-19 20:17:12 +09:00
David Zhao
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
Dean Herbert
e36ad3eb6b Add initial alpha in case 2019-03-19 16:11:22 +09:00
Dean Herbert
d2007cfb38 Fix weird transition 2019-03-19 16:10:28 +09:00
Dean Herbert
83f3d3abde Merge remote-tracking branch 'upstream/master' into disclaimer-support-text 2019-03-19 16:02:34 +09:00
David Zhao
dc26e90a8d Remove unused usings 2019-03-19 13:16:06 +09:00
David Zhao
df37973e84 Move showstoryboard into player 2019-03-19 13:13:19 +09:00
David Zhao
27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +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
Dean Herbert
36e5c09710
Merge pull request #4433 from nekodex/prevent-null-lookup
Don't perform lookup of beatmap stats unless an online id is present
2019-03-15 10:39:39 +09:00
David Zhao
8fc90bb9a0 Remove unused usings 2019-03-14 16:26:34 +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
0042cc5337
Merge branch 'master' into mod-ramp-hotfix 2019-03-14 13:02:29 +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
7a2af5634c
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup 2019-03-13 14:13:50 +09:00
Jamie Taylor
e6449db8e3
Null metrics on null beatmap for transition animation 2019-03-13 14:13:42 +09:00
Dean Herbert
b1f18481e0 Show text to supporters telling them they're cool
Also adds better tests for disclaimer screen.
2019-03-13 12:58: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
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
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
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