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

28004 Commits

Author SHA1 Message Date
Dean Herbert
a69e356961 Merge branch 'master' into mania-note-skinning 2020-03-31 23:38:47 +09:00
Dean Herbert
1e88d3c17a Merge conflict "resolution" 2020-03-31 23:36:06 +09:00
mcendu
c9a81e7f71 Merge branch 'column-type3' into mania-skinning-refactor 2020-03-31 22:33:27 +08:00
Dean Herbert
f653d37058
Merge pull request #8521 from peppy/remove-scale-down-to-fit
Remove ScaleDownToFit as it was implemented without enough safety
2020-03-31 23:22:04 +09:00
Dean Herbert
6001cfbb85
Merge pull request #8516 from smoogipoo/mania-key-area-skinning
Add mania key area skinning
2020-03-31 23:16:52 +09:00
Dean Herbert
a894b42a32 Fix merge conflict mess 2020-03-31 22:41:16 +09:00
Dean Herbert
a7eda32a6e Fix missing comma 2020-03-31 22:35:11 +09:00
Dean Herbert
f4db4985d1
Merge branch 'master' into mania-key-area-skinning 2020-03-31 22:31:48 +09:00
Dean Herbert
c85705e935
Merge pull request #8514 from smoogipoo/mania-column-background-skinning
Add mania column background skinning
2020-03-31 22:26:23 +09:00
Dean Herbert
03689adda8 Update resources 2020-03-31 21:33:59 +09:00
Dean Herbert
fe35f696c3
Merge branch 'master' into mania-column-background-skinning 2020-03-31 21:29:37 +09:00
Dan Balasescu
d3cb21c5a4
Merge pull request #8462 from peppy/fix-follow-point-transforms
Fix animated follow points not (re)animating after rewind
2020-03-31 20:55:00 +09:00
mcendu
ff499b7d6b
fix indent 2020-03-31 19:12:02 +08:00
Dean Herbert
7a9d878a34
Merge branch 'master' into fix-follow-point-transforms 2020-03-31 20:03:42 +09:00
Dan Balasescu
59639738f3
Merge pull request #8526 from peppy/fix-catcher-width
Fix osu!catch catcher hit area being too large
2020-03-31 19:39:30 +09:00
mcendu
df2379fb0e
remove unnecessary using 2020-03-31 18:10:43 +08:00
Dean Herbert
da129ddf6a
Merge pull request #8513 from smoogipoo/mania-skinning-testability
Implement basis for mania skinning
2020-03-31 19:03:18 +09:00
Dean Herbert
03b90fe2db Remove local application of same margin in CatchDifficultyCalculator 2020-03-31 19:01:49 +09:00
mcendu
3e0991d350
fix indent 2020-03-31 18:00:56 +08:00
mcendu
d41ff8c4b4
remove Column field from LegacyHitTarget 2020-03-31 17:58:29 +08:00
mcendu
ecc305bb63
extract superclass for all mania skinning elements 2020-03-31 17:54:51 +08:00
mcendu
977e1a3bfe
split shortcut into two methods 2020-03-31 17:48:37 +08:00
Dean Herbert
b7d73f96ea Fix osu!catch catcher hit area being too large 2020-03-31 18:33:09 +09:00
mcendu
71fc240aee
make mania skin elements use new method 2020-03-31 17:32:05 +08:00
mcendu
c0f8c1dc28
rename variable used for mania lookup key storage 2020-03-31 17:22:46 +08:00
Dan Balasescu
d4222f7d92
Merge pull request #8522 from peppy/fix-relax-mod-keypresses
Fix relax mod pressing too many keys
2020-03-31 18:21:43 +09:00
mcendu
ec3d21e2b7
convert older elements to LegacyManiaColumnElement
Also added xmldoc for new shorthand method.
2020-03-31 17:18:53 +08:00
mcendu
5179635b2d
add shorthand method for config retrieval 2020-03-31 17:08:05 +08:00
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