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

40041 Commits

Author SHA1 Message Date
Andrei Zavatski
82d977f80a Merge remote-tracking branch 'refs/remotes/ppy/master' into news-request 2021-05-26 14:52:42 +03:00
Dean Herbert
7ed4cbf7bf Fix settings panel hide animation looking wrong when a sub-panel is visible when hidden 2021-05-26 19:25:05 +09:00
Dean Herbert
878079d3d7 Fix correct beatmap not being set if running test alone 2021-05-26 19:08:00 +09:00
Dean Herbert
a77de24746 Fix SlowLoadPlayer potentially not being instantiated in time for test 2021-05-26 18:58:18 +09:00
Dean Herbert
14a4095140 Merge branch 'master' into beatmap-skin 2021-05-26 18:39:47 +09:00
Dean Herbert
c05dfee220 Simplify default handling flow 2021-05-26 18:28:00 +09:00
Dean Herbert
7c9383b586 Combine RestorableKeyBindingRow back into KeyBindingRow 2021-05-26 18:17:28 +09:00
Gagah Pangeran Rosfatiputra
db8ccad0b8
Merge branch 'master' into markdown-wiki 2021-05-26 15:25:46 +07:00
Dean Herbert
02806fedb0 Add missing newline 2021-05-26 17:17:02 +09:00
Dean Herbert
17334fd2e6 Inline KeyBindingRow construction 2021-05-26 17:12:12 +09:00
Gagah Pangeran Rosfatiputra
9c31b8856d
change image url replace implementation 2021-05-26 15:10:09 +07:00
Dean Herbert
49b4a6ea67 Replace local namespace qualifiers with using 2021-05-26 17:07:24 +09:00
Gagah Pangeran Rosfatiputra
71f77eb902
fix image test 2021-05-26 15:04:04 +07:00
Dean Herbert
f8a3a37797 Remove outdated comment 2021-05-26 17:01:47 +09:00
Gagah Pangeran Rosfatiputra
47cbbee4d1
remove CreateNotice method and move implementation to local 2021-05-26 15:01:16 +07:00
Dean Herbert
98fa5b67d6
Merge branch 'master' into single-bind-reset-button 2021-05-26 17:01:16 +09:00
Gagah Pangeran Rosfatiputra
eeb6647bc5
remove schedule in set current path 2021-05-26 14:59:36 +07:00
Dean Herbert
1e77a87fab
Merge pull request #12947 from gagahpangeran/markdown-link
Handle link action in `OsuMarkdownLinkText`
2021-05-26 16:56:24 +09:00
Gagah Pangeran Rosfatiputra
02f0e2f212
Merge branch 'markdown-link' into markdown-wiki 2021-05-26 14:55:32 +07:00
Dan Balasescu
34d1d5198f
Merge pull request #12943 from nbvdkamp/fix-zero-area-skin-element-scale-crash
Prevent skin editor crash when scaling 0 area drawables
2021-05-26 16:37:58 +09:00
Gagah Pangeran Rosfatiputra
e02739a136
remove unused colour provider 2021-05-26 13:57:35 +07:00
Gagah Pangeran Rosfatiputra
04f16c0783
Set DocumentUrl inside CreateChildDependencies
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-26 13:55:16 +07:00
Dean Herbert
b3b39c4c13 Fix BeatmapCarousel accessing ScreenSpaceDrawQuad of non-loaded children
Fixes failure seen at
https://ci.appveyor.com/project/peppy/osu/builds/39302762/tests.
2021-05-26 15:42:27 +09:00
Dean Herbert
b36b40cb34 Remove unnecessary double specification 2021-05-26 15:20:47 +09:00
Dean Herbert
e4780abdfd Split out base call from switch statement 2021-05-26 14:43:59 +09:00
Dean Herbert
d165a75823 Inline request flow to make it easier to understand 2021-05-26 14:37:52 +09:00
Dean Herbert
0f21510b8b Move code around 2021-05-26 14:29:46 +09:00
Dean Herbert
8ffa7f4a5a Tidy up code 2021-05-26 14:28:20 +09:00
Dean Herbert
7b09955d59 Remove redundant default bindable value 2021-05-26 14:17:40 +09:00
Dean Herbert
200592114f Make protected variables private 2021-05-26 14:13:02 +09:00
Dean Herbert
cbad7bb7f0 Move taiko Type to Hit and localise all bind handling 2021-05-26 13:40:36 +09:00
Dean Herbert
912748b428 Avoid bindable feedback causing overwrites 2021-05-26 13:24:22 +09:00
Dean Herbert
9223d85f37 Remove all local type update logic from TaikoBeatmapConverter
I believe the original goal was to keep this in the converter with the
idea that samples may not always be hard coupled to the strong/rim
states. But for now I think we can assume this coupling is going to
continue into the near future, so let's keep all the logic in
`TaikoHitObject`.
2021-05-26 13:23:01 +09:00
Swords
07a24d2747 Fixing errors 2021-05-25 23:54:13 +10:00
Swords
9c2dca8229 Removing redundant argument list 2021-05-25 21:53:00 +10:00
Swords
d5feb8353d Formatting, renaming 2021-05-25 21:37:08 +10:00
Swords
d9f5b578bf Restore class names 2021-05-25 21:08:40 +10:00
Swords
ce845a9f8d Apply the rest of requested changes 2021-05-25 21:00:38 +10:00
Dean Herbert
268230c8c4 Merge branch 'master' into fix-taiko-editor-sample-mutations 2021-05-25 19:01:47 +09:00
Dean Herbert
342acadae2 Change LINQ query for better readability 2021-05-25 18:51:51 +09:00
Dean Herbert
871ca8054f Rename classes as per review feedback 2021-05-25 18:50:33 +09:00
Dean Herbert
5ea948aabe Bypass 640x480 coordinate space for video storyboard elements
This allows the `FillMode.Fill` to take up the full space of the
storyboard container.
2021-05-25 16:17:29 +09:00
Dean Herbert
0c55bba220 Allow storyboards to be widescreen if only a video element exists
This matches stable behaviour, which will allow videos to display
filling the screen if they are the only thing contained within the
"storyboard".
2021-05-25 16:07:19 +09:00
Dean Herbert
e3507d5453 Move DrawableStoryboard's aspect application to inside its own class 2021-05-25 16:06:39 +09:00
Dan Balasescu
774611f142
Merge pull request #12933 from peppy/fix-scroll-wheel-gameplay-bindings
Disallow using scroll wheel for gameplay bindings
2021-05-25 16:04:18 +09:00
Gagah Pangeran Rosfatiputra
9de07de467
move text flow container inside markdown container 2021-05-25 12:14:07 +07:00
kamp
65649e5a62 Prevent skin editor crash when scaling 0 area drawables
Some skinnable drawables can have 0 width or height in certain
cases, leading to division by 0 and a crash when the position is
updated.
2021-05-24 21:36:42 +02:00
Gagah Pangeran Rosfatiputra
728258d93a
add website root url as document url 2021-05-25 00:29:59 +07:00
Dan Balasescu
6263ebf9da
Merge pull request #12495 from peppy/localisation-proof-of-concept
Add language selection and general structure for localisation support
2021-05-24 23:33:49 +09:00
Dan Balasescu
3b4fbe22f0
Merge pull request #12928 from Firmatorenio/fix-colour-hitmeter-not-registering-taiko-misses
Fix colour hit error meter incorrectly assuming taiko hits were of correct colour
2021-05-24 23:31:54 +09:00