1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 22:07:29 +08:00
Commit Graph

27924 Commits

Author SHA1 Message Date
Dan Balasescu
7ff3a1d28d
Merge branch 'master' into fix-relax-mod-keypresses 2020-03-31 17:55:28 +09:00
Dean Herbert
f2416f15a3
Merge pull request #8509 from bdach/fix-widescreen-storyboards
Support widescreen per-layer storyboard masking
2020-03-31 17:47:42 +09:00
Dan Balasescu
93a9994bcd
Merge pull request #8525 from peppy/fix-modded-replay-import
Fix replay imports failing for certain mod combinations
2020-03-31 17:38:57 +09:00
Dean Herbert
9602ab17b0 Fix replay imports failing for certain mod combinations 2020-03-31 17:13:42 +09:00
smoogipoo
3cd353d387 Fix possible nullrefs 2020-03-31 16:57:58 +09:00
Dan Balasescu
f0e82d456d
Merge pull request #8520 from peppy/fix-catcher-test-resources
Fix catcher test resources being at wrong dpi definition
2020-03-31 16:50:41 +09:00
smoogipoo
1952fcc0ce Implement mania hold note skinning 2020-03-31 16:42:35 +09:00
Dean Herbert
450f9ef027
Merge pull request #8502 from EVAST9919/overlay-above-number
Add support for HitCircleOverlayAboveNumber legacy skin property
2020-03-31 16:14:14 +09:00
smoogipoo
11430d616e Allow null hitobject 2020-03-31 16:00:08 +09:00
smoogipoo
b805ed6bf1 Flip anchors and origins 2020-03-31 15:59:52 +09:00
smoogipoo
9a37a328b6 Add component overrides for hold note head/tail 2020-03-31 15:39:00 +09:00
smoogipoo
c4f76ffdaf Implement mania note skinning 2020-03-31 15:29:25 +09:00
smoogipoo
b926d570ee Allow skinnabledrawable to be auto-sized 2020-03-31 15:28:50 +09:00
Dean Herbert
2109c98481
Merge branch 'master' into fix-widescreen-storyboards 2020-03-31 15:28:22 +09:00
smoogipoo
ae668e3e87 Fix post-merge errors 2020-03-31 15:24:13 +09:00
smoogipoo
211a8db4c5 Merge branch 'mania-key-area-skinning' into mania-note-skinning 2020-03-31 15:23:59 +09:00
smoogipoo
538dc0c558 Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning 2020-03-31 15:20:56 +09:00
smoogipoo
1a858c602a Merge branch 'mania-column-background-skinning' into mania-note-skinning 2020-03-31 15:20:14 +09:00
Dean Herbert
bf1fc9f7a0 Update framework 2020-03-31 15:18:50 +09:00
Dean Herbert
8a998d600d Fix relax mod pressing too many keys 2020-03-31 15:17:27 +09:00
smoogipoo
16439f7d8e Fix incorrect fallback index being used 2020-03-31 15:15:49 +09:00
smoogipoo
4b05f7ff27 Merge branch 'mania-skinning-testability' into mania-key-area-skinning 2020-03-31 15:11:32 +09:00
smoogipoo
75e43acb1a Add a legacy element to help with texture fallbacks 2020-03-31 15:11:08 +09:00
Dean Herbert
877d5849bb
Merge branch 'master' into mania-skinning-testability 2020-03-31 15:09:11 +09:00
mcendu
2008a7bbec
fix naming 2020-03-31 14:03:11 +08:00
mcendu
275f96791d
add regression tests 2020-03-31 13:57:37 +08:00
Dean Herbert
db59d0530e Remove test coverage of scale down 2020-03-31 14:15:25 +09:00
Dean Herbert
1fce7cce01 Remove ScaleDownToFit as it was not implemented without enough safety 2020-03-31 13:50:04 +09:00
Dean Herbert
89d8bf9780 Fix catcher test resources being at wrong dpi definition 2020-03-31 13:46:20 +09:00
mcendu
3fb044c3b6
rm unnecessary usings 2020-03-31 12:09:04 +08:00
mcendu
323146e4a6
simplify column type check logic 2020-03-31 11:53:17 +08:00
smoogipoo
71387016b2 Add missing judgement line 2020-03-31 12:26:31 +09:00
smoogipoo
02237133cb Implement mania hit target skinning 2020-03-31 12:17:44 +09:00
Dean Herbert
6d4f9247ea Revert "Remove osu!catch GotoFrame usage"
This reverts commit 4406f44165.
2020-03-31 11:49:18 +09:00
smoogipoo
cb1513b374 Add mania key area skinning 2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8 Implement column background skinning 2020-03-31 10:57:56 +09:00
smoogipoo
2b5e9885f6 Implement mania skin reading functionality 2020-03-31 10:55:58 +09:00
Dan Balasescu
e0a876ceaf
Merge pull request #8494 from peppy/fix-invalid-set-ids-on-import
Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID
2020-03-31 10:42:58 +09:00
smoogipoo
f6f5de7ad1 Allow LineBufferedReader to keep underlying stream open 2020-03-31 10:13:50 +09:00
Bartłomiej Dach
522bbc1e9c Support widescreen per-layer storyboard masking 2020-03-30 21:51:39 +02:00
Dean Herbert
9da6bb942d
Merge pull request #8499 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.0.32
Bump Microsoft.Build.Traversal from 2.0.24 to 2.0.32
2020-03-30 23:56:29 +09:00
Dean Herbert
f52509ab9c
Merge pull request #8490 from peppy/dont-retry-on-replay-results
Hide "retry" button on results screen after watching a replay
2020-03-30 23:55:44 +09:00
smoogipoo
a8f7d7ea42 Add structure for mania configuration lookups 2020-03-30 23:21:40 +09:00
smoogipoo
c3cde7a163 Combine files 2020-03-30 23:21:40 +09:00
smoogipoo
c1789140d5 Prepare skin transformer for mania components 2020-03-30 23:21:40 +09:00
smoogipoo
6ff2273b64 Make column + stage cached 2020-03-30 23:21:40 +09:00
smoogipoo
bd87a4cde8 Re-namespace testscene 2020-03-30 23:21:40 +09:00
smoogipoo
655fab6a97 Add mania skinnable test helpers 2020-03-30 23:21:40 +09:00
Dan Balasescu
250bdbef6b
Merge branch 'master' into dont-retry-on-replay-results 2020-03-30 22:30:15 +09:00
Dan Balasescu
8964001423
Merge branch 'master' into fix-invalid-set-ids-on-import 2020-03-30 22:24:12 +09:00