1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 04:22:54 +08:00
Commit Graph

21607 Commits

Author SHA1 Message Date
Dean Herbert
f655cd4516 Fix parsing of null configuration elements 2019-09-04 13:30:46 +09:00
Dean Herbert
04c2c33c64 Allow LegacySkin to be constructed with all nulls 2019-09-04 13:29:55 +09:00
Dean Herbert
343af28ed5 Add extra legacy skin parsing tests 2019-09-03 18:59:23 +09:00
Dean Herbert
f58ca82398 Don't include section for now 2019-09-03 18:56:01 +09:00
Dean Herbert
002de80c30 Add xmldoc to ISkin 2019-09-03 18:30:22 +09:00
Dean Herbert
097012dc95 Move slider ball colouring to DefaultLegacySkin for now 2019-09-03 18:05:16 +09:00
Dean Herbert
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
Dean Herbert
976f5020c0
Fix ring glow lookup being incorrect (#5963)
Fix ring glow lookup being incorrect

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-03 16:31:12 +09:00
Dan Balasescu
3854bc68e0
Merge branch 'master' into fix-ring-glow-lookup 2019-09-03 16:14:07 +09:00
Dan Balasescu
953ea83cb6
Merge pull request #5956 from Joehuu/center-icon-and-text-correctly
Center icon and text using anchor and origin instead of margin
2019-09-03 15:30:12 +09:00
Dan Balasescu
b7f1efbf38
Merge branch 'master' into center-icon-and-text-correctly 2019-09-03 14:51:59 +09:00
Dean Herbert
10862f40c6
Don't display hit errors for non-timed hitobjects (#5952)
Don't display hit errors for non-timed hitobjects

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-03 13:29:35 +09:00
Dean Herbert
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
Dean Herbert
4cad55cee6 Move hit windows lookup to DrawableRuleset 2019-09-03 13:05:03 +09:00
Dean Herbert
4f3511e8e9 Fix ring glow lookup being incorrect 2019-09-03 12:32:10 +09:00
Dan Balasescu
93c3e5a072
Merge pull request #5893 from peppy/play-to-gameplay
Rename "play" resources to "gameplay"
2019-09-03 12:26:42 +09:00
Dean Herbert
de2d3121f7 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.0' into play-to-gameplay 2019-09-03 12:06:10 +09:00
dependabot-preview[bot]
11dfdc33d5
Bump ppy.osu.Game.Resources from 2019.830.0 to 2019.903.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.830.0 to 2019.903.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.830.0...2019.903.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 03:05:45 +00:00
Dean Herbert
444419b2e6 Update resources 2019-09-03 12:04:49 +09:00
Dean Herbert
4a8bdbd014 Merge remote-tracking branch 'upstream/master' into play-to-gameplay 2019-09-03 12:04:46 +09:00
Dan Balasescu
6a3f210766
Merge pull request #5961 from jorolf/background-beat
Add a 60bpm beat when no beatmap is playing
2019-09-03 11:49:19 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
smoogipoo
eab06995d0 Add some whitespace 2019-09-03 11:37:56 +09:00
smoogipoo
ec8726e163 Merge remote-tracking branch 'origin/master' into background-beat 2019-09-03 11:35:20 +09:00
Dan Balasescu
97b824d7d2
Merge pull request #5892 from peppy/iskincomponent
Introduce the concept of SkinComponents
2019-09-03 11:31:36 +09:00
jorolf
3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
Joehu
6ca17bdfd5 Center icon and text using anchor and origin instead of margin 2019-09-02 10:42:21 -07:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
Dean Herbert
3443a9517f
Merge pull request #5953 from peppy/fix-direct-panel-unbind-nullref
Fix potential null reference on DirectPanel unbind
2019-09-02 21:35:17 +09:00
Dean Herbert
d688aee258
Add other sample functions to SkinnableSound (#5728)
Add other sample functions to SkinnableSound

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 19:14:45 +09:00
Dean Herbert
0ee0184e01 Remove unnecessary usings 2019-09-02 19:13:06 +09:00
Dean Herbert
1e7528c2b3 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-02 19:13:00 +09:00
Dean Herbert
b460f76fa6 Adjust file spacing slightly 2019-09-02 19:01:43 +09:00
Dean Herbert
0bfe4650c3 Early return if no change occurred in looping value 2019-09-02 19:01:17 +09:00
smoogipoo
90671e0617 Attempt to not break per-hitobject hitwindows 2019-09-02 18:58:13 +09:00
smoogipoo
8302658186 Fix other potential nullref cases that rider missed 2019-09-02 18:31:33 +09:00
Dean Herbert
f08b523abf Name tuple items 2019-09-02 18:20:30 +09:00
Dean Herbert
9c53430a0f Only initialise when required 2019-09-02 18:18:59 +09:00
Dean Herbert
eaeecfb300 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-09-02 18:15:17 +09:00
smoogipoo
f20e07136a Add attribute to catch potential future nullrefs 2019-09-02 17:48:41 +09:00
smoogipoo
4c150839c0 Fix potential diffcalc hitwindow nullref 2019-09-02 17:38:58 +09:00
Dean Herbert
6009cd2537
Fix OsuLegacySkin fallback logic being incorrect (#5948)
Fix OsuLegacySkin fallback logic being incorrect

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-02 17:23:18 +09:00
Dean Herbert
be5baef386
Merge pull request #5778 from EVAST9919/kudosu-info
Add kudosu history to UserProfileOverlay
2019-09-02 17:22:53 +09:00
Dan Balasescu
7e0e4d9fbc
Merge branch 'master' into fix-config-fallback-logic 2019-09-02 17:20:26 +09:00
smoogipoo
f6102b4d92 Adjust xmldoc 2019-09-02 17:15:36 +09:00
smoogipoo
0c73c5acf3 Expose full hitobject rather than hit windows 2019-09-02 17:14:40 +09:00
Dean Herbert
841da7d691 Fix potential null reference on DirectPanel unbind 2019-09-02 17:12:32 +09:00
Dean Herbert
d21d68b36c Refactor to match web implementation 1:1 2019-09-02 17:04:38 +09:00
smoogipoo
f2bdf94a1d Add HitWindows to JudgementResult to indicate timing errors 2019-09-02 16:28:14 +09:00
smoogipoo
f3656475de Return null hitwindows for non-time-based objects 2019-09-02 16:10:30 +09:00