1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:25:32 +08:00
Commit Graph

26034 Commits

Author SHA1 Message Date
Dan Balasescu
819973bba3
Merge branch 'master' into make_screenshot_manager_a_drawable 2020-02-07 14:48:50 +09:00
Dan Balasescu
55a8e88609
Merge pull request #7728 from EVAST9919/logged-out-comments
Allow guest users to see the comments in CommentsContainer
2020-02-07 13:08:05 +09:00
UselessToucan
4495192c25
Make ScreenshotManager a Component
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-02-06 23:22:30 +03:00
Roman Kapustin
83b2b63d2c Make ScreenshotManager a Drawable 2020-02-06 23:02:03 +03:00
Andrei Zavatski
5946ad7d80 Fix possible memory leak and better user change test support 2020-02-06 16:54:02 +03:00
Andrei Zavatski
0840033343 Merge remote-tracking branch 'refs/remotes/ppy/master' into logged-out-comments 2020-02-06 16:38:47 +03:00
Dan Balasescu
b221a44fa9
Merge pull request #7742 from peppy/mod-setting-keyboard-step
Set a sane default keyboard step for mod settings
2020-02-06 21:07:13 +09:00
Dean Herbert
1613198834 Set a sane default keyboard step for mod settings 2020-02-06 19:43:33 +09:00
Dean Herbert
27f2ee9cb4
Merge pull request #7680 from smoogipoo/rearrangeable-playlist
Reimplement music playlist using framework's RearrangeableListContainer
2020-02-06 19:18:07 +09:00
Dean Herbert
48350638a2 Hide drag handles of all playlist items not currently being dragged 2020-02-06 18:38:00 +09:00
Dean Herbert
0c30e802c0 Merge remote-tracking branch 'upstream/master' into rearrangeable-playlist 2020-02-06 17:40:28 +09:00
Dean Herbert
6b67b601e9 Update framework 2020-02-06 17:35:13 +09:00
Dan Balasescu
bb0990d805
Merge pull request #7740 from peppy/lounge-ruleset-filtering
Make multiplayer room listing filter by current ruleset
2020-02-06 15:53:50 +09:00
Dan Balasescu
edf20e2c3e
Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 15:35:26 +09:00
Dan Balasescu
8d12d820f1
Merge pull request #7734 from peppy/editor-slider-repeat
Add the ability to extend hold notes (spinners / sliders etc.) via timeline
2020-02-06 15:35:16 +09:00
Dan Balasescu
db771150ab
Merge pull request #7741 from peppy/simplify-mp-subscreen-disables
Simplify the way multiple subscreens handle their disable states via a custom stack
2020-02-06 15:34:59 +09:00
Dan Balasescu
108de6ac56
Merge branch 'master' into editor-slider-repeat 2020-02-06 14:48:45 +09:00
smoogipoo
6ae0efa40d Fix adjustment not working when dragged before object 2020-02-06 14:47:43 +09:00
smoogipoo
c138e3907e Move methods below ctor 2020-02-06 14:35:45 +09:00
Dean Herbert
fd71a53717 Fix test regression 2020-02-06 14:28:09 +09:00
Dean Herbert
a84386ba01 Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering 2020-02-06 14:22:52 +09:00
Dean Herbert
81cadb7875 Simplify the way multiple subscreens handle their disable states via a custom stack 2020-02-06 14:22:01 +09:00
Dean Herbert
114fd967c1 Revert "Remove leasing at a Multiplayer screen level"
This reverts commit 304a071e39.
2020-02-06 13:47:34 +09:00
Dean Herbert
d00b61de99 Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 13:38:27 +09:00
Dean Herbert
e548a4b8dd Fix missing bind causing regression in filter 2020-02-06 13:36:49 +09:00
Dean Herbert
94b6564b98 Merge branch 'master' into editor-slider-repeat 2020-02-06 13:16:39 +09:00
Dean Herbert
daf5fa9da4 Throw NotSupportedException instead 2020-02-06 13:16:32 +09:00
Dean Herbert
75eb9ca040
Merge pull request #7739 from peppy/fix-rooms-test-scene
Fix rooms test scene not displaying anything
2020-02-06 13:12:10 +09:00
Dean Herbert
49ec1d4a99 Fix braces style 2020-02-06 13:04:29 +09:00
Dean Herbert
43b22e3b63 Add a ruleset filtering test 2020-02-06 13:03:15 +09:00
Dean Herbert
061b8c389f Fix null search string causing an exception 2020-02-06 13:03:04 +09:00
Dean Herbert
d32bb79e5a Add simple filtering test 2020-02-06 13:03:04 +09:00
Dean Herbert
1dc7fc4a33 Fix case where playlist is empty 2020-02-06 13:01:48 +09:00
Dan Balasescu
190f870097
Merge pull request #7732 from peppy/editor-beatmap-component
Make EditorBeatmap a drawable component
2020-02-06 13:01:03 +09:00
Dan Balasescu
38bf14a06c
Merge branch 'master' into editor-beatmap-component 2020-02-06 12:25:33 +09:00
Dean Herbert
a79d6ff27a Change transition to better handle mass filter cases 2020-02-06 12:17:20 +09:00
Dean Herbert
304a071e39 Remove leasing at a Multiplayer screen level 2020-02-06 12:17:20 +09:00
Dean Herbert
50c4e34c92 Add ruleset to multiplayer filter criteria 2020-02-06 12:17:20 +09:00
Dean Herbert
7f0a134bc8 Bring test scene structure up-to-date 2020-02-06 12:17:05 +09:00
Dean Herbert
00edc7e66f Fix RoomsContainer test scene not displaying 2020-02-06 12:14:17 +09:00
Dean Herbert
f5edad16e6 Improve visuals 2020-02-05 19:43:13 +09:00
Dean Herbert
98ab1f9862 Fix negative spinners 2020-02-05 18:35:31 +09:00
Dean Herbert
3d42973764 Allow scrolling via drag while dragging a hold note handle 2020-02-05 18:35:31 +09:00
Dean Herbert
cef45afbc8 Add a simple hover state 2020-02-05 18:35:31 +09:00
Dean Herbert
d56accaef1 Disallow negative / zero repeat counts (and fix off-by-one) 2020-02-05 18:35:31 +09:00
Dean Herbert
09273d1da9 Fix test scene not correctly building a playable beatmap 2020-02-05 18:35:31 +09:00
Dean Herbert
d04cc0123d Initial implementation of timeline blueprint dragbars 2020-02-05 18:35:31 +09:00
Dean Herbert
cd6902a312 Make EndTime and RepeatCount settable 2020-02-05 17:52:51 +09:00
Dean Herbert
dffc58c5fa Add blueprint type to timeline test 2020-02-05 17:52:51 +09:00
Dean Herbert
96986bf5fc Remove beat divisor from ctor and use DI instead 2020-02-05 17:48:21 +09:00