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

47635 Commits

Author SHA1 Message Date
Dean Herbert
ef2a4aed9a Fix editor playfield not being centered correctly
This has come up multiple times, with mappers citing that they have
muscle memory for mapping based on the centre of the playfield being in
the centre of the window.

The original plan was to have a second toolbar on the right hand side of
the screen to balance the padding, but we're not at that point yet.
Easiest solution is to do what stable does and allow the left-hand
toolbar items to overlap the playfield underneath it.

In edge cases where the user is running at an aspect ratio that causes
overlaps, they can choose to collapse the toolbars down. We can probably
work on this UI/UX a bit more as we update designs to be more friendly
to such cases.
2022-01-05 16:05:18 +09:00
Bartłomiej Dach
93bcebbcd5
Merge pull request #16321 from peppy/fix-cursor-culture-incorrect
Fix cursors sent to osu-web being potentially string formatted in incorrect culture
2022-01-04 19:27:14 +01:00
Dean Herbert
5736b7d978 Fix cursors sent to osu-web being potentially string formatted in incorrect culture
Fixed as per solution at https://github.com/JamesNK/Newtonsoft.Json/issues/874.

Note that due to the use of `JsonExtensionDataAttribute` it's not
feasible to change the actual specification to `JValue` in the
`Dictionary`.

In discussion with the osu-web team, it may be worthwhile to change the cursor
to a string format where parsing is not required at our end. We could already
do this in fact, but there are tests that rely on it being a `JToken` so the
switch to `JValue` seems like the easier path right now.
2022-01-04 17:20:46 +09:00
Dean Herbert
39650ce7e9
Merge pull request #16307 from peppy/beatmap-listing-bottom-padding
Add padding to the bottom of the beatmap listing overlay to avoid hovered panels exceeding visible bounds
2022-01-04 14:14:42 +09:00
Dean Herbert
374dac57f2 Change expanded card content height to 200 2022-01-04 13:22:00 +09:00
Dean Herbert
2b258e786a
Merge pull request #16313 from bdach/fix-listing-terminal-breakage
Fix beatmap listing overlay not expiring content from previous searches
2022-01-04 12:22:47 +09:00
Dean Herbert
f6b1405fa0
Merge branch 'master' into fix-listing-terminal-breakage 2022-01-04 11:49:02 +09:00
Dean Herbert
17d56d117e
Merge pull request #16314 from bdach/submission-on-exit-test-coverage
Add test coverage of score submission if player is exited during import
2022-01-04 11:46:22 +09:00
Bartłomiej Dach
7cdba2f7c3
Add test coverage of score submission if player is exited during import 2022-01-03 22:00:47 +01:00
Bartłomiej Dach
8f335c333c
Merge pull request #16278 from peppy/fix-skin-editor-overlay-show-thread-safetyu
Fix calling `SkinEditorOverlay.Show` before the overlay is loaded causing an exception
2022-01-03 20:41:48 +01:00
Bartłomiej Dach
87fbac15fd
Merge branch 'master' into fix-skin-editor-overlay-show-thread-safetyu 2022-01-03 20:12:18 +01:00
Bartłomiej Dach
de33b420ab
Add safety against performing operation on non-alive foundContent 2022-01-03 20:02:46 +01:00
Bartłomiej Dach
586f158920
Remove initial foundContent value
It always is replaced on the first search anyway, and just remains
forever in the overlay otherwise.
2022-01-03 19:52:42 +01:00
Bartłomiej Dach
6650a468e0
Fix and simplify very broken beatmap listing content swap-out logic
The beatmap listing content swap-out logic was already a source of
several problems, and several attempts of fixing it were made. But as it
turns out it was terminally broken in several aspects.

* The `BypassAutoSizeAxes` juggling was finicky and ugly, and didn't
  really look much different than an instant fade. Therefore, all fade
  durations and manipulations of `BypassAutoSizeAxes` are removed.

* The transform sequence juggling the `BypassAutoSizeAxes` manipulations
  was enqueued on the content which is being in the process of fading
  out. That was partially fixed in 25e38560, but as it turns out, that
  only works if `lastContent` is one of the two placeholder drawables
  (results not found / supporter required to use filter).

  It would not work if `lastContent` is a
  `ReverseChildIDFillFlowContainer` with cards from a previous search in
  it.
2022-01-03 19:51:46 +01:00
Bartłomiej Dach
ef9f56e585
Fix bad check if content is placeholder
The `lastContent == foundContent` check, last touched in a49a4329, is
terminally broken, as it would always be false. `foundContent` is
mutated when a new card load task is started in `onSearchFinished()`,
which is *before* the aforementioned check.

The code prior to a49a4329 was checking against the two static reused
placeholder drawables which was the correct check to apply, and this
commit reverts to using a variant of that check.
2022-01-03 19:51:20 +01:00
Bartłomiej Dach
97439c3df1
Rename method to reflect what it actually does 2022-01-03 19:30:17 +01:00
Bartłomiej Dach
2660f41339
Add failing test case for old cards not expiring correctly 2022-01-03 19:28:14 +01:00
Bartłomiej Dach
7c246670b4
Add padding to bottom of spotlights ranking view to avoid hovered panels exceeding visible bounds 2022-01-03 18:43:20 +01:00
Bartłomiej Dach
0ad555e9f7
Remove surplus blank line 2022-01-03 18:33:32 +01:00
Dean Herbert
d4ea57c660
Merge pull request #15844 from mk56-spn/positional-sounds-strength-adjustment
Positional sounds strength adjustment slider implementation
2022-01-03 14:30:25 +09:00
Dean Herbert
b9851b278d Add padding to the bottom of the beatmap listing overlay to avoid hovered panels exceeding visible bounds
Closes https://github.com/ppy/osu/issues/16120.
2022-01-03 13:18:28 +09:00
Dean Herbert
6356180b6a Remove unnecessary code and fix double nesting causing filtering to not work 2022-01-03 12:53:58 +09:00
Dean Herbert
623d6d6d2d Add migration of positional hitsounds setting to new level based setting 2022-01-03 12:46:20 +09:00
Dean Herbert
5dd024aab7 Remove outdated settings migration 2022-01-03 12:46:02 +09:00
Dean Herbert
bb54f438aa Merge branch 'master' into positional-sounds-strength-adjustment 2022-01-03 12:40:56 +09:00
Dean Herbert
cf864e58f7
Merge pull request #16253 from peppy/reduce-chat-overhead
Reduce overhead from chat polling when game is not active
2022-01-01 23:42:31 +09:00
Bartłomiej Dach
e7d7587ea5
Merge branch 'master' into reduce-chat-overhead 2022-01-01 15:02:55 +01:00
Bartłomiej Dach
2bdf470d83
Merge pull request #16292 from peppy/storyboard-outro-test-reliability
Improve reliability of `TestStoryboardSkipOutro`
2022-01-01 14:10:17 +01:00
Dean Herbert
04d8fd3a58 Improve reliability of TestStoryboardSkipOutro
Aims to resolve failures as seen at
https://github.com/peppy/osu/runs/4677353822?check_suite_focus=true.

Have run quite a lot locally with no failures (while removing the skip step 100% fails).
2022-01-01 15:32:39 +09:00
Dean Herbert
1262e76a58 Fix test failure due to missing DI cached IdleTracker 2021-12-31 23:18:03 +09:00
Dean Herbert
f656e7d2d2
Merge pull request #16284 from peppy/archive-reader-synchronous-flow
Avoid potential deadlocks in `ArchiveReader` synchronous implementation
2021-12-31 12:46:13 +09:00
Bartłomiej Dach
cbb62fab26
Merge pull request #16282 from peppy/fix-kiai-drawable-nullref
Fix null reference causing crash in `KiaiFlashingDrawable`
2021-12-30 23:43:58 +01:00
Bartłomiej Dach
42b93283ca
Merge branch 'master' into fix-kiai-drawable-nullref 2021-12-30 23:15:42 +01:00
Bartłomiej Dach
d68c47e710
Merge pull request #16283 from peppy/fix-leaderboard-test
Fix `TestSceneMultiSpectatorLeaderboard` not waiting for user population
2021-12-30 23:00:24 +01:00
Dean Herbert
670a30b64b Remove usage of .Result in ArchiveReader 2021-12-31 01:52:01 +09:00
Dean Herbert
e38e1bb1d7 Enable a couple of missing async related inspections 2021-12-31 01:52:01 +09:00
Dean Herbert
f53a675ca3 Fix TestSceneMultiSpectatorLeaderboard not waiting for user population 2021-12-31 00:48:31 +09:00
Dean Herbert
408e8d5710 Fix null reference causing crash in KiaiFlashingDrawable
Can occur if there is no fallback graphics available. Previously would
work as it was only setting the `Texture`.

As reported in https://github.com/ppy/osu/discussions/16281.
2021-12-30 22:21:39 +09:00
Dean Herbert
089b756f93 Invert logic to make reading easier 2021-12-30 16:03:16 +09:00
Dean Herbert
ef49f2ed0e Add extra extra safety against attempting to load a previously expired editor 2021-12-30 16:02:31 +09:00
Dean Herbert
b1a444180f Fix Show then Reset potentially resulting in incorrect load target 2021-12-29 21:46:34 +09:00
Dean Herbert
2fd4647e6e
Merge pull request #16272 from bdach/animated-hit-circle-overlay
Add support for animated hit circle overlay
2021-12-29 21:39:27 +09:00
Dean Herbert
471eea750a Fix calling SkinEditorOverlay.Show before the overlay is loaded causing an exception
As seen at https://github.com/ppy/osu/runs/4652969942?check_suite_focus=true.
2021-12-29 21:18:17 +09:00
Bartłomiej Dach
eea0fea69f
Add support for animated legacy hit circle overlay 2021-12-28 15:58:34 +01:00
Bartłomiej Dach
b29c2bf9f3
Add test resources for animated legacy hit circle overlay 2021-12-28 15:58:34 +01:00
Bartłomiej Dach
448c6ed515
Generalise KiaiFlashingSprite for arbitrary drawables 2021-12-28 15:58:34 +01:00
Bartłomiej Dach
f78adbea36
Merge pull request #16271 from turbedi/remove_sharpraven_package
Remove unused SharpRaven package reference from osu.iOS.props
2021-12-28 15:57:51 +01:00
Berkan Diler
d74e438f0a Remove unused SharpRaven package reference from osu.iOS.props
Seems like a leftover from #6824
2021-12-28 15:17:18 +01:00
Dean Herbert
f2ed8af9cb
Merge pull request #16268 from bdach/implicit-newtonsoft-properties
Revert rename of implicitly-used newtonsoft method
2021-12-28 18:45:08 +09:00
Bartłomiej Dach
63e0492725
Mark ShouldSerialize() methods as implicitly used 2021-12-28 09:02:03 +01:00