Commit Graph

48538 Commits

Author SHA1 Message Date
843da30f9d Reformatting 2021-05-15 01:52:16 +10:00
6a52622b3f Merge branch 'single-bind-reset-button' of https://github.com/holaswords/osu into single-bind-reset-button 2021-05-15 01:31:40 +10:00
1603b92211 Reformatting 2021-05-15 01:30:54 +10:00
85174793b1 Merge branch 'master' into single-bind-reset-button 2021-05-15 01:07:32 +10:00
753bdf2083 Fixed formatting 2021-05-15 01:04:15 +10:00
0725088fde Well it works, just pretty ugly looking. 2021-05-15 01:01:17 +10:00
a4c1b9a1a7 Rename startTime to fadeStartTime 2021-05-14 21:56:13 +08:00
a86a4bab91 Remove empty override 2021-05-14 21:55:32 +08:00
393ac4fdd1 Destruct declaration 2021-05-14 21:30:58 +08:00
67dfeeb1b7 Cleanup code in ModHidden 2021-05-14 21:29:13 +08:00
7c2fc9b412 Update usage due to nullability removal 2021-05-14 16:12:33 +03:00
93007c1635 Merge branch 'current-star-rating' into player-loader-star-rating 2021-05-14 16:06:00 +03:00
6cc678f497 Remove nullability and transition support from star rating display 2021-05-14 16:05:40 +03:00
0dc3bfd0c1 Apply simple transforms to star rating display when ready if not 2021-05-14 15:55:26 +03:00
db361efecf Add test beatmap difficulty cache with calc. blocking support 2021-05-14 15:53:56 +03:00
e0728a6e19 Make BeatmapDifficultyCache.GetDifficultyAsync virtual 2021-05-14 15:52:36 +03:00
a1d63243a4 Merge pull request #12800 from frenzibyte/online-play-oversight
Fix online play subscreens not pushing player loaders when starting gameplay
2021-05-14 20:44:44 +09:00
34aab11ff3 Add null star rating display test case 2021-05-14 14:25:46 +03:00
0655825057 Separate changing star rating display to own test 2021-05-14 14:25:13 +03:00
f5dd18f266 Use existing LoadedBeatmapSuccessfully bool instead
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-05-14 16:53:51 +09:00
67a99c83a3 Tidy bindable changed code up 2021-05-14 16:24:52 +09:00
fcb226bd20 Add local variable for regular access to HitObjects 2021-05-14 16:23:45 +09:00
9069db0743 Fix case of hitObjects variables 2021-05-14 16:22:19 +09:00
d09da02673 Fix deleting skin elements not saving out to skin
Closes https://github.com/ppy/osu/issues/12786.
2021-05-14 16:03:22 +09:00
32ff406289 Add database tracking of beatmap creator user_ids 2021-05-14 15:40:29 +09:00
8338f702c3 Remove not required null conditional 2021-05-14 09:32:56 +03:00
dc576c19b4 Fix a potential nullref when starting Player with autoplay enabled and beatmap fails to load 2021-05-14 15:10:02 +09:00
48672f8afd Add very basic test logic to ensure PlayerLoader is present for playlists 2021-05-14 15:02:36 +09:00
1d4bcbaa6e Merge pull request #12796 from peppy/update-framework
Update framework
2021-05-14 14:43:54 +09:00
dbc2318710 Initial tidying up 2021-05-14 14:13:35 +09:00
475c7e4a45 Merge pull request #12802 from peppy/random-component-toolbox-plaaceholders
Randomise the values displayed in the skinning toolbox
2021-05-14 13:38:43 +09:00
9860e482af Use TestWorkingBeatmap instead of null in tests
Fixes the warning that #12801 will give.
2021-05-14 05:32:52 +02:00
46e7d9e0ed Randomise the values displayed in the skinning toolbox
To stop the spam of "WYSI" comments everywhere. I guess I underestimated
the negative effect this would have.
2021-05-14 12:15:58 +09:00
b36c991ba1 Fix single case of incorrect usage 2021-05-14 12:04:38 +09:00
447371478e Switch null assignment to non-nullable warnings on 2021-05-14 12:03:06 +09:00
a447f20095 Fix formatting of #nullable enable 2021-05-14 03:38:35 +02:00
90e0b3374e Add #nullable enable
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-14 03:34:50 +02:00
9e8c0a7e70 Fix online play subscreens not pushing player loaders when starting gameplay 2021-05-14 04:25:29 +03:00
ddceafb1b0 Update framework 2021-05-14 09:38:25 +09:00
ac04e8afa2 Change name of option "Custom seed" to "Seed" and set its value to the generated seed 2021-05-14 01:50:11 +02:00
a9d5211e81 Remove seed from the ScorePanel and "Paste" button 2021-05-14 01:42:39 +02:00
6f248db519 Merge conditional expression. 2021-05-13 19:31:10 +02:00
0caba57945 Make screen properties local to MigrationSelectScreen. 2021-05-13 19:28:23 +02:00
10f008ae62 Merge pull request #12780 from peppy/skin-blueprint-aspect-lock
Add aspect ratio locking and flip support to skin editor
2021-05-14 00:55:18 +09:00
6a64a705b8 Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 17:53:00 +02:00
25b1443c50 Remove dead branch and mark implementation as temporary
The previous implementation was checking if the `x0` or `x2` anchors
were selected to decide on which way to transfer the drawable's scale,
but that check actually ends up being always true for corner anchors. To
visualise, this is how the corner anchors correspond to `Anchor` flags:

    x0  x1  x2
    |   |   |
y0 -O---O---O-
    |   |   |
y1 -O---+---O-
    |   |   |
y2 -O---O---O-
    |   |   |

The Os indicate where the reference anchors are on a selection box.
The first conditional eliminates the middle ones, which makes sense.
But after excluding them from further deliberations (marking via X):

    x0  x1  x2
    |   |   |
y0 -O---X---O-
    |   |   |
y1 -X---+---X-
    |   |   |
y2 -O---X---O-
    |   |   |

The remaining anchors always have `x0` or `x2` set. So to avoid
confusion, just always transfer one way for now. At some point this
should be torn out in favour of an actual implementation of the desired
behaviour.
2021-05-13 17:50:12 +02:00
879ef46354 Merge pull request #12765 from peppy/skin-blueprint-anchor-origin 2021-05-13 17:24:37 +02:00
0fa90a80d4 Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 23:38:53 +09:00
3ecbb9ec4b Merge branch 'master' into skin-blueprint-anchor-origin 2021-05-13 23:38:04 +09:00
98830dadda Merge pull request #12762 from peppy/skin-blueprint-visual-improvements
Improve the visual appearance of skin editor blueprints
2021-05-13 23:37:21 +09:00