1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 19:22:56 +08:00
Commit Graph

27279 Commits

Author SHA1 Message Date
Dan Balasescu
e18d736e4a
Merge pull request #7795 from EVAST9919/comment-editor
Implement CommentEditor component
2020-02-21 13:34:55 +09:00
smoogipoo
5acaf9b371 Privatise setter 2020-02-21 12:33:49 +09:00
smoogipoo
2cb218c9c4 Merge remote-tracking branch 'origin/master' into comment-editor 2020-02-21 12:27:34 +09:00
Dean Herbert
d41da49713
Merge pull request #7911 from peppy/split-out-pulp-formations
Split out pulp formations into individual classes
2020-02-21 12:14:35 +09:00
Dean Herbert
8ec95e4e29
Merge pull request #7929 from ppy/dependabot/nuget/DiscordRichPresence-1.0.150
Bump DiscordRichPresence from 1.0.147 to 1.0.150
2020-02-21 12:13:11 +09:00
Dean Herbert
5489137ee2
Merge pull request #7928 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2020.221.0
Bump ppy.osu.Game.Resources from 2020.219.0 to 2020.221.0
2020-02-21 12:13:04 +09:00
dependabot-preview[bot]
b7e14569eb
Bump DiscordRichPresence from 1.0.147 to 1.0.150
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.147 to 1.0.150.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-21 03:11:10 +00:00
dependabot-preview[bot]
0f088cc2c2
Bump ppy.osu.Game.Resources from 2020.219.0 to 2020.221.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.219.0 to 2020.221.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.219.0...2020.221.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-21 03:10:48 +00:00
Dan Balasescu
8d48008dd5
Merge branch 'master' into split-out-pulp-formations 2020-02-21 11:45:06 +09:00
Dan Balasescu
aededd6699
Merge pull request #7901 from peppy/catch-droplet-rotation
Add osu!catch droplet rotation animation
2020-02-21 11:44:51 +09:00
Dean Herbert
9344f62cf0 Merge branch 'master' into catch-droplet-rotation 2020-02-21 11:09:02 +09:00
Dan Balasescu
9815a0ab66
Merge pull request #7902 from peppy/catch-drawable-namespace
Rename drawable namespace to avoid clashes with framework class
2020-02-21 11:07:16 +09:00
Dean Herbert
1bc649e6d9
Merge pull request #7873 from mcendu/remove-mania-skinnable-test
Make osu!mania's TestSceneDrawableJudgement use shared SkinnableTestScene
2020-02-21 10:54:39 +09:00
Dean Herbert
d275bc8a61 Add test steps for droplet / tiny droplet 2020-02-21 10:44:48 +09:00
Dean Herbert
a7e3e8ace9 Merge branch 'master' into catch-drawable-namespace 2020-02-21 10:31:31 +09:00
Dean Herbert
8a6a424893
Merge branch 'master' into catch-droplet-rotation 2020-02-21 10:31:02 +09:00
Dean Herbert
f84f829fe5
Merge pull request #7881 from peppy/catch-fruit-skinning
Implement osu!catch fruit skinning support
2020-02-21 10:30:29 +09:00
Dean Herbert
cd666166d5
Merge pull request #7809 from voidedWarranties/proposal-difficulty-icon-select
Allow selecting/playing a specific difficulty using the beatmapset difficulty icons
2020-02-21 10:24:12 +09:00
Dean Herbert
ab49f88fd9
Merge pull request #7863 from TheWildTree/adjust-beatmap-overlay
Adjust font sizes and spacing in BeatmapSetOverlay to match osu-web values
2020-02-21 10:20:22 +09:00
smoogipoo
6468bfa543 Apply adjustments 2020-02-21 10:01:38 +09:00
Dean Herbert
db4fe4f728
Merge branch 'master' into adjust-beatmap-overlay 2020-02-21 09:52:44 +09:00
Dean Herbert
4fb4c03956
Merge pull request #7779 from Malox10/hoverable-timestamps
Add tooltips with precise dates to beatmap set overlay
2020-02-21 09:48:22 +09:00
Dan Balasescu
1bea3619af
Merge pull request #7922 from peppy/improve-processing-overlay
Improve visual appearance of ProcessingOverlay
2020-02-21 09:13:24 +09:00
Dean Herbert
6c21cc3926
Adjust easing type to match in disposal clause
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-02-21 08:55:12 +09:00
Dan Balasescu
7adedcb7b9
Fix typo
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-21 08:34:51 +09:00
Dean Herbert
3380dbbd71 Improve visual appearance of ProcessingOverlay 2020-02-20 19:49:22 +09:00
Dan Balasescu
0bbc4abb35
Merge pull request #7921 from peppy/multiplayer-design-fixes
Improve consistency of buttons in multiplayer
2020-02-20 19:18:07 +09:00
Dean Herbert
4a3f281855 Make buttons purple 2020-02-20 18:56:14 +09:00
Dean Herbert
a0b578082e Make ready button also have triangles 2020-02-20 18:56:00 +09:00
Dean Herbert
e7fca689b1 Change text on playlist add button to be nicer 2020-02-20 18:56:00 +09:00
Dean Herbert
76c57a695b Change create room button colouring to match design 2020-02-20 18:56:00 +09:00
Dean Herbert
a94a6eb94e
Merge pull request #7900 from smoogipoo/room-inspector-redesign
Update the multiplayer room inspector design
2020-02-20 18:55:03 +09:00
Dean Herbert
06d3de98b2
Merge pull request #7909 from smoogipoo/multiplayer-header-background
Add a global multiplayer background header
2020-02-20 18:36:26 +09:00
Dean Herbert
973093b522 Fix non-selectable playlist items not forwarding clicks to children 2020-02-20 18:32:34 +09:00
Dean Herbert
063fe191ef Add back missing using 2020-02-20 18:15:40 +09:00
Dean Herbert
e25e9b6164 Merge branch 'master' into multiplayer-header-background 2020-02-20 18:04:02 +09:00
Dean Herbert
a11862ba0d Improve transition between multiplayer screens (and share constants) 2020-02-20 18:03:53 +09:00
Dean Herbert
927115a085
Merge branch 'master' into room-inspector-redesign 2020-02-20 17:41:16 +09:00
Dean Herbert
627ee50f3d
Merge pull request #7899 from smoogipoo/overlined-display-refactor
Refactor overlined displays to support different sizing modes
2020-02-20 17:40:21 +09:00
Dean Herbert
e48166858c
Merge branch 'master' into overlined-display-refactor 2020-02-20 17:38:04 +09:00
Dean Herbert
d82258ede6
Merge branch 'master' into catch-fruit-skinning 2020-02-20 17:26:07 +09:00
Dean Herbert
3cbaf6ebbc
Merge pull request #7898 from peppy/catch-fix-cycle-rate
Fix osu!catch not cycling fruit as often as it should be
2020-02-20 17:25:52 +09:00
Dean Herbert
8c8e756149
Merge pull request #7896 from peppy/combo-colour-independence
Move DrawableHitObject accent colour update duties to ruleset
2020-02-20 17:01:58 +09:00
Dean Herbert
5c16dbbea9
Merge pull request #7919 from smoogipoo/null-leaderboard-position
Support null leaderboard position
2020-02-20 16:27:24 +09:00
Dan Balasescu
33382a7a41
Merge branch 'master' into catch-fix-cycle-rate 2020-02-20 16:17:24 +09:00
Dan Balasescu
6759310d2a
Merge branch 'master' into combo-colour-independence 2020-02-20 16:17:12 +09:00
Dan Balasescu
ae86fa367c
Merge pull request #7897 from peppy/fix-index-transfer
Fix indices in beatmap not being transferred to children
2020-02-20 16:16:42 +09:00
Dean Herbert
049975b5a4 Use kebaberize shorthand 2020-02-20 15:45:54 +09:00
Dean Herbert
8f5d3896f6 Remove unnecessary cast by changing method siganture 2020-02-20 15:45:47 +09:00
Dean Herbert
5551343cf3 Throw instead of null return 2020-02-20 15:45:25 +09:00