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

38946 Commits

Author SHA1 Message Date
Bartłomiej Dach
0bc6a026eb
Merge branch 'master' into skin-components-bind-outwards-accuracy 2021-05-08 21:08:53 +02:00
Bartłomiej Dach
b4a9c7095f
Merge pull request #12705 from peppy/skin-components-bind-outwards-score-display 2021-05-08 21:00:29 +02:00
Bartłomiej Dach
dec5400c0a
Merge branch 'master' into skin-components-bind-outwards-score-display 2021-05-08 19:58:19 +02:00
Bartłomiej Dach
d5efab0648
Merge pull request #12670 from peppy/skin-components-bind-outwards 2021-05-08 19:57:51 +02:00
Bartłomiej Dach
9e0ea494fd
Merge branch 'master' into skin-components-bind-outwards 2021-05-08 19:04:56 +02:00
Bartłomiej Dach
13bd3e95a9
Merge pull request #12698 from peppy/fix-editor-slider-input-handling 2021-05-08 17:08:48 +02:00
Dean Herbert
01d732bb65 Revert "Refactor SliderSelectionBlueprint to not reference blueprint pieces for input handling"
This reverts commit 54fe10c82a.
2021-05-08 23:33:03 +09:00
Dean Herbert
63e267a3be Revert "Trim redundant this qualifier"
This reverts commit df630d9428.
2021-05-08 23:32:52 +09:00
Bartłomiej Dach
942281d6b0 Merge branch 'master' into fix-editor-slider-input-handling 2021-05-08 14:56:18 +02:00
Bartłomiej Dach
df630d9428 Trim redundant this qualifier 2021-05-08 14:53:19 +02:00
Dean Herbert
495eb04e2f
Merge pull request #12488 from Denrage/add-missing-author-links
Add missing author links in Beatmap Details
2021-05-08 05:41:40 +09:00
Dan Balasescu
b475c1a364
Merge pull request #12709 from peppy/update-framework
Update framework
2021-05-07 20:44:59 +09:00
Dean Herbert
5b2f786f97 Update framework 2021-05-07 19:16:00 +09:00
Dean Herbert
4ac234bf7f Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-accuracy 2021-05-07 17:15:57 +09:00
Dean Herbert
6dc591fc44 Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-score-display 2021-05-07 17:15:37 +09:00
Dean Herbert
8d04eba960
Merge pull request #12703 from frenzibyte/editor-wrong-track
Fix editor clock not using the beatmap's virtual track when creating one
2021-05-07 17:12:16 +09:00
Dean Herbert
9d27b11e49 Update skin editor test scene to cache a ScoreProcessor 2021-05-07 17:10:31 +09:00
Dean Herbert
01eff7f316 Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-score-display 2021-05-07 16:30:08 +09:00
Dean Herbert
93f10330e3 Merge branch 'skin-components-bind-outwards' into skin-components-bind-outwards-accuracy 2021-05-07 16:29:10 +09:00
Dean Herbert
ad398165a2 Update AccuracyCounter components to use DI to attach data source 2021-05-07 16:27:25 +09:00
Dean Herbert
17b93361d5
Merge branch 'master' into skin-components-bind-outwards 2021-05-07 16:20:24 +09:00
Dean Herbert
a2e4fb5b6b Update ScoreCounter components to bind outwards 2021-05-07 16:16:48 +09:00
Salman Ahmed
fc2a527e9d Revert "Guard against potentially null track if ever"
This reverts commit b1134c3857.
2021-05-07 09:57:08 +03:00
Salman Ahmed
7c4e54a1d4 Unrevert null-colaescing/conditionals removal 2021-05-07 09:54:14 +03:00
Dean Herbert
165f443ab5 Merge branch 'master' into add-missing-author-links 2021-05-07 14:32:44 +09:00
Salman Ahmed
b1134c3857 Guard against potentially null track if ever 2021-05-07 08:30:50 +03:00
Salman Ahmed
37f44d2e37 Revert wrong not-null track changes
This reverts commit f9d99a9882.
This reverts commit 71547bece0.
2021-05-07 08:28:44 +03:00
Salman Ahmed
71547bece0 Remove any null-coalescing/conditionals in WorkingBeatmap.Track usages 2021-05-07 07:46:23 +03:00
Salman Ahmed
f9d99a9882 Mark WorkingBeatmap.Track as not null 2021-05-07 07:25:14 +03:00
Salman Ahmed
539643c72b Set loadable beatmap track to clock immediately in BDL
This reverts commit 84da247002.

Use loadable beatmap track for clock directly in BDL
2021-05-07 07:21:56 +03:00
Salman Ahmed
84da247002 Fix editor clock using the wrong beatmap track on creation 2021-05-07 05:32:55 +03:00
Dean Herbert
54fe10c82a Refactor SliderSelectionBlueprint to not reference blueprint pieces for input handling 2021-05-07 10:36:03 +09:00
Dean Herbert
fc04b88e1a
Merge pull request #12697 from peppy/update-framework
Update framework
2021-05-06 17:46:08 +09:00
Dean Herbert
39067e6926 Fix slider input handling potentially being offset after composer area resize
Closes https://github.com/ppy/osu/issues/12671.
2021-05-06 17:19:19 +09:00
Dean Herbert
f1b79865bf
Merge pull request #12696 from Joehuu/fix-bg-source-supp-text
Fix warning text of bg source setting not being updated when user with supporter signs in/out
2021-05-06 16:28:30 +09:00
Dean Herbert
af75c9ac82 Update framework 2021-05-06 16:08:28 +09:00
Dean Herbert
ee23124bb1 Remove no-longer-used interface 2021-05-06 15:18:06 +09:00
Joseph Madamba
d4658c609b Fix warning text of bg source setting not being updated when user with supporter signs in/out 2021-05-05 22:54:35 -07:00
Bartłomiej Dach
bb496d05f7
Merge pull request #12626 from peppy/skin-bindables 2021-05-05 21:25:33 +02:00
Bartłomiej Dach
3cac837acf
Merge branch 'master' into skin-bindables 2021-05-05 20:16:27 +02:00
Dean Herbert
cb8bda2248
Merge pull request #12503 from Denrage/split-BufferedWedgeInfo 2021-05-06 03:16:16 +09:00
Dean Herbert
cffeb8641f Make setters private for protected containers 2021-05-06 02:14:57 +09:00
Dean Herbert
fe9ade6754 Rename Container to DisplayedContent 2021-05-06 02:14:04 +09:00
Denrage
b6b9a69601 Removed unnecessary class for wrapping 2021-05-05 18:50:49 +02:00
Denrage
bb385f4255 Reverted difficulty and mod updates 2021-05-05 18:15:59 +02:00
Denrage
2797507758 Reorganized elements for readability 2021-05-05 17:56:07 +02:00
Denrage
88506a51dd reduced complexity 2021-05-05 17:51:29 +02:00
Denrage
5049e2fbf9 Refactored out changes in DifficultyColourBar 2021-05-05 15:28:33 +02:00
Dan Balasescu
42c82cea68
Merge pull request #12685 from peppy/fix-follow-points-going-awry
Fix follow points displaying at incorrect locations when dragging a slider out-of-bounds
2021-05-05 22:25:04 +09:00
Dean Herbert
ed1ae4775f
Merge pull request #12432 from marlinabowring/play-storyboard-outro
Add support for playing storyboards beyond gameplay end time
2021-05-05 22:21:25 +09:00