Commit Graph

22662 Commits

Author SHA1 Message Date
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
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
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
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
f6e1e5b2ed Merge branch 'master' into fix-line-buffered-reader-tests 2019-10-11 12:42:58 +09: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
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
11c0071429 Merge pull request #6219 from LeNitrous/cleanup-intros
Move common logic to IntroScreen
2019-10-10 22:15:49 +09:00
356c0fdca0 Merge branch 'master' into cleanup-intros 2019-10-10 21:58:54 +09:00
4a4830c717 Update cake dependencies 2019-10-10 17:51:56 +09:00
d75275c0ee Remove cake csproj 2019-10-10 17:51:00 +09:00
3fd4b0da50 Update appveyor images 2019-10-10 17:50:00 +09:00
a6588adbec Update cake bootstrap scripts 2019-10-10 17:48:56 +09:00
5d6648d9c9 Update 2.2 references 2019-10-10 17:45:38 +09:00
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
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
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
7dbf243605 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.NativeLibs-2019.1010.0' into netcore-30 2019-10-10 17:42:50 +09:00
e50d8419fd Bump ppy.osu.Framework.iOS from 2019.930.0 to 2019.1010.0
Bumps [ppy.osu.Framework.iOS](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:30:37 +00: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
efa5cedf4f Bump ppy.osu.Framework.Android from 2019.930.0 to 2019.1010.0
Bumps [ppy.osu.Framework.Android](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:07 +00:00
65df7902f3 Bump ppy.osu.Framework.NativeLibs from 2019.813.0 to 2019.1010.0
Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-10 08:15:47 +00:00
c6a6ea3890 Use empty HitWindows to fix editor slider display (#6445)
Use empty HitWindows to fix editor slider display

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-10 17:10:34 +09:00
5497d210b6 Merge branch 'master' into fix-editor-slider-display 2019-10-10 16:22:30 +09:00
c708ea327d Merge pull request #6444 from peppy/screen-with-timeline
Add abstract implementation for editor screens which display a timeline
2019-10-10 16:14:48 +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
e6f857d0d8 Revert "Warn on incorrect null usage"
This reverts commit 93d2c3d7a1.
2019-10-09 19:38:07 +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
93d2c3d7a1 Warn on incorrect null usage 2019-10-09 19:03:20 +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
f2adae8fd1 Rename test case to better match underlying class 2019-10-09 16:05:38 +09:00
3dd2b18ff0 Make EditorScreen abstract 2019-10-09 16:04:58 +09:00
10c7fc139e Merge pull request #6423 from peppy/fix-ss-track-playback
Fix song select not correctly playing tracks in some cases
2019-10-09 12:38:25 +09:00
69b9e359bf Merge branch 'master' into fix-ss-track-playback 2019-10-09 12:26:07 +09:00
52b065b560 Merge pull request #6427 from peppy/editor-wip-screens
Better signify under construction screens in editor
2019-10-09 12:18:53 +09:00