h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 15:33:05 +08:00
Code Issues Releases Wiki Activity
22,996 Commits 3 Branches 661 Tags 368 MiB
022cc13952
Commit Graph

22996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrei Zavatski
b45e7246b8 Rename SortCommentsBy to CommentsSortCriteria 2019-10-10 15:56:08 +03:00
Dean Herbert
5eba33e876 Simplify logic and add test coverage for remaining case 2019-10-10 20:12:47 +09:00
Andrei Zavatski
fe7b4037f7 CI fix 2019-10-10 13:24:22 +03:00
Dean Herbert
a819a64036 Update resources 2019-10-10 19:16:14 +09:00
Andrei Zavatski
64f62bd2bf Implement CommentsHeader component 2019-10-10 12:06:25 +03: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
Dean Herbert
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
Dean Herbert
8df2e359c4 Fix tests on CI 2019-10-10 17:42:15 +09:00
dependabot-preview[bot]
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
Andrei Zavatski
371b7841d0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-10 11:27:44 +03:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Dean Herbert
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
Dean Herbert
e66f9adb86 Fix user pause not being cancelled when playing audio 2019-10-10 16:53:03 +09:00
smoogipoo
2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +09:00
Dan Balasescu
5497d210b6
Merge branch 'master' into fix-editor-slider-display 2019-10-10 16:22:30 +09:00
Dan Balasescu
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
Dean Herbert
f74c79c2b8 Fix audio playback position being reset after resuming to song select 2019-10-10 11:58:43 +09:00
Andrei Zavatski
107d39c3e9 Add DeletedChildsPlaceholder to the bottom of the comments container 2019-10-09 14:10:05 +03:00
Dean Herbert
4e273fc628
Return correct allowed value for Perfect 
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
 2019-10-09 19:50:05 +09:00
Andrei Zavatski
c9d5bea0f1 Remove animations 2019-10-09 13:45:14 +03:00
Dean Herbert
e6f857d0d8 Revert "Warn on incorrect null usage" 
This reverts commit 93d2c3d7a1.
 2019-10-09 19:38:07 +09:00
Andrei Zavatski
7e3c97f496 Implement DeletedChildsPlaceholder component 2019-10-09 13:37:07 +03:00
Dean Herbert
9f2a648432 Add full asserts 2019-10-09 19:23:37 +09:00
Dean Herbert
ad6b8d3e04 Add result offset bounding to result itself, rather than just transforms 2019-10-09 19:08:55 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Dean Herbert
93d2c3d7a1 Warn on incorrect null usage 2019-10-09 19:03:20 +09:00
Andrei Zavatski
b2bd78308d Handle deleted comments 2019-10-09 12:18:49 +03:00
Andrei Zavatski
ad99a3236f Handle edited comments 2019-10-09 11:32:17 +03:00
Andrei Zavatski
a0dfbfe148 Handle parent usernames for legacy comments 2019-10-09 11:18:26 +03:00
Andrei Zavatski
0a56b041fd Implement ShowChildsButton 2019-10-09 11:07:56 +03:00
Dean Herbert
0681bb9a2b Fix potential nullref 2019-10-09 16:49:10 +09:00
Andrei Zavatski
4462d454e8 Message padding improvements 2019-10-09 10:34:17 +03:00
Andrei Zavatski
faef4d932d Improve message parsing 2019-10-09 10:17:14 +03:00
Dean Herbert
2d8e5615e4 Extract timeline and layout logic from ComposeScreen 2019-10-09 16:05:55 +09:00
Dean Herbert
f2adae8fd1 Rename test case to better match underlying class 2019-10-09 16:05:38 +09:00