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

32935 Commits

Author SHA1 Message Date
Dan Balasescu
93dfbd5d9e
Merge pull request #10505 from peppy/skin-disabler-refactor
Move ISampleDisabler implementation to Player and FrameStabilityContainer
2020-10-15 19:14:52 +09:00
Dan Balasescu
bfffad8fdb
Merge pull request #10504 from peppy/skinnable-combo-counter
Add legacy skinning support for combo counter
2020-10-15 19:11:22 +09:00
Dan Balasescu
5640d33d1a
Merge branch 'master' into skin-disabler-refactor 2020-10-15 18:32:50 +09:00
Dan Balasescu
2beddf5351
Merge pull request #10495 from FamousPig/mod-customisation-absorb-mouse-input
Fix mod customisation container not absorbing input
2020-10-15 18:25:44 +09:00
Dan Balasescu
190f3f36ce
Merge branch 'master' into skinnable-combo-counter 2020-10-15 18:13:00 +09:00
Dan Balasescu
a9075fc47c
Merge pull request #10502 from peppy/hud-available-area
Confine available area for HUD components to exclude the song progress area
2020-10-15 18:12:49 +09:00
Dean Herbert
37e9f331ad Simplify score font lookup 2020-10-15 17:49:55 +09:00
Dean Herbert
9f51327e4b Fix completely incorrect default positioning logic 2020-10-15 17:29:40 +09:00
Dean Herbert
d5f2aab52e Tidy up SkinnableComboCounter class slightly 2020-10-15 15:37:40 +09:00
Dean Herbert
b06f59ffdc Split out test for combo counter specifically 2020-10-15 15:35:33 +09:00
Dean Herbert
af99273581
Merge pull request #10453 from smoogipoo/fix-mania-diffcalc 2020-10-15 15:15:10 +09:00
Bartłomiej Dach
c3f1a30447 Merge branch 'master' into mod-customisation-absorb-mouse-input 2020-10-15 00:40:27 +02:00
Bartłomiej Dach
2ca6c4e377 Adjust test step names 2020-10-14 23:24:16 +02:00
Dean Herbert
e0210f5c4c Ignore failed casts to make tests happy 2020-10-14 23:52:58 +09:00
Dean Herbert
ef2e2894a2
Merge branch 'master' into fix-mania-diffcalc 2020-10-14 23:49:14 +09:00
Dean Herbert
74a0886cb8
Merge pull request #10501 from smoogipoo/update-keymod-incompatibility
Add 10K mod to keymod incompatibility list
2020-10-14 23:45:08 +09:00
Dean Herbert
1684c4f412
Merge pull request #10503 from smoogipoo/fix-mod-combinations
Fix MultiMod difficulty calculator combinations not generating correctly
2020-10-14 23:42:59 +09:00
Dean Herbert
46002279cb
Merge pull request #10500 from smoogipoo/fix-multimod-copy
Fix MultiMod throwing exceptions when creating copies
2020-10-14 23:38:45 +09:00
Dean Herbert
8b864c8c22
Merge branch 'master' into fix-multimod-copy 2020-10-14 22:29:38 +09:00
Dean Herbert
b63303a2a8 Fix tests 2020-10-14 21:40:49 +09:00
smoogipoo
26dffbfd3b Replicate hit window calculation 2020-10-14 20:40:39 +09:00
smoogipoo
1a2dc83740 Make field readonly 2020-10-14 20:40:17 +09:00
smoogipoo
ed57b1363f Remove unused usings 2020-10-14 20:08:46 +09:00
smoogipoo
c4fdd35223 Fix same-type incompatibility through multimod 2020-10-14 19:53:37 +09:00
Dean Herbert
e3eaba7b2c Move ISampleDisabler implementation to Player and FrameStabilityContainer 2020-10-14 19:39:48 +09:00
smoogipoo
e9ebeedbe2 Refactor generation 2020-10-14 19:32:30 +09:00
smoogipoo
7d2eeb9795 Fix test names 2020-10-14 19:18:04 +09:00
Dean Herbert
ac4f56403d Adjust size/position 2020-10-14 19:16:34 +09:00
Dean Herbert
7f5ea57bd4 Clean-up pass (best effort) on LegacyComboCounter 2020-10-14 19:16:34 +09:00
Dean Herbert
9bb8a43bce Combine LegacyComboCounter and ComboCounter classes 2020-10-14 19:16:34 +09:00
Dean Herbert
fbbea48c8c Add score text skinnability 2020-10-14 19:16:34 +09:00
Dean Herbert
2fce064e32 Add basic legacy combo counter and updating positioning logic 2020-10-14 19:16:34 +09:00
Dean Herbert
6eb3176776 Add combo incrementing tests to hud overlay test suite 2020-10-14 19:16:34 +09:00
Dean Herbert
6a6718ebab Allow bypassing origin/anchor setting of skinnable components
It makes little sense to set these when using RelativeSizeAxes.Both
2020-10-14 19:16:34 +09:00
Dean Herbert
899bac6ca5 Rename catch combo counter for clarity 2020-10-14 19:16:34 +09:00
Dean Herbert
f5623ee21e Setup skinnable combo counter component with default implementation 2020-10-14 19:16:34 +09:00
Dean Herbert
375146b489 Make HUDOverlay test scene skinnable 2020-10-14 19:16:34 +09:00
Dean Herbert
60603d2918 Add skin components and interfaces 2020-10-14 19:16:34 +09:00
Dean Herbert
98acf1e31d Make field read only 2020-10-14 19:16:25 +09:00
smoogipoo
d7a52e97ff Fix multimod difficulty combinations not generating correctly 2020-10-14 19:03:11 +09:00
Dean Herbert
a7f8e26e35 Adjust bottom-right elements positions based on song progress display 2020-10-14 18:51:53 +09:00
Dean Herbert
0cf3e90904 Update SongProgress height based on its dynamic height during resize 2020-10-14 18:44:22 +09:00
Dean Herbert
ace9fbc8d3 Confine available area for HUD components to excluse the song progress area 2020-10-14 18:44:22 +09:00
smoogipoo
da8565c0fa Add 10K mod to incompatibility list 2020-10-14 18:28:19 +09:00
smoogipoo
f04aec538f Fix MultiMod throwing exceptions when creating copies 2020-10-14 18:12:19 +09:00
smoogipoo
3e6ed6c9ff Add support for dual stages (keycoop) and score multiplier 2020-10-14 17:53:28 +09:00
smoogipoo
f9bdb664ee Update diffcalc test 2020-10-14 17:09:01 +09:00
Dan Balasescu
4eccb03d71
Add copyright notice
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-10-14 17:08:14 +09:00
Dean Herbert
207c409792
Merge branch 'master' into fix-mania-diffcalc 2020-10-14 15:26:32 +09:00
Dean Herbert
3e326a9234 Use bindable flow for event propagation 2020-10-14 15:22:17 +09:00