Commit Graph

23143 Commits

Author SHA1 Message Date
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
f6b78ad661 Overall cleanups 2019-10-10 11:43:45 +03: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
8df2e359c4 Fix tests on CI 2019-10-10 17:42:15 +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
371b7841d0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-10 11:27:44 +03: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
e66f9adb86 Fix user pause not being cancelled when playing audio 2019-10-10 16:53:03 +09:00
2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +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
f74c79c2b8 Fix audio playback position being reset after resuming to song select 2019-10-10 11:58:43 +09:00
107d39c3e9 Add DeletedChildsPlaceholder to the bottom of the comments container 2019-10-09 14:10:05 +03:00
4e273fc628 Return correct allowed value for Perfect
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-10-09 19:50:05 +09:00
c9d5bea0f1 Remove animations 2019-10-09 13:45:14 +03:00
e6f857d0d8 Revert "Warn on incorrect null usage"
This reverts commit 93d2c3d7a1.
2019-10-09 19:38:07 +09:00
7e3c97f496 Implement DeletedChildsPlaceholder component 2019-10-09 13:37:07 +03: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
b2bd78308d Handle deleted comments 2019-10-09 12:18:49 +03:00
ad99a3236f Handle edited comments 2019-10-09 11:32:17 +03:00
a0dfbfe148 Handle parent usernames for legacy comments 2019-10-09 11:18:26 +03:00
0a56b041fd Implement ShowChildsButton 2019-10-09 11:07:56 +03:00
0681bb9a2b Fix potential nullref 2019-10-09 16:49:10 +09:00
4462d454e8 Message padding improvements 2019-10-09 10:34:17 +03:00
faef4d932d Improve message parsing 2019-10-09 10:17:14 +03: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
6deafc04bf Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-09 10:00:20 +03: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
ed41429fc1 Merge branch 'master' into editor-wip-screens 2019-10-09 12:04:12 +09:00
fca2a5bc6e Merge pull request #6429 from peppy/add-slider-tail-todo
Add todo in slider tail to avoid confusion
2019-10-09 12:04:05 +09:00
34d50e3b73 Merge branch 'master' into add-slider-tail-todo 2019-10-09 11:53:27 +09:00
09f950ea59 Merge pull request #6428 from peppy/fix-ignored-test
Fix ignored song select test
2019-10-09 11:53:07 +09:00
e8276dc562 Merge branch 'master' into fix-ignored-test 2019-10-09 11:39:40 +09:00
29b0eacc82 Implement SortSelector component 2019-10-08 22:46:42 +03:00