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

31003 Commits

Author SHA1 Message Date
Salman Ahmed
65c269e473 Hide combo counter on gameplay break
Intentionally inside LegacyComboCounter and not in CatchComboDisplay, to avoid conflicting with how the legacy combo counter fades away after 1 second of no combo update, can move to parent once a DefaultComboCounter design is decided and code is shareable between.
2020-08-03 22:17:11 +03:00
Salman Ahmed
21eaf0e995 Expose "is break time" bindable within GameplayBeatmap 2020-08-03 22:14:00 +03:00
Salman Ahmed
f37ba49f7f Add catch-specific combo counter with its legacy design 2020-08-03 22:13:02 +03:00
Salman Ahmed
d6f36457a8 Fix legacy font glyphs being mistaken for animation and getting "extrapolated" 2020-08-03 21:48:43 +03:00
Salman Ahmed
f5af81d775 Add legacy combo font glyphs to legacy skins of test purposes 2020-08-03 21:41:22 +03:00
Salman Ahmed
29053048ff Add support to use legacy combo fonts for the counter on legacy skins 2020-08-03 21:40:20 +03:00
Salman Ahmed
9d10658e3c Allow providing custom sprite text for RollingCounter<T> 2020-08-03 20:14:17 +03:00
Dan Balasescu
8a9036938f
Merge pull request #9761 from peppy/fix-android-version-hash
Add fallback hash generation to fix android startup crash
2020-08-03 19:20:28 +09:00
Dan Balasescu
6d266b5a93
Merge pull request #9712 from frenzibyte/merge-global-to-legacy
Merge GlobalSkinConfiguration settings into the LegacySetting enum
2020-08-03 19:16:35 +09:00
Dean Herbert
f812767c95 Add fallback hash generation to fix android startup crash 2020-08-03 18:49:06 +09:00
Dan Balasescu
ea156d47e3
Merge pull request #9745 from EVAST9919/dashboard-beatmap-panel
Implement DashboardBeatmapListing component for use in Social Overlay
2020-08-03 16:22:49 +09:00
Dan Balasescu
b448ca3efe
Merge branch 'master' into merge-global-to-legacy 2020-08-03 16:00:52 +09:00
Andrei Zavatski
630322ff85 Adjust font weights in line with web 2020-08-03 09:55:06 +03:00
Andrei Zavatski
057d6f03e5 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-beatmap-panel 2020-08-03 09:54:47 +03:00
Dan Balasescu
138afea431
Merge pull request #9459 from EVAST9919/news
News overlay implementaton
2020-08-03 15:51:27 +09:00
Dean Herbert
4189e918a3
Merge branch 'master' into news 2020-08-03 14:16:45 +09:00
Dean Herbert
eafe12aa02
Merge pull request #9747 from frenzibyte/dropdown-height-constraints 2020-08-03 13:42:26 +09:00
Dean Herbert
bde144fc63
Merge branch 'master' into dropdown-height-constraints 2020-08-03 12:51:54 +09:00
Andrei Zavatski
dc559093cd Rename namespace from Dashboard to Home 2020-08-02 21:47:09 +03:00
Andrei Zavatski
bddc61756a Rework padding 2020-08-02 21:44:34 +03:00
Andrei Zavatski
7d83cdbf1c Make title in DrawableBeatmapList a property 2020-08-02 21:35:24 +03:00
Andrei Zavatski
ca57c70961 Naming adjustments 2020-08-02 21:33:14 +03:00
Andrei Zavatski
2131164a60 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-beatmap-panel 2020-08-02 21:29:01 +03:00
Bartłomiej Dach
ca7545917c Extract method for performing legacy lookups 2020-08-02 19:55:18 +02:00
Bartłomiej Dach
3e5c3e256d Extract method for performing generic config lookup 2020-08-02 19:54:38 +02:00
Dean Herbert
7392fd693b
Merge pull request #9757 from bdach/fix-spinner-test-fails
Fix spinner test failures
2020-08-02 23:29:00 +09:00
Bartłomiej Dach
efb08aeed3 Switch unnecessary wait steps to asserts 2020-08-02 14:54:41 +02:00
Bartłomiej Dach
f412808331 Check rotation with bigger tolerance to account for damp 2020-08-02 13:26:48 +02:00
Salman Ahmed
5f52701273 Remove no longer necessary custom dropdown 2020-08-01 10:11:34 +03:00
Salman Ahmed
2190e6443a Apply height constraints to all settings dropdown 2020-08-01 10:02:46 +03:00
Andrei Zavatski
5b1e3e8622 Remove redundant FillFlowContainer from DashboardBeatmapPanel 2020-08-01 09:11:53 +03:00
Andrei Zavatski
b5f688e63a Implement DashboardBeatmapListing component 2020-08-01 07:04:39 +03:00
Andrei Zavatski
7624804edf Implement DashboardPopularBeatmapPanel component 2020-08-01 06:23:06 +03:00
Andrei Zavatski
ce47a34991 Implement DashboardNewBeatmapPanel component 2020-08-01 06:14:24 +03:00
Andrei Zavatski
74f70136fd Implement DashboardBeatmapPanel component 2020-08-01 06:00:24 +03:00
Dean Herbert
2460488255
Merge pull request #9724 from peppy/spinner-spinning 2020-08-01 01:41:15 +09:00
smoogipoo
cd9896c35e Merge branch 'master' into spinner-spinning 2020-08-01 01:06:53 +09:00
Dan Balasescu
15a00823c1
Merge pull request #9719 from peppy/spinner-skinning
Add spinner skinning support
2020-08-01 01:06:17 +09:00
Dean Herbert
180afff805 Ensure damp is always positive exponent 2020-08-01 00:39:04 +09:00
Dean Herbert
bb01ee5be9 Fix trackign alpha not being applied 2020-08-01 00:27:00 +09:00
Dean Herbert
9e244be489
Use better conditional for choosing which spinner type to use
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-08-01 00:05:04 +09:00
Dean Herbert
f1d2312d59
Merge pull request #9735 from smoogipoo/multi-position
Add score position to timeshift results screen
2020-07-31 23:46:07 +09:00
Dean Herbert
7d8f8bdd73
Merge branch 'master' into spinner-spinning 2020-07-31 23:35:15 +09:00
Dean Herbert
f03bad6513
Merge branch 'master' into spinner-skinning 2020-07-31 23:35:06 +09:00
smoogipoo
04b71a0c7c Adjust xmldoc 2020-07-31 23:16:55 +09:00
smoogipoo
308f8bf9bf Fix inverted naming 2020-07-31 23:11:42 +09:00
Dan Balasescu
d63f040477
Merge branch 'master' into multi-position 2020-07-31 23:10:25 +09:00
Dean Herbert
60ef727304
Merge pull request #9706 from smoogipoo/multi-pagination 2020-07-31 23:08:34 +09:00
Dan Balasescu
a413f5f0dc
Merge pull request #9731 from peppy/fix-multiple-tracks-playing
Fix next track starting occasionally starting before previous one is paused
2020-07-31 22:53:02 +09:00
Dean Herbert
909b38a019
Merge branch 'master' into multi-pagination 2020-07-31 22:41:24 +09:00