1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 06:42:54 +08:00
Commit Graph

26894 Commits

Author SHA1 Message Date
smoogipoo
25e399f11b Merge branch 'match-playlist' into match-detail-area 2020-02-14 17:04:22 +09:00
Dean Herbert
4ce687d608 Move public methods up 2020-02-14 17:03:23 +09:00
Dan Balasescu
6aab9b7a08
Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 17:02:34 +09:00
Dean Herbert
cd2d1b0669 Fix 2B maps not playing correctly with relax mod enabled 2020-02-14 17:00:55 +09:00
Dean Herbert
9ea6912520 Improve overall readability of OsuModeRelax 2020-02-14 16:58:56 +09:00
smoogipoo
aceba8791c Clean up selection handling 2020-02-14 16:56:44 +09:00
smoogipoo
6a466ea2f5 Improve test cases 2020-02-14 16:48:30 +09:00
smoogipoo
afd3e4604b Fix race condition causing selection to be reset incorrectly 2020-02-14 16:48:23 +09:00
smoogipoo
d6768bba62 Make test playlist items unique 2020-02-14 16:09:30 +09:00
smoogipoo
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
Dean Herbert
4fbf85505c
Merge pull request #7546 from Game4all/online-container
Add a container type to easily hide online content when not online
2020-02-14 16:00:17 +09:00
Dean Herbert
9cbb37b682 Fix bindable being created far too late in construction 2020-02-14 15:59:59 +09:00
Dean Herbert
a75715607b Move drawable load to asynchronous context 2020-02-14 15:41:46 +09:00
Dean Herbert
720ceca78a Final tidy-up pass 2020-02-14 15:38:47 +09:00
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
smoogipoo
eb75d26c8f Extract common rearrangeable list design 2020-02-14 15:36:16 +09:00
Dean Herbert
edf9cfc863 API can't be null on load 2020-02-14 15:36:06 +09:00
Dean Herbert
6f1cecd86f Move LoadComplete up in method 2020-02-14 15:35:39 +09:00
Dean Herbert
7e6c194d4a Add missing xmldoc 2020-02-14 15:34:46 +09:00
Dean Herbert
4d5abab2ee Remove unnecessary content private storage 2020-02-14 15:29:50 +09:00
Dean Herbert
b86b5e9adb Move nested class to bottom of file 2020-02-14 15:27:39 +09:00
Dean Herbert
c34f1f40ea Fix test text not being centered 2020-02-14 15:27:09 +09:00
Dean Herbert
aa7efe6141 Fix tests potentially failing due to timing issues 2020-02-14 15:26:55 +09:00
Dean Herbert
76cfe1f42c Merge branch 'master' into online-container 2020-02-14 15:18:27 +09:00
smoogipoo
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +09:00
smoogipoo
3a0b2508d4 Fix possible nullrefs 2020-02-14 15:01:34 +09:00
Dean Herbert
0e439e3a70 Fix missing dependency in ZoomableScrollContainer test 2020-02-14 14:41:55 +09:00
Dean Herbert
884a5fbad4 Fix osu! gameplay cursor not adjusting to mod/convert circle size changes 2020-02-14 14:30:15 +09:00
Dan Balasescu
60d796ae3f
Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 13:04:38 +09:00
Dan Balasescu
7fdc8cc7c1
Merge pull request #7827 from turbedi/span_fromHex
Use Span for OsuColour.FromHex
2020-02-14 12:44:11 +09:00
Dan Balasescu
f64f934204
Merge branch 'master' into span_fromHex 2020-02-14 12:09:34 +09:00
Dan Balasescu
a9bfe9f7f3
Merge pull request #7800 from peppy/fix-editor-time-change-display
Fix editor hit objects displaying incorrectly after StartTime change
2020-02-14 11:33:42 +09:00
Dan Balasescu
e5c706a97d
Merge pull request #7805 from peppy/update-placement-more-often
Update placement blueprint's position more often
2020-02-14 11:33:03 +09:00
Berkan Diler
50899ddccb Use Span for OsuColour.FromHex 2020-02-14 03:19:25 +01:00
voidedWarranties
368e6f9579 Use CarouselBeatmap.State to select 2020-02-13 17:47:16 -08:00
voidedWarranties
c871f07d2e Use CarouselBeatmap action to select beatmap 2020-02-13 17:14:46 -08:00
Andrei Zavatski
c68c347503 Remove unwanted property interpolation 2020-02-14 00:40:52 +03:00
Lucas A
049b0d93d1 Add back default content fade transitions 2020-02-13 21:40:25 +01:00
Andrei Zavatski
ab84f4085a Fix possible error on SpotlightsLayout disposal 2020-02-13 23:20:45 +03:00
Andrei Zavatski
11ec3ddf1e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings 2020-02-13 23:20:05 +03:00
Bartłomiej Dach
0f25864fae Textbox -> TextBox rename pass 2020-02-13 21:04:53 +01:00
Bartłomiej Dach
5646083ed9 Adjust code style in test 2020-02-13 21:01:25 +01:00
Bartłomiej Dach
09b2e7beed Encapsulate test editors 2020-02-13 20:56:34 +01:00
Bartłomiej Dach
cc625e3b89 Move initialisation logic to [SetUp] 2020-02-13 20:44:02 +01:00
Lucas A
dac0148c94 Apply review suggestions. 2020-02-13 20:08:14 +01:00
Malox10
10e3af094c
Merge branch 'master' into hoverable-timestamps 2020-02-13 18:06:15 +01:00
Andrei Zavatski
791bf6bc01 Make username text italic 2020-02-13 19:03:07 +03:00
Andrei Zavatski
e67e4f708e Adjust country name design 2020-02-13 19:01:26 +03:00
Dean Herbert
5b3f0bbb0a
Merge branch 'master' into fix-editor-time-change-display 2020-02-13 23:55:52 +09:00
Dean Herbert
d7c71cd0c1
Merge branch 'master' into update-placement-more-often 2020-02-13 23:55:18 +09:00