1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 19:06:27 +08:00
Commit Graph

25472 Commits

Author SHA1 Message Date
Dean Herbert
5366e7f61e
Merge branch 'master' into remove-hud-component-lookup 2021-06-02 16:10:06 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00
Dan Balasescu
47019196f6
Merge branch 'master' into fix-relative-link-resolution 2021-06-02 14:55:38 +09:00
Dean Herbert
ac761bb075 Use string.Empty instead of arbitrary string 2021-06-02 14:43:35 +09:00
Dean Herbert
4759ac098f
Merge pull request #13293 from smoogipoo/update-dependencies
Update dependencies
2021-06-02 14:35:06 +09:00
Dean Herbert
4fd8c9c17b
Merge pull request #13284 from ppy/dependabot/nuget/ppy.LocalisationAnalyser-2021.525.0
Bump ppy.LocalisationAnalyser from 2021.524.0 to 2021.525.0
2021-06-02 14:34:37 +09:00
smoogipoo
d3d8941ec8 Make method internal 2021-06-02 11:11:41 +09:00
smoogipoo
8ee2b3a2d2 Merge branch 'master' into fix-scrolling-lifetime 2021-06-02 11:08:28 +09:00
Dan Balasescu
ac83450791
Merge pull request #13256 from ekrctb/update-lifetime-2
Update DHO lifetime on entry lifetime change
2021-06-02 11:07:54 +09:00
smoogipoo
51e4b6c860 Merge remote-tracking branch 'ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-5.0.6' into update-dependencies 2021-06-02 09:21:26 +09:00
smoogipoo
4184cb88f6 Merge remote-tracking branch 'ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.MessagePack-5.0.6' into update-dependencies 2021-06-02 09:21:09 +09:00
smoogipoo
dc31e2925c Merge remote-tracking branch 'ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-5.0.6' into update-dependencies 2021-06-02 09:20:37 +09:00
smoogipoo
e19568c91b Merge remote-tracking branch 'ppy/dependabot/nuget/Sentry-3.4.0' into update-dependencies 2021-06-02 09:20:33 +09:00
smoogipoo
b0a229da87 Merge remote-tracking branch 'ppy/dependabot/nuget/ppy.LocalisationAnalyser-2021.525.0' into update-dependencies 2021-06-02 09:20:31 +09:00
dependabot[bot]
a758b38278
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:32 +00:00
dependabot[bot]
a10ef2ba65
Bump Humanizer from 2.8.26 to 2.10.1
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.26 to 2.10.1.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/main/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.26...v2.10.1)

---
updated-dependencies:
- dependency-name: Humanizer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:31 +00:00
dependabot[bot]
deaa381440
Bump Sentry from 3.3.4 to 3.4.0
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.3.4 to 3.4.0.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.3.4...3.4.0)

---
updated-dependencies:
- dependency-name: Sentry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:30 +00:00
dependabot[bot]
bd8db2ce63
Bump ppy.LocalisationAnalyser from 2021.524.0 to 2021.525.0
Bumps [ppy.LocalisationAnalyser](https://github.com/ppy/osu-localisation-analyser) from 2021.524.0 to 2021.525.0.
- [Release notes](https://github.com/ppy/osu-localisation-analyser/releases)
- [Commits](https://github.com/ppy/osu-localisation-analyser/compare/2021.524.0...2021.525.0)

---
updated-dependencies:
- dependency-name: ppy.LocalisationAnalyser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:28 +00:00
dependabot[bot]
ea9919e8fe
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.5 to 5.0.6
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:27 +00:00
dependabot[bot]
069baab883
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:27 +00:00
Dean Herbert
92ffc4627f Update framework 2021-06-01 23:24:49 +09:00
Dean Herbert
3668f1861f Fix one more null issue 2021-06-01 17:10:09 +09:00
Dean Herbert
145e42928b Fix remaining null checks 2021-06-01 16:49:05 +09:00
Dean Herbert
1f8abcdf6c Merge branch 'master' into fix-relative-link-resolution 2021-06-01 16:49:02 +09:00
Salman Ahmed
7c6400735f Merge branch 'master' into remove-hud-component-lookup 2021-06-01 10:17:52 +03:00
Salman Ahmed
c090110ae2 Provide cell skin on content creation 2021-06-01 10:16:13 +03:00
Gagah Pangeran Rosfatiputra
b4dd935538
add corner radius and padding 2021-06-01 14:14:12 +07:00
Gagah Pangeran Rosfatiputra
5108dadfbc
use inline code in markdown text flow 2021-06-01 14:03:57 +07:00
Gagah Pangeran Rosfatiputra
1babb05fc7
add OsuMarkdownInlineCode 2021-06-01 14:03:31 +07:00
Dean Herbert
dce24e3d4d
Merge pull request #12950 from gagahpangeran/osu-wiki-overlay
Initial implementation of Wiki Overlay
2021-06-01 15:20:56 +09:00
ekrctb
40949f6c1b Simplify lifetime setter
Setting entry lifetime will cause `LifetimeChanged` event and `base.LifetimeStart`/`End` will be modified in the callback.
2021-06-01 14:46:43 +09:00
ekrctb
0f381f7758 Fix wrong code 2021-06-01 14:38:02 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
ekrctb
86020adf64 Revert invalid code transformation 2021-06-01 14:28:23 +09:00
Dean Herbert
a9f4bc6285 Never return a null argument
Enable nullable
2021-06-01 14:11:17 +09:00
Dean Herbert
27b7039520 Use constant 2021-06-01 14:02:32 +09:00
Dean Herbert
6e4730652e Push private methods down 2021-06-01 14:01:08 +09:00
Dean Herbert
3ff97f787a Localise all URL generation for now to avoid weird Schedule logic 2021-06-01 13:56:59 +09:00
Dean Herbert
111bfd4d88 Fix relative URLs having a null argument after resolution to LinkDetails 2021-06-01 13:50:20 +09:00
ekrctb
d5714e63b9 Apply code styling suggestions
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-01 13:17:30 +09:00
ekrctb
86d1ba7ef2 Remove unused IScrollingHitObject interface 2021-05-31 23:17:26 +09:00
Dan Balasescu
bd7814b487
Merge pull request #13257 from ekrctb/simplify-shoc
Multiple `ScrollingHitObjectContainer` logic simplification
2021-05-31 21:31:10 +09:00
ekrctb
ff04942295 Change timing of HitObjectContainer.OnAdd/OnRemove
Now, `OnAdd` is always invoked after the DHO is added to the container.
This change is required by `ScrollingHitObjectContainer` to compute origin adjusted lifetime when origin position is relative to the parent drawable size.
2021-05-31 20:56:25 +09:00
Dan Balasescu
9036b13637
Merge pull request #13260 from peppy/legacy-skin-resource-improvements
Allow `LegacyDefaultSkin` to be constructed without extra resource store parameter
2021-05-31 20:49:21 +09:00
Dean Herbert
f60e9cb085 Remove weird override logic in TestCase methods 2021-05-31 20:00:47 +09:00
Dean Herbert
e78391db7a Fix usage of DI before it's ready in combo colour tests 2021-05-31 19:58:19 +09:00
Dean Herbert
17fa2426d4 Merge branch 'master' into legacy-skin-resource-improvements 2021-05-31 19:36:09 +09:00
Dean Herbert
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
Dean Herbert
65709ec7d7 Move leagcy resource store construction local to DefaultLegacySkin 2021-05-31 19:14:49 +09:00
Dan Balasescu
46b6f49a92
Merge pull request #13230 from peppy/non-nullable-beatmapset-files
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00