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

60607 Commits

Author SHA1 Message Date
Bartłomiej Dach
9b665d2e1a
Merge branch 'master' into beat-snap-divisor-hotkeys 2023-06-07 23:38:03 +02:00
Bartłomiej Dach
11b3250844
Merge pull request #23795 from peppy/mania-barlines-behind-notes
Fix osu!mania barlines showing in front of notes
2023-06-07 22:41:24 +02:00
Bartłomiej Dach
c8507837d1
Remove redundant initialisation of Children to empty array 2023-06-07 21:51:46 +02:00
Bartłomiej Dach
8463f5c7dd
Spell out location of external proxy explicitly 2023-06-07 21:50:16 +02:00
Bartłomiej Dach
f069f982d4
Merge branch 'master' into mania-barlines-behind-notes 2023-06-07 21:43:39 +02:00
Bartłomiej Dach
7fa082cc1d
Merge pull request #23770 from peppy/add-catch-beat-snap-grid
Add beat snap grid for osu!catch editor
2023-06-07 18:35:14 +02:00
Dean Herbert
3a01498789 Use existing next/previous methods (and remove looping behaviour) 2023-06-08 01:01:29 +09:00
Dean Herbert
f8a3be24c8
Update config.yml to mention "performance" in the discussion link 2023-06-08 00:22:06 +09:00
Bartłomiej Dach
1f4e79d79d
Merge pull request #23711 from timiimit/add-last-edit-time
Store timestamp of beatmap's last edit time in local database
2023-06-07 16:57:24 +02:00
Bartłomiej Dach
c50a5498e9
Merge pull request #23769 from peppy/update-mania-colours
Update argon osu!mania column colours in line with latest proposal
2023-06-07 16:55:54 +02:00
Dean Herbert
15725fb186 Change default bindings to account for mouse wheel rotation 2023-06-07 18:07:56 +09:00
Dean Herbert
2c89af608a Add ability to cycle beat snap divisor using hotkeys
Defaults to Ctrl+Shift+Wheel (as per stable).

Closes #23785.
2023-06-07 17:15:15 +09:00
Dean Herbert
99afb73feb
Merge pull request #23794 from peppy/disable-in-game-chat-reports
Disabling reporting users from in-game chat
2023-06-07 16:39:38 +09:00
Salman Ahmed
f23ada1a3f
Merge branch 'master' into disable-in-game-chat-reports 2023-06-07 09:52:46 +03:00
Dean Herbert
2a76348481
Merge pull request #23796 from frenzibyte/remove-redundant-nullable-directive
Remove redundant nullable suppression directives
2023-06-07 15:40:33 +09:00
Dean Herbert
d57c2ab7e4 Fix osu!mania barlines showing in front of notes
Closes #23412.
2023-06-07 14:23:23 +09:00
Salman Ahmed
62cb6a98ca Remove redundant nullable suppression directives 2023-06-07 08:20:41 +03:00
Dean Herbert
30f17d5869 Disabling reporting users from in-game chat
Addresses #23684.

Safer alternative to #23698.
2023-06-07 14:03:06 +09:00
Dean Herbert
247ac3a5fd
Merge pull request #23781 from bdach/fix-progress-bar-blink
Fix triangles song progress bar blinking during gameplay
2023-06-07 13:44:43 +09:00
Dean Herbert
6d446d3e97 Fix incorrect colouring of beat snap grids (mania and catch) 2023-06-07 12:25:34 +09:00
Dean Herbert
cdd931633d
Change 3K middle key to "special" purple colour
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-06-07 12:10:30 +09:00
Bartłomiej Dach
92c2320689
Merge pull request #23776 from peppy/fix-scroll-time-decimal
Fix osu!mania scroll speed milliseconds having too much precision
2023-06-06 22:34:08 +02:00
Bartłomiej Dach
244e6cc008
Merge pull request #23767 from peppy/fix-playfield-border-animation-in-editor
Fix gameplay playfield border being affected by beatmap track time
2023-06-06 22:10:18 +02:00
Bartłomiej Dach
efc600e7ce
Merge pull request #23766 from peppy/argon-taiko-explosion-colour
Colour argon osu!taiko explosions based on the object hit
2023-06-06 21:51:55 +02:00
Bartłomiej Dach
c171cb0bb4
Merge pull request #22934 from peppy/no-offset-calibration-with-relax
Don't show offset calibration controls when "relax" mod is active
2023-06-06 21:51:29 +02:00
Bartłomiej Dach
f51b8a6a05
Fix code quality inspection 2023-06-06 21:11:24 +02:00
Bartłomiej Dach
7694aa7219
Add test coverage 2023-06-06 20:36:44 +02:00
Bartłomiej Dach
46ec250d34
Fix test failures due to cross-test state pollution
`TestSceneEditorTestGameplay` is not isolated from database, and one of
the tests exiting editor when seeked to 60000 milliseconds
(`TestClockTimeTransferIsOneDirectional()`) ended up changing
`EditorTimestamp` to the same value, causing
`TestSaveChangesBeforeGameplayTest()` to fail due to changing initial
state.

To fix, perform a direct deletion of imported beatmaps in realm to avert
this scenario, contrary to the soft-deletion via `BeatmapManager` done
previously.
2023-06-06 20:21:55 +02:00
Bartłomiej Dach
be59eb1116
Fix triangles song progress bar blinking during gameplay
Closes #23760.
2023-06-06 18:36:25 +02:00
Dean Herbert
247fa088db Add IHasNoTimedInputs interface to scope change further 2023-06-06 22:22:42 +09:00
Dean Herbert
d1300f75c0 Merge branch 'master' into no-offset-calibration-with-relax 2023-06-06 22:22:08 +09:00
Dean Herbert
e0e013cca1
Fix incorrect realm schema comment
Co-authored-by: timiimit <32331609+timiimit@users.noreply.github.com>
2023-06-06 22:17:05 +09:00
Dean Herbert
6b18f2f2bb Fix osu!mania scroll speed milliseconds having too much precision
Closes #23750.
2023-06-06 21:43:56 +09:00
Dean Herbert
c1f23ef211 Add beat snap grid for osu!catch editor
As discussed in https://github.com/ppy/osu/discussions/23462.
2023-06-06 17:52:29 +09:00
Dean Herbert
7a1766e378 Update argon osu!mania column colours in line with latest proposal
Matches https://github.com/ppy/osu/discussions/21996#discussioncomment-5516872.
2023-06-06 16:42:20 +09:00
Dean Herbert
c0016fa5d2 Fix gameplay playfield border being affected by beatmap track time
Closes https://github.com/ppy/osu/issues/23470.
2023-06-06 16:08:24 +09:00
Dean Herbert
b8d9c9ff93 Move ApplyGameWideClock to extension method
I don't see an issue with applying this workaround to more places, even
though it is a workaround, because it marks each usage very clearly. If
we design a better solution in the future it should be easy to replace
the usages.
2023-06-06 16:07:50 +09:00
Dean Herbert
a18a2e48f7 Colour argon osu!taiko explosions based on the object hit 2023-06-06 15:49:03 +09:00
Dean Herbert
66b8b5192b Add test coverage of editor timestamp remembering 2023-06-06 15:25:19 +09:00
Dean Herbert
eaf5813d1b
Merge pull request #23751 from ItsShamed/hud/argon-kc-animations-poc
Add animations to the argon key counter
2023-06-06 15:16:35 +09:00
Dean Herbert
878cdb2ed3 Bump schema version 2023-06-06 15:11:37 +09:00
Dean Herbert
22f7fe1d79 Rename variable and ensure timestamp is updated even when not saving 2023-06-06 15:11:31 +09:00
Dean Herbert
3a50e0fb2f Merge branch 'master' into add-last-edit-time 2023-06-06 15:07:20 +09:00
Dean Herbert
0c7ab8f971
Merge branch 'master' into hud/argon-kc-animations-poc 2023-06-06 14:43:08 +09:00
Dean Herbert
2f11bd5473 Adjust animations slightly 2023-06-06 14:42:42 +09:00
Dean Herbert
a0b3fd27a7
Merge pull request #23729 from jtbiddle/language-list-update
Update languages to match osu-web
2023-06-06 14:31:38 +09:00
Dean Herbert
dd3d43c70f
Merge pull request #23745 from Joehuu/fix-ss-incorrect-bg-preview
Fix song select beatmap panels sometimes not displaying correct background shown in web
2023-06-06 13:31:13 +09:00
Dean Herbert
c54670aee1 Add comment explaining implementation 2023-06-06 13:30:56 +09:00
Dean Herbert
83c3ac4d8c
Merge pull request #23762 from bdach/fix-haphazard-request-handling-2
Fix screen navigation test hijacking dummy request handler
2023-06-06 12:33:44 +09:00
Bartłomiej Dach
5c1abdc704
Fix screen navigation test hijacking dummy request handler
In an upcoming change, I stumbled upon a test failure mode wherein tests
in `TestSceneScreenNavigation` would die on the following exception:

	2023-05-07 17:58:42 [error]: System.ObjectDisposedException: Cannot access a closed Realm.
	2023-05-07 17:58:42 [error]: Object name: 'Realms.Realm'.
	2023-05-07 17:58:42 [error]: at Realms.Realm.ThrowIfDisposed()
	2023-05-07 17:58:42 [error]: at Realms.Realm.All[T]()
	2023-05-07 17:58:42 [error]: at osu.Game.Beatmaps.BeatmapManager.<>c__DisplayClass25_0.<QueryBeatmap>b__0(Realm r) in D:\a\osu\osu\osu.Game\Beatmaps\BeatmapManager.cs:line 282
	2023-05-07 17:58:42 [error]: at osu.Game.Database.RealmAccess.Run[T](Func`2 action) in D:\a\osu\osu\osu.Game\Database\RealmAccess.cs:line 387
	2023-05-07 17:58:42 [error]: at osu.Game.Beatmaps.BeatmapManager.QueryBeatmap(Expression`1 query) in D:\a\osu\osu\osu.Game\Beatmaps\BeatmapManager.cs:line 282
	2023-05-07 17:58:42 [error]: at osu.Game.Tests.Visual.OnlinePlay.TestRoomRequestsHandler.<HandleRequest>g__createResponseBeatmaps|6_0(Int32[] beatmapIds, <>c__DisplayClass6_0& ) in D:\a\osu\osu\osu.Game\Tests\Visual\OnlinePlay\TestRoomRequestsHandler.cs:line 174
	2023-05-07 17:58:42 [error]: at osu.Game.Tests.Visual.OnlinePlay.TestRoomRequestsHandler.HandleRequest(APIRequest request, APIUser localUser, BeatmapManager beatmapManager) in D:\a\osu\osu\osu.Game\Tests\Visual\OnlinePlay\TestRoomRequestsHandler.cs:line 140
	2023-05-07 17:58:42 [error]: at osu.Game.Tests.Visual.TestMultiplayerComponents.<>c__DisplayClass18_0.<load>b__0(APIRequest request) in D:\a\osu\osu\osu.Game.Tests\Visual\TestMultiplayerComponents.cs:line 80
	2023-05-07 17:58:42 [error]: at osu.Game.Online.API.DummyAPIAccess.<>c__DisplayClass32_0.<Queue>b__0() in D:\a\osu\osu\osu.Game\Online\API\DummyAPIAccess.cs:line 74

Upon closer inspection, one of the tests in the scene instantiates a
`TestMultiplayerComponents` instance. `TestMultiplayerComponents`
registers a custom request handler onto `DummyAPIAccess`. Normally, this
is not an issue; however, because `TestSceneScreenNavigation` is an
`OsuGameTestScene`, and therefore has its storage recycled after every
test, this leads to the error above in the following scenario:

1. `TestPushMatchSubScreenAndPressBackButtonImmediately()` passes.
2. The test is cleaned up, and the test case's storage is recycled,
   including the test case's realm database.
3. In a subsequent test, a web request handled by the dummy API request
   handler is fired. The dummy API request handler subsequently attempts
   to access a realm that does not exist anymore.

As the usage of `TestMultiplayerComponents` is highly unorthodox in this
particular case, I'm opting for a localised fix which ensures that the
request handler is cleaned up appropriately.
2023-06-05 23:15:16 +02:00