h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 22:07:29 +08:00
Code Issues Releases Wiki Activity
47,686 Commits 3 Branches 654 Tags 363 MiB
66613cbaa4
Commit Graph

610 Commits

Author SHA1 Message Date
Gagah Pangeran Rosfatiputra
65aa01866e
add test scene for OsuMarkdownContainer 2021-04-27 14:38:21 +07:00
Bartłomiej Dach
881043bc5d Fix failing test after mod settings layout changes 
The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.

Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
 2021-04-20 19:38:25 +02:00
Bartłomiej Dach
577755ee19 Add placeholder when no colours are visible 
Will be removed once combo colours are mutable.
 2021-04-18 20:46:42 +02:00
Bartłomiej Dach
0cd1aa8c1c Add support for custom colour prefixes 2021-04-18 20:44:55 +02:00
Bartłomiej Dach
67c19df000 Add test coverage for adding/removing colours 2021-04-18 19:35:42 +02:00
Bartłomiej Dach
1b2c43b92c Add basic structure of colour palette 2021-04-18 19:29:04 +02:00
Dean Herbert
346e36d32a Make Mod.Description abstract and add missing descriptions 2021-04-15 14:36:26 +09:00
Max Hübner
558f8fa51e Adjust testscene 2021-03-25 23:20:26 +01:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dean Herbert
3802cb29a4 Fix failing tests doing reference comparisons between string and LocalisedString 2021-02-25 17:49:54 +09:00
Dean Herbert
90e8308716 Merge branch 'master' into localisation-refactor-framework 2021-02-25 17:28:55 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
Dean Herbert
cdbf8de29d Update other tests which can benefit from using a shorter beatmap 2021-02-22 14:53:32 +09:00
Jamie Taylor
2ee634d173 Create subclass for "Error" notifications to allow them to have a unique pop-in sound 2021-02-11 13:55:43 +09:00
Dean Herbert
98a83722ff Move the point at which selected mods are reset in tests to allow mutliple creation test flow 2021-02-10 15:29:55 +09:00
Dean Herbert
de8a60435f Add failing test covering reported breaking case 2021-02-10 14:44:37 +09:00
Dean Herbert
e9ef4aaf88 Add test covering expectations of external mod changes 2021-02-10 14:34:45 +09:00
Dean Herbert
0efad9ded1 Add test coverage of setting reset on deselection 2021-02-09 13:54:13 +09:00
Dean Herbert
3e750feaa4 Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection 2021-02-05 16:42:35 +09:00
Dean Herbert
cef16a9f61 Add test coverage of animation / selection flushing 2021-02-04 19:55:15 +09:00
Dean Herbert
15062cc63f Fix intermittent test failures 2021-02-04 19:29:48 +09:00
Dean Herbert
b06f4ee124
Merge branch 'master' into solo-mod-select-overlay 2021-02-03 23:44:08 +09:00
Dean Herbert
2a52851e68
Merge branch 'master' into modselect-dynamic-isvalid 2021-02-03 22:11:33 +09:00
Dean Herbert
77735ac9dc
Merge pull request #11663 from smoogipoo/modselect-disable-stacking 
Allow mod buttons to not be stacked
 2021-02-03 22:11:02 +09:00
smoogipoo
921f008217 Fix ModIcon not updating background colour correctly 2021-02-02 21:35:08 +09:00
smoogipoo
e58ece9e10 Make ModSelectOverlay abstract 2021-02-02 21:06:04 +09:00
smoogipoo
50e92bd0ed Fix selection not being preserved when IsValidMod changes 2021-02-02 20:50:54 +09:00
smoogipoo
10ceddf3ff Make IsValidMod adjustable 2021-02-02 20:47:50 +09:00
smoogipoo
6d620264f4 Allow mod buttons to not be stacked 2021-02-02 20:27:41 +09:00
Salman Ahmed
d034728443 Remove conditional compilation symbols for such case 2021-01-24 01:05:45 +03:00
Salman Ahmed
85b8b00b8c Fix forgotten modulo 2021-01-24 01:04:56 +03:00
Salman Ahmed
faa2210274 Use old-style Enum.GetValues method for older than .NET 5 2021-01-24 00:55:58 +03:00
Salman Ahmed
acfb2d2980 Refactor beatmap set covers into using ModelBackedDrawable<T> 2021-01-24 00:32:33 +03:00
Salman Ahmed
d83abfa7d2 Add test scene with failing test case 2021-01-24 00:32:20 +03:00
Bartłomiej Dach
360f26c13d Merge branch 'master' into scroll-to-20 2021-01-22 19:58:36 +01:00
smoogipoo
54dbb43f79 Fix more potential failures 2021-01-21 14:03:35 +09:00
Dean Herbert
7c4a072568 Merge branch 'master' into scroll-to-20 2021-01-21 13:48:26 +09:00
smoogipoo
163a937e41 Fix mod test failing intermittently 2021-01-21 13:30:53 +09:00
Dean Herbert
5fd644fc57 Unify variable names 2021-01-17 22:42:48 +09:00
Salman Ahmed
268f9d661f Dispose of local config on disposal 2021-01-13 13:00:14 +03:00
Salman Ahmed
80fa2cf693 Add test coverage 2021-01-12 11:14:05 +03:00
Salman Ahmed
375ecf92ed Merge remote-tracking branch 'upstream/master' into fix-mod-buttons-not-copying-settings 2021-01-09 00:26:18 +03:00
Dean Herbert
0639429a23 Fix test (and remove no longer valid test) 2021-01-05 18:10:39 +09:00
Dean Herbert
54982dcdd7 Refactor LoadingLayer to avoid applying effects to external drawables 
In theory this seemed like a good idea (and an optimisation in some
cases, due to lower fill rate), but in practice this leads to weird edge
cases.

This aims to do away with the operations on external drawables by
applying a dim to the area behind the `LoadingLayer` when required.
I went over each usage and ensured they look as good or better than
previously.

The specific bad usage here was the restoration of the colour on dispose
(if the `LoadingLayer` was disposed in a still-visible state).

I'm aware that the `BeatmapListingOverlay` will now dim completely during
load. I think this is fine for the time being.
 2021-01-05 17:31:45 +09:00
Salman Ahmed
ee664ad571 Add test coverage 2021-01-01 03:47:18 +03:00
Endrik Tombak
668f89d8b2 Copy test from #11019 2020-12-22 17:33:11 +02:00
Dean Herbert
eb38bc4b4c Add the ability to import into ArchiveModelManagers from a stream 2020-12-07 18:09:18 +09:00
Joehu
15e0ea332b Check state instead of alpha in tests 2020-12-06 13:18:19 -08:00
Andrei Zavatski
c4cb1440ab Rename PaginatedContainerHeader to ProfileSubsectionHeader 2020-11-21 02:59:01 +03:00
Joehu
ef3c918a3c Simplify input buttons/keys in tests 2020-11-09 14:18:20 -08:00
Andrei Zavatski
4f6081c7f3 Use BindableList<T> 2020-10-28 19:44:13 +03:00
Andrei Zavatski
c4efceceb2 Use char instead of sting for request parameter creation 2020-10-27 23:57:11 +03:00
Andrei Zavatski
008d1d697c Implement filtering by rank achieved 2020-10-27 23:14:48 +03:00
Andrei Zavatski
1710b396e7 Implement BeatmapSearchMultipleSelectionFilterRow 2020-10-27 22:27:29 +03:00
Andrei Zavatski
1b40b56d41 Add ability to search by play criteria 2020-10-27 21:30:53 +03:00
Andrei Zavatski
26a60d898c Implement BeatmapSearchExtraFilterRow 2020-10-27 21:22:20 +03:00
Bartłomiej Dach
c3f1a30447 Merge branch 'master' into mod-customisation-absorb-mouse-input 2020-10-15 00:40:27 +02:00
smoogipoo
f04aec538f Fix MultiMod throwing exceptions when creating copies 2020-10-14 18:12:19 +09:00
Leon Gebler
28d3295f9f Test Class Fixes 2020-10-13 19:20:15 +02:00
Leon Gebler
7df9282727 CodeAnalysis fixes 2020-10-12 15:58:34 +02:00
Leon Gebler
8768891b12 Add testing for clicking mods through customisation menu 2020-10-12 14:41:05 +02:00
Dean Herbert
87bf3bdc16 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:26:06 +09:00
Dan Balasescu
54520faa7e
Merge pull request #10082 from EVAST9919/profile-sections-update 
Update section headers in ProfileOverlay in line with web
 2020-09-11 14:53:17 +09:00
Bartłomiej Dach
97690c818c Add regression test coverage 2020-09-11 00:12:05 +02:00
Andrei Zavatski
e5d0f3b657 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-sections-update 2020-09-10 20:23:02 +03:00
Andrei Zavatski
e39609d3ca Implement PaginatedContainerWithHeader component 2020-09-07 23:08:50 +03:00
Andrei Zavatski
3a24cc1aa9 Implement PaginatedContainerHeader component 2020-09-07 22:13:29 +03:00
Salman Ahmed
0500f24a1d Remove now-redundant test case 2020-09-04 10:24:54 +03:00
Dean Herbert
e465afa280 Merge branch 'master' into beatmap-track-rework 2020-08-14 20:02:43 +09:00
smoogipoo
3cb22fad82 Fix mods sharing bindable instances 2020-08-13 19:48:31 +09:00
smoogipoo
91e28b849d Fix incorrect BeatmapManager construction 2020-08-13 00:29:23 +09:00
smoogipoo
322d08af1b Remove more local music controller caches 2020-08-11 13:11:59 +09:00
smoogipoo
2351701ade Fix test not having a long enough track 2020-08-07 23:08:51 +09:00
smoogipoo
5002d69f69 Update inspections 2020-08-07 20:51:56 +09:00
smoogipoo
61b632516e Ensure CurrentTrack is never null 2020-08-07 19:43:16 +09:00
smoogipoo
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
Dean Herbert
d7e82efb67 Fix tests 2020-08-04 21:16:59 +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
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
c1b9b847ec Merge branch 'master' into grey-logo-animation 2020-07-27 14:10:52 +09:00
jorolf
50f72ac9cb rename classes 2020-07-22 22:10:59 +02:00
Andrei Zavatski
ad9492804a Apply suggestions 2020-07-21 22:56:44 +03:00
Andrei Zavatski
e96f8f1cb6 Make content side padding adjustable for OverlayHeader 2020-07-21 20:02:22 +03:00
Dean Herbert
61b298d74d
Merge pull request #9571 from smoogipoo/fix-mod-selection 2020-07-16 16:04:43 +09:00
smoogipoo
1a6ae3194e Add test 2020-07-15 19:45:48 +09:00
Dean Herbert
fe68e8276d Merge branch 'master' into logo-shader 2020-07-15 19:06:35 +09:00
Dean Herbert
19ab973bb9 Add second layer to test scene 2020-07-15 18:48:20 +09:00
Andrei Zavatski
4c2294f0cd Refactor LoadRepliesButton to inherit LoadingButton 2020-07-14 15:02:29 +03:00
Andrei Zavatski
56349e65f3 Rename arrow direction method 2020-07-14 03:01:14 +03:00
Andrei Zavatski
f6e4ecd960 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-14 02:46:29 +03:00
Andrei Zavatski
6eec2f9429 Implement RankingsSortTabControl component 2020-07-13 01:22:05 +03:00
Andrei Zavatski
0d6dbb6523 Clean up exposed icon for tests 2020-07-12 13:36:42 +03:00
Andrei Zavatski
c9d21894e5 Add test for icon toggle 2020-07-12 13:19:28 +03:00
Andrei Zavatski
da40f29b44 Make button text a property 2020-07-12 12:27:26 +03:00
Andrei Zavatski
b1b2e961bc Update arrow colour on hover 2020-07-11 08:13:11 +03:00
Andrei Zavatski
da249abd19 Implement CommentRepliesButton 2020-07-11 07:47:17 +03:00
Dean Herbert
664ab6d5f6
Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 17:14:46 +09:00
jorolf
52b313f290 change textures 2020-07-04 19:06:26 +02:00
jorolf
6f0ec36407 remove size from hue animation 2020-06-24 16:27:00 +02:00
jorolf
768e28faba generalize and simplify animation 2020-06-24 14:11:38 +02:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
smoogipoo
ab10732a78 Remove usages of null-forgiving operator 2020-06-09 22:13:48 +09:00
Salman Ahmed
495f89ddae
Expand number text box test scene to one holding all OsuTextBox's types 2020-06-05 06:45:42 +03:00
smoogipoo
8aa8d2c880 Resolve NREs 2020-06-03 16:59:37 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
Dan Balasescu
e915f22516
Merge branch 'master' into schedule-music-controller-operations 2020-04-28 14:09:56 +09:00
Dean Herbert
0d752dc7b8 Remove redundant initialisation 2020-04-28 12:55:57 +09:00
Dean Herbert
743a92bbbe Use a local database for now playing test 2020-04-28 12:42:08 +09:00
Dean Herbert
81e73acb1a Fix tests failing when not run in certain order 2020-04-28 12:21:27 +09:00
Dan Balasescu
4fff08d241
Remove unused using 2020-04-28 12:19:39 +09:00
Dean Herbert
62be138aa9 Avoid calls on MusicController executing before it may have finished loading 2020-04-28 11:46:08 +09:00
Joehu
7731d45f13 Remove unnecessary usings 2020-04-26 20:30:56 -07:00
Joehu
8a47a615db Remove unranked label from footer 2020-04-26 19:29:22 -07:00
Dean Herbert
c2ed6491a9 Move and shorten enum names 2020-04-21 15:39:15 +09:00
Dean Herbert
89320b510c Apply class renaming 2020-04-21 15:13:19 +09:00
Dean Herbert
86e8aaa2f4
Merge branch 'master' into beatmap-listing-expanded 2020-04-16 16:15:40 +09:00
smoogipoo
9e2be6f2f4 Remove bindable to promote one-way access 2020-04-16 13:25:08 +09:00
Dean Herbert
06e25091f6 Fix typo 2020-04-16 10:44:08 +09:00
smoogipoo
102c1d9095 Add disabled state to menu items 2020-04-15 16:17:17 +09:00
Dean Herbert
c0a1aae63a
Merge branch 'master' into beatmap-listing-expanded 2020-04-15 13:26:16 +09:00
Andrei Zavatski
29dd225205 Make button protected 2020-04-13 10:45:15 +03:00
Andrei Zavatski
bdce79ed5b Fix incorrect test step name 2020-04-13 09:57:05 +03:00
Andrei Zavatski
0eaff00787 Fix typo in test 2020-04-13 09:45:49 +03:00
Andrei Zavatski
99fa145847 Add test for potential failing case 2020-04-13 08:38:34 +03:00
Andrei Zavatski
518acf03e9 Remove BeatmapSearchSmallFilterRow component 2020-04-09 19:41:35 +03:00
Andrei Zavatski
b6d8e487d2 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-listing-expanded 2020-04-09 19:18:59 +03:00
Andrei Zavatski
134feefa14 Remove bindable 2020-04-09 13:10:09 +03:00
Andrei Zavatski
2d3ea95469 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-04-09 13:06:22 +03:00
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
Dean Herbert
53b2f58eda
Merge branch 'master' into overlay-scroll-container 2020-04-09 15:05:49 +09:00
Joehu
493b654011 Remove horizontal margin from mod display 
Can skew center alignment on fill flow containers.

Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.
 2020-04-03 11:30:02 -07:00
Andrei Zavatski
e26fbd5ed8 Remove overcomplicated stuff 2020-03-31 13:45:59 +03:00
Andrei Zavatski
2dc81bbcfa Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-03-30 13:37:25 +03:00
Dean Herbert
35647d59a6 Add failing test 2020-03-30 19:09:05 +09:00
Andrei Zavatski
7b24cc325f Implement OverlayScrollContainer component 2020-03-27 20:57:57 +03:00
TheWildTree
9a30ff5a00 Fix code quality issues 2020-03-26 16:11:58 +01:00
TheWildTree
a5781d7fc5 Replace ScreenTitle with OverlayTitle and update titles to match new design 2020-03-24 22:08:20 +01:00
杜Nate
9ea0137b01
Merge branch 'master' into spun-out 2020-03-23 18:13:53 +08:00
Dean Herbert
680d058f3f Merge branch 'master' into friends-layout-split 2020-03-23 15:36:04 +09:00
Dean Herbert
bfd643dd16 Rename classes 2020-03-23 10:47:27 +09:00
Dean Herbert
0b728f483f Rename base test class to help avoid incorrect reference 2020-03-23 10:01:33 +09:00
Andrei Zavatski
4ac740b12b Remove APIFriend 2020-03-17 08:51:54 +03:00
Andrei Zavatski
544dfe7dd3 Implement FriendsLayout component 2020-03-16 09:42:21 +03:00
Andrei Zavatski
1318f242c1 Revert changes to basic implementation and remove redundant stuff 2020-03-06 02:12:30 +03:00
Andrei Zavatski
c08e16d97f Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-listing-expanded 2020-03-06 01:27:51 +03:00
Andrei Zavatski
bd03dd9b70 Adjust class naming 2020-03-04 23:08:58 +03:00
杜Nate
cf88e3ff19
Merge branch 'master' into spun-out 2020-03-04 17:38:35 +08:00
Andrei Zavatski
4d5445b5dc Rename Amount to Count 2020-03-04 00:31:06 +03:00
Andrei Zavatski
06b23b626e Simplify test scene setup 2020-03-04 00:15:10 +03:00
Andrei Zavatski
83dad93b6d Make Populate() accept list of users 2020-03-03 18:08:51 +03:00
Andrei Zavatski
160d64eecf FriendsOnlineStatusControl basic implementation 2020-03-03 17:37:01 +03:00
Andrei Zavatski
7bc9a9b3d8 Implement OverlayPanelDisplayStyleControl and UserListToolbar components 2020-02-24 07:28:33 +03:00
Andrei Zavatski
0cfe1ac823 Implement UserSortTabControl component 2020-02-24 05:47:21 +03:00
Dean Herbert
7d145a7470 Add test for loading spinner with box 2020-02-21 16:21:44 +09:00
Dean Herbert
bbac95958c Fix incorrect test scene name 2020-02-21 16:20:55 +09:00
Dean Herbert
38d9a46ffb Add test for relative sizing scenarios 2020-02-21 16:20:17 +09:00
Dean Herbert
92f6f0207c Rename LoadingAnimation to LoadingSpinner 2020-02-21 15:33:31 +09:00
Dean Herbert
623b78d675 Combine all loading animation implementations 2020-02-21 15:32:46 +09:00
smoogipoo
2cb218c9c4 Merge remote-tracking branch 'origin/master' into comment-editor 2020-02-21 12:27:34 +09:00
Andrei Zavatski
3c56118f45 Implement BeatmapSearchParameters and refactor all the components 2020-02-21 02:28:33 +03:00
Dean Herbert
3380dbbd71 Improve visual appearance of ProcessingOverlay 2020-02-20 19:49:22 +09:00
Andrei Zavatski
37003e11b9 Make fields readonly 2020-02-18 18:04:39 +03:00
Andrei Zavatski
bb22243903 TestScene improvements 2020-02-18 17:47:44 +03:00
Andrei Zavatski
7228900361 Implement BeatmapListingSearchSection component 2020-02-18 17:25:12 +03:00
Dan Balasescu
75e0668b4e
Merge branch 'master' into new-direct-sort 2020-02-18 10:17:26 +09:00
Andrei Zavatski
410686c8b9 Use dropdown in BeatmapSearchFilterRow 2020-02-18 01:04:25 +03:00
Andrei Zavatski
19872d9e24 Simplify test scene 2020-02-17 22:05:10 +03:00
Andrei Zavatski
d985a22f77 Add missing blank line 2020-02-17 03:52:26 +03:00
Andrei Zavatski
fe7923b7e8 Add SortDirection Bindable and refactor to make everything work 2020-02-17 03:38:14 +03:00
Andrei Zavatski
2ba0bd872b Implement basic BeatmapListingSortTabControl 2020-02-17 02:35:46 +03:00
Andrei Zavatski
ea285fd005 Refactor with including headers 2020-02-17 00:44:55 +03:00
Andrei Zavatski
e62fec58c1 Add ability to override text size 2020-02-16 16:38:05 +03:00
Andrei Zavatski
a71e410e5d Make the filter autosized 2020-02-16 15:04:21 +03:00
Andrei Zavatski
3888911eee Implement BeatmapSearchFilter component 2020-02-16 14:19:49 +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
smoogipoo
d4f14e552a Improve extensibility of mod display expansion 2020-02-13 18:05:53 +09:00
Andrei Zavatski
c391a464a5 Add tests 2020-02-13 04:06:34 +03:00
Andrei Zavatski
9ac6c271ac Naming adjustments 2020-02-12 02:05:45 +03:00
Andrei Zavatski
c022cf72b5 Implement CancellableCommentEditor 2020-02-11 20:47:51 +03:00
Andrei Zavatski
829152c8e8 Implement EditorTextbox 2020-02-11 20:08:24 +03:00
Andrei Zavatski
482f622c94 CommentEditor basic implementation 2020-02-11 18:46:49 +03:00
Bartłomiej Dach
7e28f2fe6a Rename test to better reflect its purpose 2020-02-09 14:41:02 +01:00
Bartłomiej Dach
404cb61342 Open mod select in a more reliable way 2020-02-09 14:39:27 +01:00
ProTheory8
590429b43b Now TestAutoOpenOnModSelect checks if customisation closes after deselecting mod 2020-02-09 14:15:32 +05:00
杜Nate
8d480c794a
Merge branch 'master' into spun-out 2020-02-08 13:54:39 +08:00
mcendu
a4637a24a6 fix test scene crash 2020-02-08 12:08:44 +08:00
mcendu
2d67215931 make target practice subject of unimplemented mod test 2020-02-08 12:07:21 +08:00
smoogipoo
e4e0a26b62 Merge remote-tracking branch 'origin/master' into rearrangeable-playlist 2020-02-04 16:55:55 +09:00
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing 2020-02-04 11:57:54 +09:00
Dan Balasescu
76ba0b833e
Merge pull request #7716 from EVAST9919/overlay-header-ruleset-selector 
Add ability to create ruleset selector in OverlayHeader
 2020-02-03 19:00:12 +09:00
Dan Balasescu
c6e7603e5e
Merge branch 'master' into safe-screen-lease 2020-02-03 18:18:13 +09:00
Andrei Zavatski
81ab6d43b6 Add ability to create ruleset selector in OverlayHeader 2020-02-03 11:09:46 +03:00