1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Commit Graph

20543 Commits

Author SHA1 Message Date
Dean Herbert
9572260e6d Add bulge and explode support 2020-10-16 17:09:00 +09:00
Dean Herbert
8104bd0f74 Add fill colour changes 2020-10-16 17:08:46 +09:00
Dean Herbert
5803c72b4c Add support for old marker style danger textures 2020-10-16 17:08:46 +09:00
Dean Herbert
f0b15813e2 Add support for both legacy styles 2020-10-16 17:08:46 +09:00
Dean Herbert
bdebf2f1a4 Fix skinnable test scene still not working with dynamic compilation 2020-10-16 17:08:46 +09:00
Dean Herbert
6d3a106a86 Simplify texture lookups 2020-10-16 17:08:46 +09:00
Dean Herbert
f28bcabae7 Avoid transforms per hp change 2020-10-16 17:08:46 +09:00
Dean Herbert
a810f56ec8 Move "flash on hit only" logic to binding 2020-10-16 17:08:46 +09:00
Dean Herbert
5be9e30cd0 Add legacy implementation 2020-10-16 17:08:46 +09:00
Dean Herbert
e89c5c3b3c Add dynamic compile exceptions to fix skin test scenes 2020-10-16 17:08:46 +09:00
Dean Herbert
c0a1f2158c Add basic component structure for skinnable health displays 2020-10-16 17:08:46 +09:00
Dan Balasescu
583fdc3a95
Merge pull request #10510 from peppy/skinnable-accuracy-display
Add legacy skinning support for accuracy display
2020-10-15 21:20:48 +09:00
Dan Balasescu
5d8cf87155
Merge pull request #10511 from peppy/bottom-error-display
Add support for bottom-anchored hit error display
2020-10-15 20:51:09 +09:00
Dan Balasescu
70b050f212
Merge branch 'master' into skinnable-accuracy-display 2020-10-15 20:28:57 +09:00
Dan Balasescu
1ce0e83e59
Merge branch 'master' into skinnable-score-display 2020-10-15 19:16:03 +09:00
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
Dean Herbert
70806deba1 Add support for bottom-anchored hit error display 2020-10-15 19:14:02 +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
Dean Herbert
d76365ed1b Make container readonly 2020-10-15 18:38:41 +09:00
Dan Balasescu
5640d33d1a
Merge branch 'master' into skin-disabler-refactor 2020-10-15 18:32:50 +09:00
Dean Herbert
6983978c98 Correct top-right element offset by finding the lower top anchor element 2020-10-15 18:30:44 +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
Dean Herbert
ca74cf824c Add padding 2020-10-15 18:24:28 +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
b31a3fbabb Add test 2020-10-15 18:11:30 +09:00
Dean Herbert
4f6dd15869 Add legacy font lookup support for comma/percent 2020-10-15 17:56:37 +09:00
Dean Herbert
254eba9008 Add and consume skinnable accuracy counter 2020-10-15 17:53:16 +09:00
Dean Herbert
90ff8ff050 Merge branch 'skinnable-combo-counter' into skinnable-score-display 2020-10-15 17:52:06 +09:00
Dean Herbert
37e9f331ad Simplify score font lookup 2020-10-15 17:49:55 +09:00
Dean Herbert
43e5cb90e2 Merge branch 'skinnable-combo-counter' into skinnable-score-display 2020-10-15 17:30:29 +09:00
Dean Herbert
9f51327e4b Fix completely incorrect default positioning logic 2020-10-15 17:29:40 +09:00
Dean Herbert
5b5ba7df93 Remove unused offset 2020-10-15 17:22:34 +09:00
Dean Herbert
d8d085ede9 Align top-right elements with lowest point in score display 2020-10-15 17:14:42 +09:00
Dean Herbert
74c031cfbb Fix ModOverlay not including "UNRANKED" text in size 2020-10-15 17:14:42 +09:00
Dean Herbert
b210147c2e Update combo counter to read from default score display's position correctly 2020-10-15 17:14:42 +09:00
Dean Herbert
950c47287c Fix positioning of score display in HUD overlay 2020-10-15 17:14:42 +09:00
Dean Herbert
e1da64398e Add and consume skinnable score counter 2020-10-15 17:14:42 +09:00
Dean Herbert
219cbec6bd Split out DefaultScoreCounter and make ScoreCounter abstract 2020-10-15 16:32:30 +09:00
Dean Herbert
d5f2aab52e Tidy up SkinnableComboCounter class slightly 2020-10-15 15:37:40 +09:00
Bartłomiej Dach
c3f1a30447 Merge branch 'master' into mod-customisation-absorb-mouse-input 2020-10-15 00:40:27 +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
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
8b864c8c22
Merge branch 'master' into fix-multimod-copy 2020-10-14 22:29:38 +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
Dean Herbert
ac4f56403d Adjust size/position 2020-10-14 19:16:34 +09:00