1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 02:33:02 +08:00
Commit Graph

44979 Commits

Author SHA1 Message Date
smoogipoo
69c2b7dc59 Merge branch 'master' into rename-beatmap-info-beatmap-fields 2021-10-04 16:03:22 +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
smoogipoo
4e1322effa Fix typo 2021-10-04 16:02:45 +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
Dean Herbert
266b4c7124 Expose login errors from IAPIProvider and show on the login form 2021-10-04 15:40:24 +09:00
Dean Herbert
5aaafce597 Make AuthenticateWithLogin throw instead of return a bool success status 2021-10-04 15:40:00 +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
537b29654e Fix stream being held open causing windows CI failures 2021-10-04 14:30:22 +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
75c4d140c9
Merge pull request #14939 from bdach/hitcircle-overlay-above-number-proxying
Fix slider head hit circle numbers not being proxied correctly
2021-10-04 11:14:25 +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
67d08a3eee
Add test scene for previewing Torus alternates 2021-10-04 00:26:41 +02:00
Bartłomiej Dach
86240cc8ec
Add alternate Torus font 2021-10-03 23:36:39 +02:00
Xexxar
94f8692b00 removed acc changes to put in seperate PR 2021-10-03 17:42:49 +00:00
Xexxar
bc3ae4c4f8 changed function names to be consistent 2021-10-03 17:36:34 +00:00
Xexxar
6d134b2a83 resolved code cleanliness issues 2021-10-03 17:32:03 +00:00
Xexxar
ba2c44a2f4 reworked strain to fix issue with overlapping hitwindo 2021-10-03 17:31:56 +00:00
Bartłomiej Dach
5e5cdaab5e
Privatise setter
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-10-03 19:14:01 +02:00
Dean Herbert
ea7334f121
Merge pull request #14937 from Susko3/fix-keybinds-reset-search
Fix 'Reset all bindings in section' button appearing when it shouldn't during searches
2021-10-03 23:18:58 +09:00
Bartłomiej Dach
abe0ced48c
Proxy slider head circle number along with overlay 2021-10-03 15:53:49 +02:00
Bartłomiej Dach
07c11953cd
Modify special test skin to visually cover regression 2021-10-03 15:53:46 +02:00
Dean Herbert
4f00a9e165
Adjust max runtime for diffcalc runs 2021-10-03 22:32:46 +09:00
Bartłomiej Dach
83fa1be713
Merge branch 'master' into fix-keybinds-reset-search 2021-10-03 13:54:57 +02:00
Bartłomiej Dach
f05cb6bb5b
Add test case covering reset section button hiding 2021-10-03 13:53:26 +02:00
apollo-dw
03f0a36589 additional balancing 2021-10-03 11:53:14 +01:00
apollo-dw
bc1ff019da Implement relax checks 2021-10-03 11:27:17 +01:00
Dean Herbert
df50695021
Merge pull request #14885 from Wieku/storyboard-fixes
Force storyboard's loop commands to be run at least once
2021-10-03 05:19:12 +09: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
Bartłomiej Dach
281a3a0cea
Add test case for legacy loop count behaviour 2021-10-02 18:40:41 +02:00
Dean Herbert
ec61c3c5ee Rename all remaining cases 2021-10-03 00:55:29 +09:00
Dean Herbert
6ec2223b5c Catch potential file access exceptions also in async flow 2021-10-02 23:01:44 +09: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
20e3f7fec4 Merge branch 'new-interfaces' into beatmap-difficulty-more-interface-usage 2021-10-02 13:08:02 +09:00
Dean Herbert
973c31132b Rename BeatmapInfo variables which were named beatmap for clarity 2021-10-02 12:45:34 +09: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
Dean Herbert
1abf43af1d
Merge pull request #14926 from ppy/dependabot/nuget/Sentry-3.9.4 2021-10-02 09:58:45 +09:00
apollo-dw
a5025dc8b8 Buff base multiplier 2021-10-01 22:23:16 +01: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