1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 17:02:55 +08:00
Commit Graph

23162 Commits

Author SHA1 Message Date
Andrei Zavatski
75a2e383f2 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-15 11:19:45 +03:00
Dan Balasescu
8bba6288a8
Merge pull request #6501 from peppy/map-pool-autochange-fix
Don't automatically return to gameplay from map pool if no picks are made
2019-10-15 17:03:16 +09:00
Dan Balasescu
96fc88e362
Merge branch 'master' into map-pool-autochange-fix 2019-10-15 16:24:29 +09:00
smoogipoo
96c6aeefe9 Remove out-of-date todo 2019-10-15 16:16:33 +09:00
smoogipoo
12cd57744b Make RulestStore initialise at construction time 2019-10-15 16:14:06 +09:00
Dan Balasescu
6305198d84
Merge pull request #6514 from Joehuu/simplify-overlaycontainers
Make OverlayContainers with no blocking input VisibilityContainers
2019-10-15 13:23:28 +09:00
Joehu
efc201ec85 Make PlaylistOverlay a VisibilityContainer 2019-10-14 16:40:53 -07:00
Joehu
f4924dc3cf Fix volume scrolling when hovering VersionManager 2019-10-14 16:37:54 -07:00
Joehu
ccc753a315 Make OverlayContainers with no blocking input VisibilityContainers 2019-10-14 16:27:59 -07:00
Andrei Zavatski
ad32d66365 CI fix 2019-10-15 01:10:23 +03:00
Andrei Zavatski
42a06a54ff Don't use ProfileShowMoreButton in the test scene to avoid confusion 2019-10-15 01:08:23 +03:00
Andrei Zavatski
0fd6b0c852 Use linq expression to count deleted comments 2019-10-15 00:55:33 +03:00
Andrei Zavatski
b84c9dfd84 Use Humanizer.ToQuantity instead of manual parsing 2019-10-15 00:35:44 +03:00
Andrei Zavatski
09621f066e Childs -> Children 2019-10-15 00:32:21 +03:00
Andrei Zavatski
0676c880b5 Simplify IsTopLevel and IsDeleted properties 2019-10-15 00:26:31 +03:00
Andrei Zavatski
b1f7a673e7 Simplify chevron icon coloring 2019-10-15 00:10:02 +03:00
miterosan
6da1b4d012 Fix incorrect current directory that accours on some devices on android. 2019-10-14 21:46:01 +02:00
miterosan
1c547afd15 Merge remote-tracking branch 'origin/master' into lasy_ruleset_loading 2019-10-14 21:27:13 +02:00
Andrei Zavatski
d4843285db CI fixes 2019-10-14 17:33:14 +03:00
Andrei Zavatski
139170cdc8 Fix incorrect padding for nested comments 2019-10-14 17:26:12 +03:00
Andrei Zavatski
b53fb0d228 Remove empty line 2019-10-14 17:07:50 +03:00
Andrei Zavatski
a4ffd4798d Fix escaped html strings not being unescaped 2019-10-14 17:02:48 +03:00
Andrei Zavatski
a81d5cd819 Handle links in message 2019-10-14 16:56:07 +03:00
Andrei Zavatski
7cd3f5656d Cleanups 2019-10-14 16:43:43 +03:00
Andrei Zavatski
7ac87494e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-14 16:21:34 +03:00
Dean Herbert
66d3a71ebb
Implement CommentsHeader component (#6457)
Implement CommentsHeader component

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-14 22:16:54 +09:00
Dean Herbert
f0e9700349 Inline delegate event 2019-10-14 21:49:02 +09:00
Dean Herbert
b7ddf160b4 OnClick should actually handle the event 2019-10-14 21:48:12 +09:00
Dean Herbert
4e6ab1dad3 Tidy up state management via bindable usage 2019-10-14 21:42:07 +09:00
Dean Herbert
7794457550 Remove more constants 2019-10-14 21:36:10 +09:00
Dean Herbert
4822496c13 Fix more naming 2019-10-14 21:34:16 +09:00
Dean Herbert
89f270a19a SortSelector -> SortTabControl 2019-10-14 21:32:41 +09:00
Dean Herbert
e191c2c50e Tidy up constants and method naming 2019-10-14 21:32:16 +09:00
Dean Herbert
ae1a361f9f
Merge branch 'master' into commenst_header 2019-10-14 21:20:05 +09:00
Dean Herbert
9372526d3a Don't automatically return to gameplay from map pool if no picks are made
Closes #6491.
2019-10-14 20:08:05 +09:00
Dean Herbert
ae2fe62fd9 Use BindValueChanged 2019-10-14 17:13:36 +09:00
Dean Herbert
64a6ca28e6
Merge branch 'master' into cursor-size-trail 2019-10-14 16:35:37 +09:00
Andrei Zavatski
328b4d6863 Cancel request on dispose 2019-10-13 16:22:10 +03:00
Andrei Zavatski
2f209d1dfa Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 14:53:41 +03:00
Andrei Zavatski
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid 2019-10-13 18:38:57 +09:00
Andrei Zavatski
60954f969d DeletedChildsPlaceholder refactor 2019-10-13 12:38:50 +03:00
Dean Herbert
5be8a1b5ac
Merge pull request #6473 from smoogipoo/editor-grids-2
Implement abstract class and structure for editor grids
2019-10-13 18:38:11 +09:00
Andrei Zavatski
795ce81468 Use async loading for comment pages 2019-10-13 12:10:01 +03:00
Andrei Zavatski
4d971e49ff Colours update 2019-10-13 11:50:27 +03:00
Andrei Zavatski
27e3ffd293 Update dependencies 2019-10-13 11:23:49 +03:00
Andrei Zavatski
7f867562ca Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 11:15:43 +03:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2 2019-10-12 23:28:51 +09:00
Andrei Zavatski
f6b138fe6e Remove useless ItemGroup 2019-10-12 15:03:24 +03:00
Andrei Zavatski
7ffe5ac539 Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header 2019-10-12 15:02:12 +03:00