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
44853c262c
Update framework
2019-10-11 13:55:58 +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
356c0fdca0
Merge branch 'master' into cleanup-intros
2019-10-10 21:58:54 +09: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
5497d210b6
Merge branch 'master' into fix-editor-slider-display
2019-10-10 16:22:30 +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
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
cbb120cd38
Switch beatmap to private
2019-10-08 12:09:42 +09:00
c280bee894
Protect configuration bindables
2019-10-08 12:08:47 +09:00
b8b2ff2674
Move welcome to local usages
2019-10-08 12:07:59 +09:00
4ba2dccde3
Reorder file contents
2019-10-08 12:05:52 +09:00
a0bb193342
Remove unnecessary beatmap storage
2019-10-08 12:04:13 +09:00
449e53ee6d
Centralise track handling
2019-10-08 12:03:42 +09:00
c3d56088d8
Make constant private
2019-10-08 11:54:39 +09:00
3c0b1be7f4
Add xmldoc where applicable
2019-10-08 11:52:16 +09:00
393683f8f1
Merge branch 'master' into cleanup-intros
2019-10-08 11:29:13 +09:00
438408161c
Fix tab controls overflowing right content at max ui scale ( #6411 )
...
Fix tab controls overflowing right content at max ui scale
2019-10-08 11:16:41 +09:00
0d0321674e
Merge pull request #6407 from UselessToucan/playlist_follow_playback
...
Autoscroll playlist on song change
2019-10-08 11:07:45 +09:00
e7fc5e556c
Fix song select not correctly playing tracks in some cases
2019-10-08 11:06:07 +09:00
3ec78388e8
Avoid excess background updates in playlist overlay
2019-10-08 11:03:23 +09:00
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing
2019-10-08 10:12:03 +09:00
9fdbe58326
Fix dropdown header padding when selected mod filter is hidden
2019-10-07 16:17:58 -07:00
8e6e90eaec
Use fixed numbers for padding instead
2019-10-07 16:11:40 -07:00
e00992dfd8
Remove FollowPlayback setting
2019-10-07 19:44:22 +03:00
f15953d65c
Fix carousel including filtered difficulties in sort comparisons
2019-10-07 15:17:03 +09:00
11d937beab
Fix beatmap detail area tab dropdown being blocked by content
2019-10-06 10:24:33 -07:00
38c1cee5fd
Fix tab controls overflowing
2019-10-06 10:22:55 -07:00
eda4a27b45
Move FollowPlayback setting to User Interface subsection
2019-10-06 15:06:25 +03:00
