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

57282 Commits

Author SHA1 Message Date
Bartłomiej Dach
894ef15e79
Merge branch 'master' into update-framework 2022-11-26 16:19:36 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dean Herbert
a1c559ae05 Update framework 2022-11-27 00:00:12 +09:00
Bartłomiej Dach
a841d35ebd
Merge pull request #21417 from peppy/dont-change-ruleset-convert
Avoid changing ruleset when presenting a beatmap if it can be converted
2022-11-25 19:59:57 +01:00
Bartłomiej Dach
ca0597b38e
Merge branch 'master' into dont-change-ruleset-convert 2022-11-25 19:23:36 +01:00
Bartłomiej Dach
c4122c1854
Merge pull request #21403 from peppy/triangle-button-v2
Update most game buttons to use new outlined triangles style
2022-11-25 19:21:06 +01:00
Bartłomiej Dach
73176a1315
Merge branch 'master' into triangle-button-v2 2022-11-25 18:35:59 +01:00
Bartłomiej Dach
bbbc1d0428
Darken colour of playlists create button
To match d0c4637683.
2022-11-25 18:23:28 +01:00
Dean Herbert
5ada9efa60 Update outdated comment regarding colour choices 2022-11-25 22:10:20 +09:00
Dean Herbert
76e9382e0b Fix triangles showing on ExpandableButtons when in contracted state 2022-11-25 20:18:35 +09:00
Dean Herbert
d0c4637683 Lighten colour of multiplayer create game button 2022-11-25 20:18:21 +09:00
Dean Herbert
b0f14d4963 Clamp AimCount to ensure at least one triangle is spawned 2022-11-25 20:14:21 +09:00
Dean Herbert
4cb068ceb9 Change AimCount to not consider height 2022-11-25 20:10:04 +09:00
Dean Herbert
2425878e67 Add test coverage 2022-11-25 20:06:36 +09:00
Dean Herbert
25410c9962 Avoid changing ruleset when presenting a beatmap if it can be converted
Closes #21415.
2022-11-25 19:48:01 +09:00
Bartłomiej Dach
e99be3b4f5
Merge pull request #21387 from peppy/editor-seek-control-points
Add ability to seek between control points in editor using down/up arrows
2022-11-24 22:30:40 +01:00
Bartłomiej Dach
fca3e7e39f
Merge branch 'master' into editor-seek-control-points 2022-11-24 21:53:47 +01:00
Dean Herbert
ba0990d43e Update test assumptions 2022-11-25 01:51:41 +09:00
Dean Herbert
f6e229c24d "Fix" mod copy failure 2022-11-25 01:15:11 +09:00
Dean Herbert
2b2beadd06 Merge branch 'master' into update-framework 2022-11-25 01:00:08 +09:00
Dean Herbert
6ad432b311 Use RoundedButton in more places 2022-11-24 16:33:01 +09:00
Dean Herbert
53b03df93d Combine TriangleButton and RoundedButton classes 2022-11-24 16:26:57 +09:00
Dean Herbert
bea2acc60e Remove local specifications of triangle colouring 2022-11-24 16:18:15 +09:00
Dean Herbert
4fbca4037c Update existing triangle buttons to use RoundedButton 2022-11-24 16:18:15 +09:00
Dean Herbert
40f706155f Update RoundedButton to have new triangles design 2022-11-24 16:18:15 +09:00
Dean Herbert
44a71741e4
Merge pull request #21225 from EVAST9919/triangles-v2
Implement TrianglesV2 component
2022-11-24 16:15:25 +09:00
Dean Herbert
8914a871c1
Merge pull request #21065 from C0D3-M4513R/beatmap-info
Add Beatmap Information elements
2022-11-24 15:22:04 +09:00
Dean Herbert
2e277ef40a Update resources 2022-11-24 15:18:49 +09:00
Dean Herbert
a2438428a2 Move base call to end 2022-11-24 13:57:43 +09:00
Dean Herbert
37f725bfa2 Reverse directionality of up/down traversal keys to match scroll 2022-11-24 13:55:58 +09:00
C0D3 M4513R
4b44f31b5e
Use LocaliseableStings in BeatmapAttributeText 2022-11-23 21:02:43 +01:00
Bartłomiej Dach
8d3b418da0
Merge pull request #21349 from peppy/fix-missing-day-separator
Fix chat day separator not being added on pending message resolution
2022-11-23 19:38:33 +01:00
Bartłomiej Dach
2f67199b1c
Merge branch 'master' into fix-missing-day-separator 2022-11-23 18:40:44 +01:00
Bartłomiej Dach
224bf85e4a
Merge pull request #21386 from peppy/fix-editor-tap-timing-crash
Fix crash when hitting 'T' to tap timing while no timing point is selected
2022-11-23 18:40:13 +01:00
Bartłomiej Dach
60422be9af
Merge branch 'master' into fix-editor-tap-timing-crash 2022-11-23 17:51:50 +01:00
Bartłomiej Dach
1ad9d66e65
Merge pull request #21351 from peppy/limit-barline-generation-sanity
Limit how far before the first hitobject that barlines can be generated
2022-11-23 17:51:10 +01:00
Dean Herbert
b381b4fd2d Merge branch 'master' into update-framework 2022-11-24 01:27:58 +09:00
Dean Herbert
3acf15c7b8 Update framework 2022-11-24 01:26:49 +09:00
Bartłomiej Dach
30f9cc46a7
Protect offset and bpm adjustments from null selection too 2022-11-23 17:25:43 +01:00
Bartłomiej Dach
cf5f5a4de3
Extend tap timing control test coverage in no point selected case 2022-11-23 17:25:34 +01:00
Bartłomiej Dach
508f1f488c
Merge branch 'master' into limit-barline-generation-sanity 2022-11-23 17:12:36 +01:00
Bartłomiej Dach
06449b62f1
Add test coverage for crash scenario 2022-11-23 16:11:57 +01:00
Andrei Zavatski
2204af04e4 Improve test scene to better show colour gradient 2022-11-23 16:12:13 +03:00
Dean Herbert
8d0fe61aff
Merge pull request #21224 from honguyenminh/VerticalStackedCatchTouchInput
Vertically stacked osu!catch touch input
2022-11-23 18:55:20 +09:00
Dean Herbert
5467097387 Fix adjacent day separators potentially being left behind after pending message resolution 2022-11-23 18:49:51 +09:00
Dean Herbert
f9d952220f Fix barlines being misaligned if generation start time is clamped 2022-11-23 18:12:03 +09:00
Dean Herbert
e69ed67335 Add test of barline generation with negative start time control point 2022-11-23 18:11:52 +09:00
Dean Herbert
a6bba1967e Update serialisation test to match new comopnent naming 2022-11-23 17:06:22 +09:00
Dean Herbert
774f70e380 Simplify class structure 2022-11-23 16:56:40 +09:00
Dean Herbert
0749a7bb07 Simplify attribute assignment 2022-11-23 16:53:36 +09:00