Andrei Zavatski
2f209d1dfa
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-13 14:53:41 +03:00
Andrei Zavatski
a44cc2e70b
Implement CommentsShowMoreButton
2019-10-13 14:43:30 +03:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid
2019-10-13 18:38:57 +09:00
Andrei Zavatski
60954f969d
DeletedChildsPlaceholder refactor
2019-10-13 12:38:50 +03:00
Dean Herbert
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
Andrei Zavatski
795ce81468
Use async loading for comment pages
2019-10-13 12:10:01 +03:00
Andrei Zavatski
4d971e49ff
Colours update
2019-10-13 11:50:27 +03:00
Andrei Zavatski
27e3ffd293
Update dependencies
2019-10-13 11:23:49 +03:00
Andrei Zavatski
7f867562ca
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-13 11:15:43 +03:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2
2019-10-12 23:28:51 +09:00
Andrei Zavatski
f6b138fe6e
Remove useless ItemGroup
2019-10-12 15:03:24 +03:00
Andrei Zavatski
7ffe5ac539
Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header
2019-10-12 15:02:12 +03:00
HoLLy-HaCKeR
7931510d7b
Ensure OsuResumeCursor can change scale when it is being shown
2019-10-12 11:59:22 +02:00
HoLLy-HaCKeR
fdc17d2adb
Scale OsuResumeCursor with gameplay cursor
2019-10-12 11:51:14 +02:00
HoLLy-HaCKeR
13924174c4
Fix PopIn and PopOut resetting cursor scale
2019-10-12 10:04:14 +02: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
smoogipoo
45835f97a1
Split out grids into separate files
2019-10-11 18:41:17 +09:00
smoogipoo
4d32a8aa6b
More tests
2019-10-11 18:41:17 +09:00
smoogipoo
6301f837e0
Initial implementation of osu! beat snapping grid
2019-10-11 18:41:17 +09:00
smoogipoo
631f155554
Add grid to make the test not appear empty
2019-10-11 18:24:33 +09:00
smoogipoo
050d86a741
Always use the local coordinate space
2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2
Rename grid creation method + parameter
2019-10-11 18:24:33 +09:00
smoogipoo
5f0cd356d7
Rename startPosition to centrePosition
2019-10-11 18:24:33 +09:00
smoogipoo
8fb2628f9e
Improve xmldocs
2019-10-11 18:24:33 +09:00
smoogipoo
66e0fef85b
Expose StartPosition for derived grids to use
2019-10-11 18:24:33 +09:00
smoogipoo
97d4a8e59e
Remove unnecessary dependency
2019-10-11 18:24:33 +09:00
smoogipoo
2df519ddfa
Simplify colour retrieval function
2019-10-11 18:24:33 +09:00
smoogipoo
824595427d
Remove extra whitespace
2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39
Implement base class for beat snapping grids
2019-10-11 18:24:33 +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
