22724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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
smoogipoo	715fb88316	Fix build scripts not passing arguments to cake	2019-10-11 19:33:21 +09:00
Dean Herbert	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
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
Dean Herbert	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
Dan Balasescu	0634f17503	Merge branch 'master' into ignore-macosx-folder-in-archives	2019-10-11 17:39:41 +09:00
Dan Balasescu	ea2ec5a1fd	Merge pull request #6471 from peppy/fix-background-disposal ... Remove unnecessary local assignment	2019-10-11 17:39:31 +09:00
Dan Balasescu	d4282473c6	Merge branch 'master' into fix-background-disposal	2019-10-11 17:15:30 +09:00
Dean Herbert	27a0f4c94d	Update fastlane (#6470) ... Update fastlane	2019-10-11 16:32:09 +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	1faef2f97d	Update fastlane	2019-10-11 16:17:15 +09:00
Dean Herbert	5e797a591b	Revert nativelibs update (#6469) ... Revert nativelibs update	2019-10-11 14:57:21 +09:00
Dean Herbert	4f0354bdb6	Revert nativelibs update	2019-10-11 14:56:54 +09:00
Dean Herbert	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
Dean Herbert	c7eb0b401b	Merge branch 'master' into ignore-macosx-folder-in-archives	2019-10-11 14:36:52 +09:00
Dean Herbert	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
Dean Herbert	467af9336f	Merge branch 'master' into dependabot/nuget/ppy.osu.Framework.NativeLibs-2019.1011.0	2019-10-11 14:35:55 +09:00
dependabot-preview[bot]	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
Dean Herbert	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
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	1959205e5b	Merge branch 'master' into fix-line-buffered-reader-tests	2019-10-11 14:11:27 +09:00
Dean Herbert	45318bdcdd	Update framework (#6467) ... Update framework	2019-10-11 14:10:58 +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
Dean Herbert	f6e1e5b2ed	Merge branch 'master' into fix-line-buffered-reader-tests	2019-10-11 12:42:58 +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
Bartłomiej Dach	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
Bartłomiej Dach	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
Dean Herbert	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
Dan Balasescu	d2f1f54078	Merge branch 'master' into netcore-30	2019-10-10 23:38:24 +09:00
Bartłomiej Dach	cb1f7e2dc7	Fix platform dependency in buffered reader test ... Tests for the line-buffered reader added in 7b1ff38 were subtly dependent on the execution environment due to differing end-of-line markers on Windows and Unix-based systems. Because StreamReader discards all newlines when reading line-by-line, LineBufferedReader used a StringBuilder to patch the peeked lines back together with the remaining contents of the file being read. As StringBuilder.AppendLine uses the environment-specific newline delimiter, the delimiters after the peeked-but-unconsumed lines can therefore be substituted by the platform-specific variants, causing the test failures due to the overly-simplified way they were written. Reformulate the test to avoid such issues from resurfacing again by splitting lines by \r or \n and then testing each line individually. Additionally remove all raw literals in favour of explicitly mixing various line delimiter character sequences for additional coverage.	2019-10-10 15:33:18 +02:00
Dan Balasescu	11c0071429	Merge pull request #6219 from LeNitrous/cleanup-intros ... Move common logic to IntroScreen	2019-10-10 22:15:49 +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
Dean Herbert	4a4830c717	Update cake dependencies	2019-10-10 17:51:56 +09:00
Dean Herbert	d75275c0ee	Remove cake csproj	2019-10-10 17:51:00 +09:00
Dean Herbert	3fd4b0da50	Update appveyor images	2019-10-10 17:50:00 +09:00
Dean Herbert	a6588adbec	Update cake bootstrap scripts	2019-10-10 17:48:56 +09:00
Dean Herbert	5d6648d9c9	Update 2.2 references	2019-10-10 17:45:38 +09:00
Andrei Zavatski	f6b78ad661	Overall cleanups	2019-10-10 11:43:45 +03:00
Dean Herbert	3de670c56a	Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.1010.0' into netcore-30	2019-10-10 17:43:18 +09:00
Dean Herbert	b9a14b06a7	Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework-2019.1010.0' into netcore-30	2019-10-10 17:42:56 +09:00
Dean Herbert	8c2f37ede5	Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.1010.0' into netcore-30	2019-10-10 17:42:53 +09:00