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

36366 Commits

Author SHA1 Message Date
Bartłomiej Dach
ca0597b38e
Merge branch 'master' into dont-change-ruleset-convert 2022-11-25 19:23:36 +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
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
fca3e7e39f
Merge branch 'master' into editor-seek-control-points 2022-11-24 21:53:47 +01: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
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
2f67199b1c
Merge branch 'master' into fix-missing-day-separator 2022-11-23 18:40:44 +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
30f9cc46a7
Protect offset and bpm adjustments from null selection too 2022-11-23 17:25:43 +01:00
Bartłomiej Dach
508f1f488c
Merge branch 'master' into limit-barline-generation-sanity 2022-11-23 17:12:36 +01: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
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
Dean Herbert
0f034606fd Use LocalisableDescription from BeatmapOnlineStatus enum instead of locally defined 2022-11-23 16:49:51 +09:00
Dean Herbert
a8af83e62a Move label initialisation out of ctor 2022-11-23 16:49:39 +09:00
Dean Herbert
27473262af Rename attributes in enum to match better with user expectations 2022-11-23 16:45:46 +09:00
Dean Herbert
b89689a34a Rename class and reword settings text/tooltips to avoid clashing with other naming 2022-11-23 16:31:50 +09:00
Dean Herbert
a9192c32ea Merge branch 'master' into beatmap-info 2022-11-23 16:10:12 +09:00
Dean Herbert
9b9b8a5977 Add ability to seek between control points in editor using down/up arrows
Matches stable. Addresses #21376.
2022-11-23 15:59:32 +09:00
Dean Herbert
d146f86511 Fix crash when hitting 'T' to tap timing while no timing point is selected 2022-11-23 15:39:56 +09:00
Dean Herbert
172e798847
Merge pull request #21228 from Terochi/recent-messages-implementation
Add ability to view chat send history in input box
2022-11-23 14:58:42 +09:00
Bartłomiej Dach
8dbc38e17a
Remove unused setter 2022-11-22 20:14:22 +01:00
Bartłomiej Dach
76bb529cfa
Add test for local echo adding day separator 2022-11-22 16:46:21 +01:00
Dean Herbert
de163b2bb5 Change song select to only allow volume adjusting if alt is held while scrolling 2022-11-22 19:48:55 +09:00
Dan Balasescu
985781bc3b
Merge pull request #21356 from peppy/standardise-broken-storyboard-paths
Add support for storyboards with incorrect path specifications (`\\` instead of `\`)
2022-11-22 14:33:51 +09:00
Bartłomiej Dach
8dbe31a172
Merge branch 'master' into higher-aspect-ratio-max 2022-11-21 19:51:39 +01:00
Bartłomiej Dach
c0f65d83b3
Merge branch 'master' into hide-no-spin-bonus 2022-11-21 19:14:54 +01:00
Bartłomiej Dach
206aece77b
Merge branch 'master' into avoid-null-audio-device-name-crahs 2022-11-21 16:37:13 +01:00
Bartłomiej Dach
7944d9cefa
Merge pull request #21304 from EVAST9919/beatmap-bar
Rework BarGraph to use Quads
2022-11-21 16:24:18 +01:00
Terochi
d81ef541bc Variant 5: cannot change history, edit resets index 2022-11-21 10:17:28 +01:00
Terochi
7dc7729ac2 Variant 4: cannot change history, empty text/everything selected resets index (current with bug fix) 2022-11-21 10:11:26 +01:00
C0D3 M4513R
93ab1c9432
Merge branch 'master' into beatmap-info 2022-11-21 09:01:24 +00:00
Terochi
58288275a6 Variant 3: cannot change history, cannot reset index (the "default") 2022-11-21 09:43:36 +01:00
Terochi
672e1cd45b Variant 2: edit changes history, cannot reset index (similar to stable) 2022-11-21 09:41:29 +01:00
Terochi
8f942f130b Variant 1: edit changes history, empty text resets index 2022-11-21 09:36:31 +01:00