1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Commit Graph

13466 Commits

Author SHA1 Message Date
Dean Herbert
07380af877
Merge branch 'master' into scrolling-lifetime-safety 2019-08-26 19:07:05 +09:00
Dean Herbert
0422c19c2f Group lifetime setters together 2019-08-26 19:06:23 +09:00
Dean Herbert
28dc51279a
Allow RulesetConfigCache to return null configs (#5835)
Allow RulesetConfigCache to return null configs
2019-08-26 18:59:26 +09:00
Dean Herbert
b41bed8ba0
Add nullref safety to FrameStablePlayback boolean (#5834)
Add nullref safety to FrameStablePlayback boolean
2019-08-26 18:58:27 +09:00
Dean Herbert
62641c149d Fx component lookups being incorrect for non-databased legacy skins 2019-08-26 18:20:45 +09:00
smoogipoo
fd4c6e08ca Merge remote-tracking branch 'origin/master' 2019-08-26 17:37:06 +09:00
smoogipoo
fb1cd9e5e7 Add a sane default lifetime end for scrolling hitobjects 2019-08-26 16:47:23 +09:00
smoogipoo
6dfe95db74 Allow RulesetConfigCache to return null configs 2019-08-26 16:34:12 +09:00
smoogipoo
6596d7fc46 Add nullref safety to FrameStablePlayback boolean 2019-08-26 16:33:24 +09:00
Dean Herbert
289bd8e6b0 Don't return DefaultSkin on beatmap skin parsing failure 2019-08-26 14:25:35 +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
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
iiSaLMaN
008e39b738 Remove redundant using directive 2019-08-24 01:40:40 +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
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
iiSaLMaN
1295ec490f Fix difficulty icon not wrapping correctly in beatmap set overlay 2019-08-23 17:57:31 +03: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
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
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
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
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop 2019-08-22 17:02:13 +09:30
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
Dean Herbert
4f98361da3 One more offset removed 2019-08-21 22:22:03 +09:00
Dean Herbert
acc07c1d65 Remove mod icon offset 2019-08-21 22:18:29 +09:00
Dean Herbert
7bf430afd5 Add padding back to difficulty icons on carousel 2019-08-21 21:16:06 +09:00
Dean Herbert
6797f92b96
Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0 2019-08-21 20:15:23 +09:00
Andrei Zavatski
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
dependabot-preview[bot]
fb8d8f9438
Bump SharpCompress from 0.23.0 to 0.24.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-21 08:27:56 +00:00
Dean Herbert
28dfe072a5 Update one more blending mode change post-master merge 2019-08-21 15:11:46 +09:00
Dean Herbert
4186d2566a Remove unnecessary null checks 2019-08-21 15:11:33 +09:00
Dean Herbert
745bd58f37 Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 15:10:08 +09:00
Dean Herbert
8917f7cc95
Merge pull request #5776 from peppy/animated-slider-ball
Add slider ball animation support

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-21 15:02:35 +09:00
Dean Herbert
444f2b9387 Specify font size in a saner way 2019-08-21 15:01:50 +09:00
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
Dean Herbert
66a2eecb7a Merge remote-tracking branch 'upstream/master' into music-playback-improvements 2019-08-21 14:01:11 +09:00