1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 19:27:24 +08:00
Commit Graph

31100 Commits

Author SHA1 Message Date
Dean Herbert
3916d98e52 Add comment for clarity 2020-08-05 18:50:37 +09:00
Dean Herbert
8644d04a84 Merge branch 'master' into news-fix 2020-08-05 18:50:35 +09:00
Dean Herbert
bb73489ae5 Fix very short spinners being impossible to complete 2020-08-05 18:46:58 +09:00
Dean Herbert
93f8dddb20
Merge pull request #9778 from smoogipoo/spinner-behind-circles
Always place spinners behind hitcircles/sliders
2020-08-05 18:16:10 +09:00
smoogipoo
24bc9b33b1 Always place spinners behind hitcircles/sliders 2020-08-05 15:40:45 +09:00
Salman Ahmed
2771c95bec Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins 2020-08-04 22:17:54 +03:00
Sebastian Krajewski
9fb7b8f3d8 Rename the property to "AlignWithStoryboard" 2020-08-04 15:43:33 +02:00
Dan Balasescu
b582e9caa4
Merge pull request #9773 from peppy/update-framework
Update framework
2020-08-04 21:46:32 +09:00
Dean Herbert
d7e82efb67 Fix tests 2020-08-04 21:16:59 +09:00
Dean Herbert
22b52d63c7 Update framework 2020-08-04 20:51:59 +09:00
Dan Balasescu
ccc20a9341
Merge pull request #9765 from peppy/fix-match-forcing-playback
Fix multiplayer match select forcing playback even when user paused
2020-08-04 12:27:05 +09:00
Dean Herbert
4d6f60edaf Fix multiplayer match select forcing playback even when user paused 2020-08-03 22:43:50 +09:00
Sebastian Krajewski
675f618b28 Apply playfield's offset only in play mode 2020-08-03 14:18:45 +02:00
Sebastian Krajewski
c48648ea2a Add playfield shift like in osu-stable 2020-08-03 13:00:36 +02: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
Andrei Zavatski
af320e4a61 Fix NewsOverlay running request on startup 2020-08-03 10:03:42 +03: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
Dan Balasescu
6511d6416b
Merge branch 'master' into fix-keybind-clearing 2020-08-03 15:26:09 +09:00
smoogipoo
435c9de8b9 Re-privatise buttons 2020-08-03 15:25:23 +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
Joehu
7aafc018ad Prevent updating bind target when hovering cancel and clear buttons instead 2020-08-02 12:52:12 -07:00
Joehu
d49e54deb6 Add failing test for another regressing behavior 2020-08-02 12:47:23 -07:00
Joehu
ba77fa2945 Add test for clear button 2020-08-02 12:41:35 -07:00
Joehu
b96e32b0bb Add xmldoc for updateBindTarget 2020-08-02 12:26:09 -07: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