Dean Herbert
|
5dbf57046e
|
Fix regression from removing unused variable
|
2019-05-09 10:38:22 +09:00 |
|
smoogipoo
|
9c01f6793e
|
Remove unused variable
|
2019-05-08 23:52:44 +09:00 |
|
smoogipoo
|
9b279f324f
|
Adjust testcase to avoid random failures
|
2019-05-08 23:40:01 +09:00 |
|
Dean Herbert
|
ffea0338fb
|
Update dependencies (#4731)
Update dependencies
|
2019-05-08 21:43:58 +09:00 |
|
Dean Herbert
|
83663467ce
|
Update dependencies
|
2019-05-08 21:08:46 +09:00 |
|
Dan Balasescu
|
255df3d329
|
Merge pull request #4616 from LeNitrous/refactor-select-footer
Refactor song select footer buttons
|
2019-05-08 19:57:51 +09:00 |
|
Dean Herbert
|
4f697e2bd5
|
Add licence header
|
2019-05-08 19:35:20 +09:00 |
|
Dean Herbert
|
6dea16f365
|
Move action and hotkey specification local
|
2019-05-08 19:29:43 +09:00 |
|
Dean Herbert
|
c91b9c6032
|
Add missing button
|
2019-05-08 19:27:53 +09:00 |
|
Dean Herbert
|
772eb460fb
|
Move button definitions to their respective classes
|
2019-05-08 19:03:26 +09:00 |
|
Dean Herbert
|
0693290ad4
|
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
|
2019-05-08 18:43:21 +09:00 |
|
Dean Herbert
|
b33372ca62
|
Don't expand mods in button on hover
|
2019-05-08 18:43:15 +09:00 |
|
Dean Herbert
|
8906eb874a
|
Fix CI issues
|
2019-05-08 18:43:06 +09:00 |
|
Dean Herbert
|
9a9ac05cd9
|
Fix post-merge issues
|
2019-05-08 18:42:54 +09:00 |
|
Dean Herbert
|
bace829629
|
Add ability to avoid expand animation in ModDisplay
|
2019-05-08 18:42:26 +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 |
|