f6b138fe6e
Remove useless ItemGroup
2019-10-12 15:03:24 +03:00
7ffe5ac539
Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header
2019-10-12 15:02:12 +03:00
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
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
26a33bfa4e
Merge branch 'master' into fix-resume-from-player-audio
2019-10-11 19:21:14 +09:00
171105e3ea
Merge branch 'master' into fix-ranking-display
2019-10-11 19:15:10 +09:00
0634f17503
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 17:39:41 +09:00
d4282473c6
Merge branch 'master' into fix-background-disposal
2019-10-11 17:15:30 +09:00
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
c7eb0b401b
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 14:36:52 +09:00
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
6776f31933
Merge branch 'master' into fix-ranking-display
2019-10-11 14:13:12 +09:00
44853c262c
Update framework
2019-10-11 13:55:58 +09:00
475815df04
Update ranking display to handle new osu-web request format
2019-10-11 13:09:21 +09:00
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
d2f1f54078
Merge branch 'master' into netcore-30
2019-10-10 23:38:24 +09:00
8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio
2019-10-10 22:08:20 +09:00
356c0fdca0
Merge branch 'master' into cleanup-intros
2019-10-10 21:58:54 +09:00
b45e7246b8
Rename SortCommentsBy to CommentsSortCriteria
2019-10-10 15:56:08 +03:00
5eba33e876
Simplify logic and add test coverage for remaining case
2019-10-10 20:12:47 +09:00
fe7b4037f7
CI fix
2019-10-10 13:24:22 +03:00
a819a64036
Update resources
2019-10-10 19:16:14 +09:00
64f62bd2bf
Implement CommentsHeader component
2019-10-10 12:06:25 +03:00
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
e66f9adb86
Fix user pause not being cancelled when playing audio
2019-10-10 16:53:03 +09:00
2e2768870f
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
2019-10-10 16:38:41 +09:00
5497d210b6
Merge branch 'master' into fix-editor-slider-display
2019-10-10 16:22:30 +09:00
f74c79c2b8
Fix audio playback position being reset after resuming to song select
2019-10-10 11:58:43 +09:00
4e273fc628
Return correct allowed value for Perfect
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com >
2019-10-09 19:50:05 +09:00
9f2a648432
Add full asserts
2019-10-09 19:23:37 +09:00
ad6b8d3e04
Add result offset bounding to result itself, rather than just transforms
2019-10-09 19:08:55 +09:00
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
0681bb9a2b
Fix potential nullref
2019-10-09 16:49:10 +09:00
2d8e5615e4
Extract timeline and layout logic from ComposeScreen
2019-10-09 16:05:55 +09:00
3dd2b18ff0
Make EditorScreen abstract
2019-10-09 16:04:58 +09:00
69b9e359bf
Merge branch 'master' into fix-ss-track-playback
2019-10-09 12:26:07 +09:00
ed41429fc1
Merge branch 'master' into editor-wip-screens
2019-10-09 12:04:12 +09:00
179656788d
Remove unnecessary method
2019-10-08 19:27:59 +09:00
c1db11fa06
More removal of "drag"
2019-10-08 19:24:58 +09:00
8b661e624d
Remove drag from class/method namings + refactor
2019-10-08 19:08:31 +09:00
08d043f447
Move selection relative to the hitobject start positions
2019-10-08 18:57:03 +09:00
47768b7063
Rework osu! selection blueprint updates ( #6291 )
...
Rework osu! selection blueprint updates
Co-authored-by: Dean Herbert <pe@ppy.sh >
2019-10-08 17:43:13 +09:00
4e026b163c
Don't resume playback when user has paused and track hasn't changed
2019-10-08 15:04:38 +09:00
3e904b4838
Fix naming of file
2019-10-08 14:37:56 +09:00
63bf8ff832
Better signify under construction screens in editor
2019-10-08 14:32:48 +09:00
7e4f0c01b8
Avoid excess background updates in playlist overlay ( #6424 )
...
Avoid excess background updates in playlist overlay
2019-10-08 14:11:02 +09:00
73e3dac64b
Merge branch 'master' into fix-editor-skinning
2019-10-08 13:28:10 +09:00
24269c0384
Fix skins not being displayed correctly in the editor
2019-10-08 12:52:34 +09:00
5472029ffe
Fix editor defaulting to 0.5x playback speed
2019-10-08 12:27:51 +09:00
52770f803d
Fix incorrect beatmap usage
2019-10-08 12:15:32 +09:00
