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

27702 Commits

Author SHA1 Message Date
Dean Herbert
bac5f79731
Merge branch 'master' into rewrite-select-next 2020-03-30 00:08:06 +09:00
Dean Herbert
b47a532df3 Adjust code formatting slightly 2020-03-30 00:07:48 +09:00
Dean Herbert
a72f0f57f6 Refactor tests for readability 2020-03-30 00:05:07 +09:00
Dean Herbert
07c7233b3d Change int div comments 2020-03-29 23:46:28 +09:00
Dean Herbert
de969c07ea
Merge pull request #8351 from tybug/show-mod-settings-tooltip
Show customised mod setting values in tooltip
2020-03-29 19:48:17 +09:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Endrik Tombak
8cab303611 Cover skipDifficulties = false in tests 2020-03-28 21:02:55 +02:00
Endrik Tombak
b4f0500706 Invert logic 2020-03-28 20:21:21 +02:00
Endrik
2c27894527
Use All instead of ToList Any
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-28 19:58:33 +02:00
Endrik Tombak
87854fc4fa Rename variable 2020-03-28 13:23:31 +02:00
Endrik Tombak
63f6269eb0 Test both ways 2020-03-28 13:10:20 +02:00
Endrik Tombak
659865b457 Use understandable set id 2020-03-28 13:08:06 +02:00
Endrik Tombak
0a69647efe Merge remote-tracking branch 'origin/traversal-is-broken' into rewrite-select-next 2020-03-28 13:06:37 +02:00
Endrik Tombak
6a0c5c87aa Use already existing variable 2020-03-28 13:06:03 +02:00
Endrik Tombak
fc3f9ff6fa Don't use drawables for select next 2020-03-28 12:54:48 +02:00
Dean Herbert
96e1ab775e
Merge pull request #8475 from bdach/fix-break-overlay-z-order
Fix break overlay displaying in front of all other player overlays
2020-03-28 13:39:36 +09:00
Dean Herbert
944926e950
Merge branch 'master' into fix-break-overlay-z-order 2020-03-28 13:04:19 +09:00
Dean Herbert
94aa6ab5c9
Merge pull request #8474 from bdach/fix-no-break-info
Fix break overlay not displaying progress information
2020-03-28 12:49:39 +09:00
Dean Herbert
e9dc545429
Merge branch 'master' into fix-no-break-info 2020-03-28 12:39:37 +09:00
Dean Herbert
a317ef65b8 Remove default for argument 2020-03-28 12:18:28 +09:00
Dean Herbert
0471efc885
Merge pull request #8476 from bdach/fix-loader-tests
Improve robustness of loader tests
2020-03-28 11:20:19 +09:00
Bartłomiej Dach
15fb1a099e Modify assert to avoid false failures
In headless tests it was possible for TestInstantLoad() to erroneously
fail. There were two scenarios in which LoadingSpinner could be null:

1. If the test runner was quick enough, the assert could end up running
   even before Loader.OnEntering() had even had a chance to, meaning
   that the spinner was never even actually assigned to or instantiated
   at that point in time.

2. Even if Loader.OnEntering() had managed to run, there was also
   a possibility that the spinner itself wasn't loaded at the point
   of checking the assertion. As the spinner is accessed through
   ChildrenOfType(), which only checks InternalChildren and ignores
   all currently-loading drawables, it would therefore return null.

As null != 0, both of these cases would actually fail the test (this is
best seen running headless, preferably with a [Repeat] attribute
attached).

To resolve, allow the spinner to be null at the point of asserting and
duplicate the assertion step at the end. This weakens the test, as case
(1) should probably be waited for and case (2) could be solved with
exposition as protected in the base, but when attempting to wait for
the loader itself to be loaded there were also cases where the
appropriate until step would take so much time that the spinner would
actually become visible in line with the delayed display logic, so this
is a best-effort attempt to address both points without radical
changes.
2020-03-28 00:43:57 +01:00
Bartłomiej Dach
3a3bfe9a5e Reorder children to fix pause overlay z-order 2020-03-27 21:19:49 +01:00
Bartłomiej Dach
adc759771f Hook up score processor in player 2020-03-27 19:47:42 +01:00
Bartłomiej Dach
46af4bce32 Cover regression in autoplay test 2020-03-27 19:42:45 +01:00
Dean Herbert
4f77850790
Merge pull request #8467 from peppy/update-framework
Update framework
2020-03-27 21:22:39 +09:00
Dean Herbert
6ecfeb8cc3
Merge pull request #8455 from Game4all/handle-novideo-beatmaps
Fix NullReferenceException when starting the no-video version of a beatmap with video
2020-03-27 21:12:40 +09:00
Dean Herbert
5be8934c8c
Merge pull request #8407 from peppy/disable-raw-input
Disable raw input toggle on all but windows
2020-03-27 21:10:02 +09:00
Dean Herbert
f25b1b33e3
Merge pull request #8461 from peppy/fix-minia-mod-replay-recording
Fix osu!mania replays recording incorrectly when key mod applied
2020-03-27 20:55:58 +09:00
Dean Herbert
4106700771 Update framework 2020-03-27 20:51:44 +09:00
Dan Balasescu
3763457a1d
Merge pull request #8451 from peppy/fix-slider-end-sounds
Only play slider end sounds if tracking
2020-03-27 20:38:59 +09:00
Dean Herbert
fdbffbd1db
Merge pull request #8452 from peppy/add-slider-judgement-accuracy
Make slider judgements count towards base score / accuracy
2020-03-27 20:37:26 +09:00
Lucas A
6788b7f9cd Add test for loading storyboards with missing video file. 2020-03-27 12:07:47 +01:00
Dean Herbert
abb5bb14dd
Merge pull request #8450 from peppy/reduce-fruit-spread
Reduce spread of stacked fruit
2020-03-27 19:57:54 +09:00
Dan Balasescu
5e1cb0e9e9
Merge branch 'master' into fix-minia-mod-replay-recording 2020-03-27 19:26:41 +09:00
Dan Balasescu
04b34791cd
Merge branch 'master' into add-slider-judgement-accuracy 2020-03-27 19:26:34 +09:00
Dan Balasescu
005a818f32
Merge branch 'master' into fix-slider-end-sounds 2020-03-27 19:26:32 +09:00
Dan Balasescu
378a957b33
Merge branch 'master' into reduce-fruit-spread 2020-03-27 19:19:23 +09:00
Dan Balasescu
2bbff632c2
Merge pull request #8447 from peppy/fix-break-overlay-scaling
Fix break overlay scaling with gameplay
2020-03-27 19:18:51 +09:00
Dean Herbert
f75c082601 Fix osu!mania replays recording incorrectly when key mod applied 2020-03-27 15:50:11 +09:00
Endrik Tombak
e707adb773 Increase amount of test sets 2020-03-26 21:16:10 +02:00
Endrik Tombak
902734b75e Add failing test 2020-03-26 20:32:43 +02:00
Lucas A
01c9112f82 Add a null check to prevent NRE when playing the "no video" version of a beatmap. 2020-03-26 17:09:22 +01:00
Dean Herbert
f80efd10c2 Avoid using a miss judgement 2020-03-26 19:54:17 +09:00
Dean Herbert
6555ab6ede Only play slider end sounds if tracking 2020-03-26 17:18:27 +09:00
Dean Herbert
8e4896fbbe Make slider judgements count towards base score / accuracy 2020-03-26 17:13:53 +09:00
Dean Herbert
2949e8dc27 Reduce spread of stacked fruit 2020-03-26 16:58:23 +09:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert
d372ddaadd Move break overlay to a location it is not affected by gameplay scale 2020-03-26 12:50:18 +09:00
Dean Herbert
2b1245f63a Improve xmldoc in a couple of places 2020-03-26 12:50:00 +09:00