1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 13:47:24 +08:00
Commit Graph

23199 Commits

Author SHA1 Message Date
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
HoLLy-HaCKeR
7931510d7b Ensure OsuResumeCursor can change scale when it is being shown 2019-10-12 11:59:22 +02:00
HoLLy-HaCKeR
fdc17d2adb Scale OsuResumeCursor with gameplay cursor 2019-10-12 11:51:14 +02:00
HoLLy-HaCKeR
13924174c4 Fix PopIn and PopOut resetting cursor scale 2019-10-12 10:04:14 +02:00
Dan Balasescu
bb7de50697
Merge pull request #6451 from peppy/fix-resume-from-player-audio
Fix audio playback position being reset after resuming to song select
2019-10-11 19:44:00 +09:00
Dean Herbert
5778de4636
Merge pull request #6475 from smoogipoo/fix-build-script-params
Fix build scripts not passing arguments to cake
2019-10-11 19:36:01 +09:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions (#6431)
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
smoogipoo
715fb88316 Fix build scripts not passing arguments to cake 2019-10-11 19:33:21 +09:00
Dean Herbert
6f7eb79752
Update ranking display to handle new osu-web request format (#6466)
Update ranking display to handle new osu-web request format

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-11 19:31:51 +09:00
Dan Balasescu
26a33bfa4e
Merge branch 'master' into fix-resume-from-player-audio 2019-10-11 19:21:14 +09:00
Dan Balasescu
171105e3ea
Merge branch 'master' into fix-ranking-display 2019-10-11 19:15:10 +09:00
smoogipoo
45835f97a1 Split out grids into separate files 2019-10-11 18:41:17 +09:00
smoogipoo
4d32a8aa6b More tests 2019-10-11 18:41:17 +09:00
smoogipoo
6301f837e0 Initial implementation of osu! beat snapping grid 2019-10-11 18:41:17 +09:00
smoogipoo
631f155554 Add grid to make the test not appear empty 2019-10-11 18:24:33 +09:00
smoogipoo
050d86a741 Always use the local coordinate space 2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2 Rename grid creation method + parameter 2019-10-11 18:24:33 +09:00