1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 15:17:30 +08:00
Commit Graph

21214 Commits

Author SHA1 Message Date
Dan Balasescu
7dbd54f611
Merge pull request #5832 from peppy/fix-beatmap-skin-parse-fail
Don't return DefaultSkin on beatmap skin parsing failure
2019-08-26 16:52:10 +09:00
Dean Herbert
289bd8e6b0 Don't return DefaultSkin on beatmap skin parsing failure 2019-08-26 14:25:35 +09:00
Dean Herbert
7fd63b39fe
Merge pull request #5823 from iiSaLMaN/implement-grouped-difficulty-icons
Implement grouped difficulty icons

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-25 12:19:16 +09:00
Dean Herbert
9881d3677d Simplify icon creation 2019-08-25 12:05:46 +09:00
Dean Herbert
ef397434f6 use GroupBy instead of Distinct+FindAll 2019-08-25 12:00:06 +09:00
Dean Herbert
1d34124667 Revert all DifficultyIcon changes 2019-08-25 11:56:07 +09:00
Dean Herbert
2e21fbcf6a Fix incorrect colour usage 2019-08-25 11:44:56 +09:00
Dean Herbert
a19a9b90ed Simplify group filter display 2019-08-25 11:39:26 +09:00
Dean Herbert
524547adbf
Merge branch 'master' into implement-grouped-difficulty-icons 2019-08-24 17:34:58 +09:00
Dean Herbert
509efacf9d
Allow for difficulty icon to have content added near the icon (#5822)
Allow for difficulty icon to have content added near the icon

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-24 17:34:44 +09:00
Dean Herbert
c4d203cb5c
Merge branch 'master' into allow-contents-in-difficulty-icon 2019-08-24 17:22:24 +09:00
iiSaLMaN
af4adb6339 Add xmldoc 2019-08-24 09:43:55 +03:00
Dean Herbert
84ae0211e0
Merge pull request #5821 from iiSaLMaN/wrap-difficulty-icons-for-beatmap-set-overlay
Fix difficulty icons not wrapping correctly in beatmap set overlay
2019-08-24 13:55:13 +09:00
Dean Herbert
67419aaf36
Merge branch 'master' into wrap-difficulty-icons-for-beatmap-set-overlay 2019-08-24 13:44:43 +09:00
iiSaLMaN
008e39b738 Remove redundant using directive 2019-08-24 01:40:40 +03:00
iiSaLMaN
830ddd6ed9 Use all rulesets for many difficulties test 2019-08-24 01:31:53 +03:00
iiSaLMaN
8ccbe84f67 Loop on distinct rulesets of beatmap instead of all 2019-08-24 01:30:33 +03:00
iiSaLMaN
f6feef6b56 Remove redundant using directive 2019-08-24 00:33:14 +03:00
iiSaLMaN
8584d3ba23 Add many difficulties beatmap direct panel to the tests 2019-08-24 00:31:36 +03:00
iiSaLMaN
87340061e1 Add logic to create grouped difficulty icons in carousel beatmap set 2019-08-24 00:06:28 +03:00
iiSaLMaN
63e6aca61b Add logic to create grouped difficulty icons in direct panel 2019-08-23 23:40:41 +03:00
iiSaLMaN
83b6e0f30c Implement grouped difficulty icon 2019-08-23 23:36:23 +03:00
iiSaLMaN
d4236c574f Allow difficulty icon to be updateable 2019-08-23 23:30:54 +03:00
iiSaLMaN
f639df849f Allow for difficulty icon to contain content 2019-08-23 23:11:36 +03:00
Dean Herbert
8bed4a407a
Bump NUnit3TestAdapter from 3.14.0 to 3.15.0 (#5817)
Bump NUnit3TestAdapter from 3.14.0 to 3.15.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-08-24 00:57:11 +09:00
iiSaLMaN
67acf20805 Add test beatmap set with many difficulties 2019-08-23 18:31:53 +03:00
iiSaLMaN
1295ec490f Fix difficulty icon not wrapping correctly in beatmap set overlay 2019-08-23 17:57:31 +03:00
dependabot-preview[bot]
72a644996c
Bump NUnit3TestAdapter from 3.14.0 to 3.15.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.14...V3.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 13:41:27 +00:00
Dean Herbert
13e60f3edb
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0 (#5814)
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-23 19:25:20 +09:00
Dean Herbert
0f4d79b5d9
Merge branch 'master' into dependabot/nuget/ppy.osu.Game.Resources-2019.823.0 2019-08-23 19:24:58 +09:00
Dean Herbert
ae6ea841f9
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0 (#5812)
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-23 19:23:12 +09:00
Dean Herbert
bcaf5dba31
Merge branch 'master' into dependabot/nuget/ppy.osu.Framework-2019.823.0 2019-08-23 19:22:25 +09:00
Dean Herbert
7f678f58c2
Bump ppy.osu.Framework.iOS from 2019.821.0 to 2019.823.0 (#5811)
Bump ppy.osu.Framework.iOS from 2019.821.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-08-23 19:21:56 +09:00
Dean Herbert
40bfefcb06
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0 (#5810)
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-08-23 19:21:43 +09:00
dependabot-preview[bot]
c836ef5721
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.809.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.809.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 10:04:00 +00:00
dependabot-preview[bot]
11a61b953b
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 09:43:34 +00:00
dependabot-preview[bot]
4bc0581871
Bump ppy.osu.Framework.iOS from 2019.821.0 to 2019.823.0
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 09:33:38 +00:00
dependabot-preview[bot]
cb54fbee87
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 09:29:35 +00:00
Dean Herbert
0a8c8906a9
Fix alignment and size of mute button (#5809)
Fix alignment and size of mute button

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-23 18:04:21 +09:00
Dean Herbert
a502cd4b63 Merge remote-tracking branch 'upstream/master' into fix-mute-button-alignment-and-size 2019-08-23 17:43:12 +09:00
Dean Herbert
c55d237db6 Use BindValueChanged 2019-08-23 17:42:40 +09:00
Dan Balasescu
a4ad70fd76
Merge pull request #5808 from peppy/fix-crash-on-close
Fix crash on closing game
2019-08-23 14:54:19 +09:00
Joehu
c41b1e9eb4 Fix alignment and size of mute button 2019-08-22 21:36:21 -07:00
Dean Herbert
900df5d72f Fix crash on closing game 2019-08-23 13:02:50 +09:00
Dean Herbert
5325982f49
Merge pull request #5807 from smoogipoo/remove-more-margins
Remove bottom margin from show more button
2019-08-23 12:57:25 +09:00
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Shane Woolcock
76d34967a4
Merge pull request #5801 from peppy/fix-decoding-loop
Fix video decoding loop running permanently in the background
2019-08-22 17:13:30 +09:30
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop 2019-08-22 17:02:13 +09:30
Dan Balasescu
f9dcddd7fd
Merge pull request #5796 from peppy/fix-spacing-regressions
Fix a few icon spacing regressions
2019-08-22 14:24:53 +09:00
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00