smoogipoo
|
39efa2d173
|
Fix possible cross-thread config cache access
|
2019-05-08 19:05:00 +09:00 |
|
Dan Balasescu
|
6559869880
|
Merge pull request #4617 from nyquillerium/flashlight-dim
Implement dimming for sliding on sliders with flashlight mod
|
2019-05-08 13:51:47 +09:00 |
|
Dan Balasescu
|
6ab83f8825
|
Merge branch 'master' into flashlight-dim
|
2019-05-08 13:37:21 +09:00 |
|
Dean Herbert
|
7b91439506
|
Fix disposed beatmap backgrounds being loaded (#4723)
Fix disposed beatmap backgrounds being loaded
|
2019-05-08 13:33:55 +09:00 |
|
smoogipoo
|
117f8bdd01
|
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
|
2019-05-08 13:25:01 +09:00 |
|
Dean Herbert
|
13cf9657a4
|
Merge branch 'master' into fix-updateable-background-crash
|
2019-05-08 13:17:28 +09:00 |
|
smoogipoo
|
a00e2b18a9
|
Fix background unloading/reloading sometimes crashing
|
2019-05-07 17:24:05 +09:00 |
|
smoogipoo
|
1d2db85866
|
Improve background sprite testcase
|
2019-05-07 17:23:44 +09:00 |
|
Dan Balasescu
|
9f52b3b490
|
Merge pull request #4653 from peppy/fix-rank-display
Fix rank display on break info display
|
2019-05-07 15:18:05 +09:00 |
|
smoogipoo
|
99f2ee0e48
|
Fix CI issues
|
2019-05-07 15:09:03 +09:00 |
|
Dan Balasescu
|
288b3deb94
|
Merge branch 'master' into fix-rank-display
|
2019-05-07 15:00:51 +09:00 |
|
Dan Balasescu
|
de08115e85
|
Merge pull request #4570 from peppy/fix-new-inspections
Add new blank line inspections
|
2019-05-07 14:59:04 +09:00 |
|
Dean Herbert
|
8bc313fb33
|
Merge branch 'master' into fix-new-inspections
|
2019-05-07 14:14:40 +09:00 |
|
Dan Balasescu
|
37d50225e5
|
Merge pull request #4704 from peppy/pause-via-inactive
Pause via inactive activates hold-for-menu button directly
|
2019-05-07 13:57:34 +09:00 |
|
smoogipoo
|
1cfb7550ee
|
Fix possible nullref
|
2019-05-07 13:42:55 +09:00 |
|
Dean Herbert
|
c878d814f6
|
Merge branch 'master' into pause-via-inactive
|
2019-05-07 13:35:23 +09:00 |
|
Dean Herbert
|
f7a570d67a
|
Fix double confirmation
|
2019-05-07 13:34:06 +09:00 |
|
smoogipoo
|
652a21b3dc
|
Update r# CLT
|
2019-05-07 13:31:54 +09:00 |
|
smoogipoo
|
13b9b04bb8
|
Apply more cases/fix some existing ones
|
2019-05-07 13:23:09 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dan Balasescu
|
5cf7e4603a
|
Merge pull request #4678 from peppy/fix-retry-sound
Don't play screen "back" sample when retrying
|
2019-05-07 13:00:20 +09:00 |
|
Dan Balasescu
|
a1c64d8d26
|
Merge branch 'master' into fix-retry-sound
|
2019-05-07 12:40:01 +09:00 |
|
Dan Balasescu
|
14f09ab914
|
Merge pull request #4719 from smoogipoo/fix-import-crash
Fix beatmap import crashing during room creation
|
2019-05-07 12:39:53 +09:00 |
|
Dan Balasescu
|
8b9cfadd64
|
Merge branch 'master' into fix-retry-sound
|
2019-05-07 12:37:22 +09:00 |
|
Dean Herbert
|
64bc0f958b
|
Merge branch 'master' into fix-import-crash
|
2019-05-07 12:18:41 +09:00 |
|
smoogipoo
|
f26a1cff6c
|
Fix beatmap import crashing during room creation
|
2019-05-07 12:14:57 +09:00 |
|
Dan Balasescu
|
5be8adcfcf
|
Merge pull request #4703 from peppy/profile-details-animation
Add animation when collapsing or expanding the profile details section
|
2019-05-07 12:13:59 +09:00 |
|
David Zhao
|
abc163fa36
|
Fix merge
|
2019-05-07 12:07:45 +09:00 |
|
David Zhao
|
732b0b22a3
|
Merge remote-tracking branch 'upstream/master' into flashlight-dim
|
2019-05-07 12:04:58 +09:00 |
|
Dan Balasescu
|
9d3f6a716a
|
Merge branch 'master' into profile-details-animation
|
2019-05-07 11:44:22 +09:00 |
|
Dan Balasescu
|
437d7a5cf3
|
Merge pull request #4710 from peppy/skip-matches-stable
Improve skip boundary logic to be closer to expectations
|
2019-05-07 11:05:14 +09:00 |
|
Dean Herbert
|
7fdc79dd68
|
Improve skip boundary logic to be closer to expectations
Supersedes #4693.
Closes #4676.
|
2019-05-05 20:20:41 +09:00 |
|
Dean Herbert
|
3e3f12f277
|
Use more local bindables
|
2019-05-04 17:53:17 +09:00 |
|
Dean Herbert
|
b9a39fb788
|
Fix instant pausing when game becomes inactive
Resolves #4685.
|
2019-05-04 14:54:29 +09:00 |
|
Dean Herbert
|
0fa0271878
|
Add animation when collapsing or expanding the profile details section
|
2019-05-04 11:03:18 +09:00 |
|
Dean Herbert
|
f05471aa18
|
Fix hidden/expanded centre profile header information (#4696)
Fix hidden/expanded centre profile header information
|
2019-05-04 11:01:32 +09:00 |
|
Joseph Madamba
|
53accbfce1
|
Merge branch 'master' into switch-centre-profile-info
|
2019-05-03 11:27:52 -07:00 |
|
Dan Balasescu
|
2b57235e0b
|
Merge pull request #4701 from peppy/fix-mod-equality
Fix mod equality checks not working as intended
|
2019-05-03 12:08:24 +09:00 |
|
Dean Herbert
|
6bdaca1e3b
|
Fix mod equality checks not working as intended
|
2019-05-03 10:09:47 +09:00 |
|
Joehu
|
ac31a9640a
|
Add number sign to centre info rankings
|
2019-05-02 03:47:20 -07:00 |
|
Joehu
|
c6992bd6f9
|
Switch hidden/expanded centre profile header information
|
2019-05-02 03:37:15 -07:00 |
|
Dean Herbert
|
bd0704c575
|
Implement AdjustRank and Hidden mod grades (S+ and SS+) (#4655)
Implement AdjustRank and Hidden mod grades (S+ and SS+)
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-02 14:19:20 +09:00 |
|
Dean Herbert
|
6a4dc5e25c
|
Improve xmldoc slightly
|
2019-05-02 14:03:58 +09:00 |
|
Dean Herbert
|
1817f7bc12
|
Merge branch 'master' into sh-xh-grading-2
|
2019-05-02 13:27:12 +09:00 |
|
Dean Herbert
|
975f6e2c5d
|
Merge pull request #4694 from peppy/update-framework
Update framework
|
2019-05-02 13:13:15 +09:00 |
|
Dean Herbert
|
d9e92e12f4
|
Add number sign in front of profile rankings (#4691)
Add number sign in front of profile rankings
Co-authored-by: jorolf <jorolf@gmx.de>
|
2019-05-02 12:55:25 +09:00 |
|
Dean Herbert
|
015b5cecb5
|
Update framework
|
2019-05-02 12:53:59 +09:00 |
|
jorolf
|
b61807da40
|
Add number sign inside ToString
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
|
2019-05-01 17:55:30 -07:00 |
|
Joehu
|
6b7397b9cf
|
Check for null instead of not null
|
2019-04-30 22:07:06 -07:00 |
|
Joehu
|
9b2d5727cd
|
Fix wrong check
|
2019-04-30 21:54:25 -07:00 |
|