1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 02:59:48 +08:00
Commit Graph

28353 Commits

Author SHA1 Message Date
Dean Herbert
e631653f4b Remove incorrectly committed FodyWeavers file 2021-10-04 16:30:12 +09:00
Dean Herbert
857000b756 Mark IPresentImports as covariant 2021-10-04 16:29:46 +09:00
Dean Herbert
3c15ef720f Remove setter from IHasGuidPrimaryKey interface 2021-10-04 16:26:28 +09:00
Dean Herbert
916342c837 Merge branch 'master' into importer-returns-live 2021-10-04 16:24:26 +09:00
Dan Balasescu
aca2f0c12d
Merge pull request #14901 from peppy/model-importer-split
Split importer interface out of `IModelManager`
2021-10-04 16:22:29 +09:00
Dan Balasescu
fd002da469
Merge pull request #14948 from peppy/fix-drawable-channel-ci-failures
Ensure a `DrawableChannel` is not attempted to be added after disposal
2021-10-04 16:03:13 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Dan Balasescu
d82829fad3
Merge pull request #14909 from peppy/realm-context-factory-safer-blocking
Ensure realm blocks until all threaded usages are completed
2021-10-04 15:52:45 +09:00
smoogipoo
bc984dff4f Fix typo 2021-10-04 15:35:28 +09:00
Dean Herbert
c19c2335ec Remove added schedule due to changing flow 2021-10-04 14:58:54 +09:00
Dean Herbert
c6aba3e78b Ensure a DrawableChannel is not attempted to be added after disposal 2021-10-04 14:44:16 +09:00
Dean Herbert
3d71576fbe
Merge pull request #14920 from smoogipoo/guard-skin-exception
Guard against exception in skin deserialisation
2021-10-04 14:07:49 +09:00
Dean Herbert
c8419ebedb
Merge pull request #14946 from bdach/torus-alternate
Add alternate Torus font
2021-10-04 11:47:11 +09:00
Dean Herbert
11e9c16b92 Update resources 2021-10-04 11:13:46 +09:00
Bartłomiej Dach
017756cbca
Use Torus alternates on online play screens as per design 2021-10-04 00:26:41 +02:00
Bartłomiej Dach
86240cc8ec
Add alternate Torus font 2021-10-03 23:36:39 +02:00
Bartłomiej Dach
83fa1be713
Merge branch 'master' into fix-keybinds-reset-search 2021-10-03 13:54:57 +02:00
Susko3
3e403cfe03 Add comment explaining the purpose of the empty FilterTerms 2021-10-02 19:16:46 +02:00
Bartłomiej Dach
f03cf87872
Merge branch 'master' into storyboard-fixes 2021-10-02 18:41:01 +02:00
Susko3
d55836c0b2 Make ResetButton no longer part of search filtering
The button will now appear if and only if all the bindings in its section are visible (not filtered out by the search)
2021-10-02 15:10:30 +02:00
Dean Herbert
1be96b4292 Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-5.0.10' 2021-10-02 11:04:00 +09:00
Dean Herbert
fb6426d68d Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.MessagePack-5.0.10' 2021-10-02 11:03:30 +09:00
dependabot[bot]
cb8165ca50
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.9 to 5.0.10.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.9...v5.0.10)

---
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-10-02 00:59:32 +00:00
dependabot[bot]
f60f712bcc
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.9 to 5.0.10.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.9...v5.0.10)

---
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-10-02 00:59:32 +00:00
dependabot[bot]
9517d69f21
Bump MessagePack from 2.3.75 to 2.3.85
Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 2.3.75 to 2.3.85.
- [Release notes](https://github.com/neuecc/MessagePack-CSharp/releases)
- [Changelog](https://github.com/neuecc/MessagePack-CSharp/blob/master/prepare_release.ps1)
- [Commits](https://github.com/neuecc/MessagePack-CSharp/compare/v2.3.75...v2.3.85)

---
updated-dependencies:
- dependency-name: MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-02 00:59:31 +00:00
dependabot[bot]
5ea51f4a9f
Bump Sentry from 3.9.0 to 3.9.4
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.9.0 to 3.9.4.
- [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.9.0...3.9.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 18:15:07 +00:00
Dean Herbert
bea310007f
Merge pull request #14922 from ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-5.0.10
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.9 to 5.0.10
2021-10-02 03:12:14 +09:00
Dean Herbert
ea1e09837e
Merge pull request #14923 from ppy/dependabot/nuget/HtmlAgilityPack-1.11.37
Bump HtmlAgilityPack from 1.11.36 to 1.11.37
2021-10-02 03:11:52 +09:00
Dean Herbert
7e009f6168 Add full xmldoc 2021-10-02 02:31:41 +09:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
Dean Herbert
05ca3aec4f Rename GameplayState to SpectatorGameplayState 2021-10-02 02:10:11 +09:00
dependabot[bot]
6de4e981dd
Bump Realm from 10.5.0 to 10.6.0
Bumps [Realm](https://github.com/realm/realm-dotnet) from 10.5.0 to 10.6.0.
- [Release notes](https://github.com/realm/realm-dotnet/releases)
- [Changelog](https://github.com/realm/realm-dotnet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-dotnet/compare/10.5.0...10.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 17:01:37 +00:00
dependabot[bot]
323a9a748d
Bump HtmlAgilityPack from 1.11.36 to 1.11.37
Bumps [HtmlAgilityPack](https://github.com/zzzprojects/html-agility-pack) from 1.11.36 to 1.11.37.
- [Release notes](https://github.com/zzzprojects/html-agility-pack/releases)
- [Commits](https://github.com/zzzprojects/html-agility-pack/compare/v1.11.36...v1.11.37)

---
updated-dependencies:
- dependency-name: HtmlAgilityPack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 17:01:32 +00:00
dependabot[bot]
1eb67dc594
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.9 to 5.0.10
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.9 to 5.0.10.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.9...v5.0.10)

---
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-10-01 17:01:28 +00:00
Dean Herbert
d6dbdc911f
Merge branch 'master' into storyboard-fixes 2021-10-02 00:35:51 +09:00
Dean Herbert
682fe5be78
Merge branch 'master' into realm-context-factory-safer-blocking 2021-10-02 00:30:09 +09:00
Dean Herbert
b1f9bbdc69
Merge branch 'master' into model-importer-split 2021-10-02 00:29:29 +09:00
Dan Balasescu
a620b55d55
Merge pull request #14900 from peppy/model-downloader-split
Split `ArchiveModelManager` into two pieces
2021-10-01 23:16:09 +09:00
Dan Balasescu
d24f89fead
Merge pull request #14906 from peppy/update-realm-context-factory
Refine `RealmContext` implementation
2021-10-01 22:57:03 +09:00
Dan Balasescu
6a172d54d5
Merge branch 'master' into model-downloader-split 2021-10-01 22:34:39 +09:00
Dean Herbert
a32f5d44e2
Improve clarity of xmldoc
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-10-01 22:23:51 +09:00
smoogipoo
adff418fd2 Guard against exception in skin deserialisation 2021-10-01 22:17:38 +09:00
Dan Balasescu
154c412f34
Merge branch 'master' into beatmap-manager-split 2021-10-01 21:46:27 +09:00
Dean Herbert
4c28749d73 Fix incorrect legacy decoder usage 2021-10-01 19:05:08 +09:00
Dean Herbert
3faafd7200 Rename parameter to repeatCount and add guards 2021-10-01 18:26:29 +09:00
Dean Herbert
74841cf1a9 Merge branch 'update-realm-context-factory' into realm-context-factory-safer-blocking 2021-10-01 03:54:31 +09:00
Dean Herbert
b51fd00ba3 Guard against disposal in all context retrievals 2021-10-01 03:46:53 +09:00
Dean Herbert
8557530cd5 Add back main context locking 2021-10-01 03:45:00 +09:00
Dean Herbert
c71cf1e220 Fix incomplete xmldoc 2021-10-01 01:51:31 +09:00
Dean Herbert
3ddb348252 Merge branch 'online-lookup-cache-separation' into beatmap-manager-split 2021-10-01 01:49:31 +09:00