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
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
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
Andrei Zavatski
60954f969d
DeletedChildsPlaceholder refactor
2019-10-13 12:38:50 +03: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
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
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
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
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
smoogipoo
5f0cd356d7
Rename startPosition to centrePosition
2019-10-11 18:24:33 +09:00
smoogipoo
8fb2628f9e
Improve xmldocs
2019-10-11 18:24:33 +09:00
smoogipoo
66e0fef85b
Expose StartPosition for derived grids to use
2019-10-11 18:24:33 +09:00
smoogipoo
97d4a8e59e
Remove unnecessary dependency
2019-10-11 18:24:33 +09:00
smoogipoo
2df519ddfa
Simplify colour retrieval function
2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39
Implement base class for beat snapping grids
2019-10-11 18:24:33 +09:00
Dan Balasescu
0634f17503
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 17:39:41 +09:00
Dan Balasescu
d4282473c6
Merge branch 'master' into fix-background-disposal
2019-10-11 17:15:30 +09:00
Bartłomiej Dach
4b84564f47
Switch casing comparison mode to ordinal
...
Switch from InvariantCultureIgnoreCase to OrdinalIgnoreCase when
checking file paths in archives for substrings indicating the file can
be ignored for performance gains.
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2019-10-11 09:24:41 +02:00
Dean Herbert
c7eb0b401b
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 14:36:52 +09:00
dependabot-preview[bot]
9fb5c85a18
Bump ppy.osu.Game.Resources from 2019.913.0 to 2019.1010.0
...
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources ) from 2019.913.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-resources/releases )
- [Commits](https://github.com/ppy/osu-resources/compare/2019.913.0...2019.1010.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 05:15:14 +00:00
Dean Herbert
6776f31933
Merge branch 'master' into fix-ranking-display
2019-10-11 14:13:12 +09:00
Dean Herbert
44853c262c
Update framework
2019-10-11 13:55:58 +09:00
Dean Herbert
475815df04
Update ranking display to handle new osu-web request format
2019-10-11 13:09:21 +09:00
Bartłomiej Dach
57bfa18359
Filter out OS-generated files from archives
...
Add a filename ignore list to ZipArchiveReader to filter out superfluous
OS-generated files from archives during the import process. In addition
to decreasing the size of files imported this allows imports of some
incorrectly-constructed archives. An example is the case of having
a __MACOSX directory next to a single directory with the actual files -
filtering out the former at ZipArchiveReader allows the fallback added
in #6170 to work.
2019-10-10 23:54:23 +02:00
Dan Balasescu
d2f1f54078
Merge branch 'master' into netcore-30
2019-10-10 23:38:24 +09:00
Dean Herbert
8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio
2019-10-10 22:08:20 +09:00
Dan Balasescu
356c0fdca0
Merge branch 'master' into cleanup-intros
2019-10-10 21:58:54 +09:00