Andrei Zavatski
7f867562ca
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-13 11:15:43 +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
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
Dean Herbert
5eba33e876
Simplify logic and add test coverage for remaining case
2019-10-10 20:12:47 +09:00
Dean Herbert
a819a64036
Update resources
2019-10-10 19:16:14 +09:00
Andrei Zavatski
f6b78ad661
Overall cleanups
2019-10-10 11:43:45 +03:00
Andrei Zavatski
371b7841d0
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-10 11:27:44 +03:00
dependabot-preview[bot]
bc4c1a2371
Bump ppy.osu.Framework from 2019.930.0 to 2019.1010.0
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-10 08:16:28 +00:00
Dean Herbert
e66f9adb86
Fix user pause not being cancelled when playing audio
2019-10-10 16:53:03 +09:00
smoogipoo
2e2768870f
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
2019-10-10 16:38:41 +09:00
Dan Balasescu
5497d210b6
Merge branch 'master' into fix-editor-slider-display
2019-10-10 16:22:30 +09:00
Dean Herbert
f74c79c2b8
Fix audio playback position being reset after resuming to song select
2019-10-10 11:58:43 +09:00
Andrei Zavatski
107d39c3e9
Add DeletedChildsPlaceholder to the bottom of the comments container
2019-10-09 14:10:05 +03:00
Dean Herbert
4e273fc628
Return correct allowed value for Perfect
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-10-09 19:50:05 +09:00
Andrei Zavatski
c9d5bea0f1
Remove animations
2019-10-09 13:45:14 +03:00
Andrei Zavatski
7e3c97f496
Implement DeletedChildsPlaceholder component
2019-10-09 13:37:07 +03:00
Dean Herbert
9f2a648432
Add full asserts
2019-10-09 19:23:37 +09:00
Dean Herbert
ad6b8d3e04
Add result offset bounding to result itself, rather than just transforms
2019-10-09 19:08:55 +09:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
Andrei Zavatski
b2bd78308d
Handle deleted comments
2019-10-09 12:18:49 +03:00
Andrei Zavatski
ad99a3236f
Handle edited comments
2019-10-09 11:32:17 +03:00
Andrei Zavatski
a0dfbfe148
Handle parent usernames for legacy comments
2019-10-09 11:18:26 +03:00
Andrei Zavatski
0a56b041fd
Implement ShowChildsButton
2019-10-09 11:07:56 +03:00
Dean Herbert
0681bb9a2b
Fix potential nullref
2019-10-09 16:49:10 +09:00
Andrei Zavatski
4462d454e8
Message padding improvements
2019-10-09 10:34:17 +03:00
Andrei Zavatski
faef4d932d
Improve message parsing
2019-10-09 10:17:14 +03:00
Dean Herbert
2d8e5615e4
Extract timeline and layout logic from ComposeScreen
2019-10-09 16:05:55 +09:00
Dean Herbert
3dd2b18ff0
Make EditorScreen abstract
2019-10-09 16:04:58 +09:00
Andrei Zavatski
6deafc04bf
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-09 10:00:20 +03:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback
2019-10-09 12:26:07 +09:00
Dan Balasescu
ed41429fc1
Merge branch 'master' into editor-wip-screens
2019-10-09 12:04:12 +09:00
Andrei Zavatski
29b0eacc82
Implement SortSelector component
2019-10-08 22:46:42 +03:00
Andrei Zavatski
574170124c
Implement HeaderButton component
2019-10-08 21:38:19 +03:00
Andrei Zavatski
b9ad079bf8
Move CommentsHeader to it's own file
2019-10-08 20:57:55 +03:00
Andrei Zavatski
9ab309fc0e
Use bold font for replies button
2019-10-08 20:44:01 +03:00
Andrei Zavatski
35cfb16c8d
Implement VotePill component
2019-10-08 19:56:43 +03:00
