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

17471 Commits

Author SHA1 Message Date
tangalbert919
00c659a5ca Merge all changes from 2019.321.0 to android 2019-03-20 11:00:27 -05:00
Dean Herbert
6058f994e1
Merge pull request #4500 from peppy/update-framework
Update framework
2019-03-20 23:59:45 +09:00
Dean Herbert
c555019692 Update framework 2019-03-20 22:50:50 +09:00
Dean Herbert
42cb80e068
Merge pull request #4466 from nyquillerium/visual-settings-container
Move user blurring logic into UserDimContainer
2019-03-20 22:22:11 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container 2019-03-20 20:48:30 +09:00
Dean Herbert
6a7ab6a001 Do less import work in [SetUp] step 2019-03-20 20:47:25 +09:00
Dean Herbert
298c98871d Actually add the background 2019-03-20 20:18:08 +09:00
Dean Herbert
ba89bfee0c Define explicit method to add background
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
8865d53992 Reword comment 2019-03-20 20:04:07 +09:00
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
Dean Herbert
18de9e51c5 Formatting and naming improvements 2019-03-20 19:39:03 +09:00
David Zhao
9013afe412 Query for input manager once 2019-03-20 19:35:40 +09:00
Dean Herbert
fe255c54d0
Merge pull request #4496 from smoogipoo/reinstantiate-mods
Fix mods being reused for difficulty calculation
2019-03-20 19:10:52 +09:00
Dean Herbert
2118d50bae
Merge pull request #4495 from smoogipoo/fix-spinner-conversion
Fix catch spinners not being allowed for conversion

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-20 19:10:31 +09:00
David Zhao
b5e8eb2a4a Wait for dim 2019-03-20 17:31:06 +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
smoogipoo
c510385aa8 Remove unnecessary allocations 2019-03-20 16:46:16 +09:00
smoogipoo
6df275c83a Use fresh mods for each difficulty calculation iteration 2019-03-20 16:37:25 +09:00
Dean Herbert
13e2d6a340
Merge branch 'master' into fix-spinner-conversion 2019-03-20 16:32:44 +09:00
Dan Balasescu
8d35b4fece
Merge pull request #4491 from peppy/ruleset-container-refactor
Refactor RulesetContainer for readability
2019-03-20 15:17:34 +09:00
David Zhao
1086688e0a Fix variable hiding 2019-03-20 15:13:59 +09:00
David Zhao
f670e4664d Amend comment 2019-03-20 15:06:07 +09:00
David Zhao
2467ece020 store a field 2019-03-20 14:58:32 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor 2019-03-20 14:55:58 +09:00
David Zhao
86658e357b Override add instead 2019-03-20 14:55:52 +09:00
Dean Herbert
c186629b8a Reorder class 2019-03-20 14:55:38 +09:00
Dean Herbert
5f288650bf Fix misses/typos 2019-03-20 14:49:33 +09:00
Dan Balasescu
268d3c6291
Merge pull request #4485 from peppy/player-test-flexibility
Increase flexibility of player test cases
2019-03-20 14:39:46 +09:00
David Zhao
9964644683 Fix merge 2019-03-20 14:37:32 +09:00
Dan Balasescu
aca99c2c42
Merge branch 'master' into player-test-flexibility 2019-03-20 14:31:33 +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
smoogipoo
6511234804 Fix catch spinners not being allowed for conversion 2019-03-20 13:53:22 +09:00
Dean Herbert
ddbc46b5a6
Merge pull request #4493 from smoogipoo/catch-hr-fixes
Further fixes to catch HR application
2019-03-20 12:58:58 +09:00
smoogipoo
8f0440d14c Ensure RNG max value cannot go below min value 2019-03-20 12:06:37 +09:00
smoogipoo
003e36862f Fix JuiceStreams not affecting lastPosition/lastStartTime 2019-03-20 12:06:14 +09:00
Dan Balasescu
033f03d597
Merge pull request #4455 from peppy/fix-background-loading
Fix screen background performance
2019-03-20 11:35:00 +09:00
Dean Herbert
936c3e1ed9 Add safety type check to DrawableScrollingRuleset 2019-03-20 11:34:06 +09:00
Dean Herbert
45b8bfcfd3 Better protect not-generic DrawableRuleset 2019-03-20 11:31:03 +09:00
Dean Herbert
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dan Balasescu
e5db0c973e
Merge branch 'master' into fix-background-loading 2019-03-20 11:25:23 +09:00
Dean Herbert
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert
3cc1e822af
Merge pull request #4460 from smoogipoo/remove-unnecessary-code
Remove unnecessary early return for maching beatmap IDs

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-20 10:43:54 +09:00