1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 11:02:54 +08:00
Commit Graph

40203 Commits

Author SHA1 Message Date
Naxess
9860e482af Use TestWorkingBeatmap instead of null in tests
Fixes the warning that #12801 will give.
2021-05-14 05:32:52 +02:00
Dean Herbert
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
Dean Herbert
b36c991ba1 Fix single case of incorrect usage 2021-05-14 12:04:38 +09:00
Dean Herbert
447371478e Switch null assignment to non-nullable warnings on 2021-05-14 12:03:06 +09:00
Naxess
a447f20095 Fix formatting of #nullable enable 2021-05-14 03:38:35 +02:00
Naxess
90e0b3374e
Add #nullable enable
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-14 03:34:50 +02:00
Salman Ahmed
9e8c0a7e70 Fix online play subscreens not pushing player loaders when starting gameplay 2021-05-14 04:25:29 +03:00
Dean Herbert
ddceafb1b0 Update framework 2021-05-14 09:38:25 +09:00
Lucas A
6f248db519 Merge conditional expression. 2021-05-13 19:31:10 +02:00
Lucas A
0caba57945 Make screen properties local to MigrationSelectScreen. 2021-05-13 19:28:23 +02:00
Dean Herbert
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
Bartłomiej Dach
6a64a705b8 Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 17:53:00 +02:00
Bartłomiej Dach
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
Bartłomiej Dach
879ef46354
Merge pull request #12765 from peppy/skin-blueprint-anchor-origin 2021-05-13 17:24:37 +02:00
Dean Herbert
0fa90a80d4
Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 23:38:53 +09:00
Dean Herbert
3ecbb9ec4b
Merge branch 'master' into skin-blueprint-anchor-origin 2021-05-13 23:38:04 +09:00
Dean Herbert
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
Dean Herbert
cef39eb4fa
Merge pull request #12766 from peppy/stable-anchor-origin
Keep component positions stable when changing anchor/origin
2021-05-13 23:36:40 +09:00
Dean Herbert
caa3e1dca5
Merge pull request #12767 from peppy/save-on-forced-exit
Save skin editor changes on forced exit
2021-05-13 23:35:52 +09:00
Lucas A
09a5b9c872 Add XMLDoc to protected members. 2021-05-13 16:28:03 +02:00
Dean Herbert
4183a1c556
Merge pull request #12769 from peppy/remove-skinnable-hud-classes
Remove remaining test usage of SkinnableXXX HUD components
2021-05-13 22:56:18 +09:00
Dean Herbert
6c12cae105 Remove unnecessary property 2021-05-13 22:25:11 +09:00
Dean Herbert
c57a2f43fa Merge branch 'master' into skin-blueprint-visual-improvements 2021-05-13 22:22:42 +09:00
Andrei Zavatski
38c0ba2d10 Implement current year highlight in YearsPanel 2021-05-13 16:16:19 +03:00
Dan Balasescu
63fbbc848e
Merge pull request #12778 from peppy/skin-editor-shortcut-fix
Change default skin editor shortcut to Ctrl+Shift+S
2021-05-13 22:14:03 +09:00
smoogipoo
4cf4817ad2 Remove redundant parens 2021-05-13 22:11:58 +09:00
Dan Balasescu
d2fdd1e521
Merge branch 'master' into stable-anchor-origin 2021-05-13 22:06:21 +09:00
Andrei Zavatski
94543bf000 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-13 16:00:46 +03:00
Dan Balasescu
67f795cfa6
Merge branch 'master' into save-on-forced-exit 2021-05-13 22:00:38 +09:00
smoogipoo
1e23c53507 Fix inspection 2021-05-13 21:59:38 +09:00
smoogipoo
b5afe4e506 Merge branch 'hoc-event-queue' into mania-pooling 2021-05-13 21:53:38 +09:00
smoogipoo
efe2a956df Merge branch 'rework-hitobject-blueprints' into hoc-event-queue 2021-05-13 21:53:29 +09:00
Dan Balasescu
c519e4f558
Merge pull request #12763 from peppy/skin-editor-default-placement-location
Give newly added skin components a centered location to make them easier to find
2021-05-13 21:42:02 +09:00
smoogipoo
362a09ca73 Fix up + reduce complexity of HOCEventQueue 2021-05-13 21:41:49 +09:00
smoogipoo
2307889bf8 Fix incorrect cast 2021-05-13 21:41:28 +09:00
smoogipoo
aaf31af326 Add blueprint transferral 2021-05-13 21:16:19 +09:00
smoogipoo
86042e1763 Implement HitObjectContainerEventQueue 2021-05-13 21:15:47 +09:00
Dan Balasescu
d5b14b6b99
Merge branch 'master' into remove-skinnable-hud-classes 2021-05-13 21:06:48 +09:00
Dan Balasescu
1b62947469
Merge branch 'master' into skin-editor-default-placement-location 2021-05-13 20:58:31 +09:00
Dan Balasescu
746862dcb1
Merge pull request #12750 from peppy/skin-serialisation
Add skin editor saving / loading support
2021-05-13 20:58:03 +09:00
Dean Herbert
ee67c0ddc7
Merge pull request #12768 from frenzibyte/fix-two-hovered-handles
Fix rotation handle visibility logic not handling two handles hovered at one point
2021-05-13 20:57:47 +09:00
smoogipoo
98e77a30d3 Move column changing logic to ManiaSelectionHandler 2021-05-13 20:13:50 +09:00
smoogipoo
1ae57a6105 Fix hold note input test
Not sure why this was checking visibility. If it needs to be tested, it
does not belong in an "Input" test.
2021-05-13 20:11:06 +09:00
Naxess
94538b3842 Remove accidental whitespace 2021-05-13 12:56:36 +02:00
smoogipoo
ffb6135a1b Rework hitobject blueprints to take in hitobject models 2021-05-13 19:53:32 +09:00
Dan Balasescu
3c471837f8
Merge branch 'master' into skin-serialisation 2021-05-13 19:49:55 +09:00
Dan Balasescu
a3869c02f4
Merge branch 'master' into fix-two-hovered-handles 2021-05-13 19:24:42 +09:00
Dean Herbert
b939318922 Merge branch 'skin-serialisation' into skin-editor-default-placement-location 2021-05-13 19:09:34 +09:00
Dean Herbert
e5f765d1a8 Fix broken exception message 2021-05-13 19:06:58 +09:00
Dean Herbert
bda0ea463a Merge branch 'skin-serialisation' into save-on-forced-exit 2021-05-13 19:05:47 +09:00