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

44999 Commits

Author SHA1 Message Date
Dan Balasescu
1935c9e93d
Merge pull request #14950 from peppy/rename-score-beatmap
Rename last remaining `BeatmapInfo Beatmap` usage
2021-10-04 19:45:08 +09:00
smoogipoo
4871db2f86 Merge branch 'master' into importer-returns-live 2021-10-04 19:42:36 +09:00
Dean Herbert
853cf6feaa Rename last remaining BeatmapInfo Beatmap usage 2021-10-04 17:35:53 +09:00
Dan Balasescu
5937a93e2d
Merge pull request #14949 from peppy/login-error-display
Show login failure messages on login form
2021-10-04 17:23:11 +09:00
Dan Balasescu
c1540c137a
Merge pull request #14932 from peppy/rename-beatmap-info-beatmap-fields
Rename `BeatmapInfo` variables which were named `beatmap` for clarity
2021-10-04 17:22:06 +09:00
Dean Herbert
6ac0601d2c Fix incorrect csproj merge 2021-10-04 17:18:08 +09:00
Dean Herbert
ae5d1e8ac0 Merge branch 'master' into remove-local-realm-thread-switch-handling 2021-10-04 17:17:10 +09:00
Dean Herbert
95f1cc85d4 Update framework 2021-10-04 17:12:40 +09:00
Dean Herbert
f293e008d9 Move BeatmapInfo's SearchableTerms implementation to interface 2021-10-04 17:01:02 +09:00
Dean Herbert
51b7dce16f Remove reference to osu-web-10 2021-10-04 16:55:51 +09:00
Dean Herbert
fd6b10656c Add TODO reminder about ruleset reference transfer quirk 2021-10-04 16:55:16 +09:00
Dean Herbert
4df5f93152 Inline single usage of StoryboardFile to avoid interface default method woes 2021-10-04 16:55:02 +09:00
Dean Herbert
8bfdfe3672
Add literal string marker
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-04 16:54:00 +09:00
Dean Herbert
63f0b0c932 Rename out of place interface name 2021-10-04 16:35:55 +09:00
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
Dean Herbert
3a0b7ba8ff Add fallback to use Message when Hint is not available 2021-10-04 16:18:55 +09:00
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