64a6ca28e6
Merge branch 'master' into cursor-size-trail
2019-10-14 16:35:37 +09:00
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
00f0957cc3
Merge branch 'master' into editor-grids-2
2019-10-12 23:28:51 +09:00
7931510d7b
Ensure OsuResumeCursor can change scale when it is being shown
2019-10-12 11:59:22 +02:00
fdc17d2adb
Scale OsuResumeCursor with gameplay cursor
2019-10-12 11:51:14 +02:00
13924174c4
Fix PopIn and PopOut resetting cursor scale
2019-10-12 10:04:14 +02: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
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
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
715fb88316
Fix build scripts not passing arguments to cake
2019-10-11 19:33:21 +09:00
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
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
631f155554
Add grid to make the test not appear empty
2019-10-11 18:24:33 +09:00
050d86a741
Always use the local coordinate space
2019-10-11 18:24:33 +09:00
9ecec806c2
Rename grid creation method + parameter
2019-10-11 18:24:33 +09:00
5f0cd356d7
Rename startPosition to centrePosition
2019-10-11 18:24:33 +09:00
8fb2628f9e
Improve xmldocs
2019-10-11 18:24:33 +09:00
66e0fef85b
Expose StartPosition for derived grids to use
2019-10-11 18:24:33 +09:00
97d4a8e59e
Remove unnecessary dependency
2019-10-11 18:24:33 +09:00
2df519ddfa
Simplify colour retrieval function
2019-10-11 18:24:33 +09:00
824595427d
Remove extra whitespace
2019-10-11 18:24:33 +09:00
2aa3d0bb39
Implement base class for beat snapping grids
2019-10-11 18:24:33 +09:00
3c5dc6da4a
Merge pull request #6465 from bdach/ignore-macosx-folder-in-archives
...
Filter out OS-generated files from ZIP archives
2019-10-11 18:10:54 +09:00
0634f17503
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 17:39:41 +09:00
ea2ec5a1fd
Merge pull request #6471 from peppy/fix-background-disposal
...
Remove unnecessary local assignment
2019-10-11 17:39:31 +09:00
d4282473c6
Merge branch 'master' into fix-background-disposal
2019-10-11 17:15:30 +09:00
27a0f4c94d
Update fastlane ( #6470 )
...
Update fastlane
2019-10-11 16:32:09 +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
1faef2f97d
Update fastlane
2019-10-11 16:17:15 +09:00
5e797a591b
Revert nativelibs update ( #6469 )
...
Revert nativelibs update
2019-10-11 14:57:21 +09:00
4f0354bdb6
Revert nativelibs update
2019-10-11 14:56:54 +09:00
47ad15d0c4
Merge pull request #6463 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2019.1010.0
...
Bump ppy.osu.Game.Resources from 2019.913.0 to 2019.1010.0
2019-10-11 14:38:59 +09:00
c7eb0b401b
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 14:36:52 +09:00
0c3a381552
Merge pull request #6468 from ppy/dependabot/nuget/ppy.osu.Framework.NativeLibs-2019.1011.0
...
Bump ppy.osu.Framework.NativeLibs from 2019.1010.0 to 2019.1011.0
2019-10-11 14:36:29 +09:00
467af9336f
Merge branch 'master' into dependabot/nuget/ppy.osu.Framework.NativeLibs-2019.1011.0
2019-10-11 14:35:55 +09:00
d44acf20b4
Bump ppy.osu.Framework.NativeLibs from 2019.1010.0 to 2019.1011.0
...
Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework ) from 2019.1010.0 to 2019.1011.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1010.0...2019.1011.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-11 05:33:15 +00:00
ad9df107c1
Fix platform dependency in buffered reader test ( #6461 )
...
Fix platform dependency in buffered reader test
Co-authored-by: Dean Herbert <pe@ppy.sh >
2019-10-11 14:32:37 +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
1959205e5b
Merge branch 'master' into fix-line-buffered-reader-tests
2019-10-11 14:11:27 +09:00
45318bdcdd
Update framework ( #6467 )
...
Update framework
2019-10-11 14:10:58 +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
f6e1e5b2ed
Merge branch 'master' into fix-line-buffered-reader-tests
2019-10-11 12:42: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
11acd177f1
Add import test with files to be filtered out
...
Add a test case reproducing the conditions encountered "in the wild"
wherein a skin import would be performed incorrectly due to a __MACOSX
resource fork directory present next to a directory with the actual skin
files in the archive.
2019-10-10 23:54:17 +02:00
c8ffc134d4
Use nameof when instantiating headless game hosts
...
As a purely cosmetic code improvement, substitute string literals
in constructor calls of HeadlessGameHost in ImportBeatmapTest for nameof
operator usages.
2019-10-10 22:36:43 +02:00
a4501e8ad5
Update to .NET core 3.0 ( #6458 )
...
Update to .NET core 3.0
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me >
2019-10-10 23:54:48 +09:00
d2f1f54078
Merge branch 'master' into netcore-30
2019-10-10 23:38:24 +09:00
