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

27360 Commits

Author SHA1 Message Date
smoogipoo
7fd71d9b6c Adjust conditional 2020-02-21 19:50:16 +09:00
Dan Balasescu
d6b6edce02
Merge branch 'master' into centralise-loading-animations 2020-02-21 19:48:50 +09:00
smoogipoo
4c083e0e7e Add back orphaning as a fail-safe 2020-02-21 19:41:25 +09:00
smoogipoo
05ff4de944 Remove the concept of orphaning and refactor 2020-02-21 19:30:51 +09:00
smoogipoo
4c3468f40e Reorder file 2020-02-21 19:30:45 +09:00
smoogipoo
4fd420e61d Rename method 2020-02-21 19:30:39 +09:00
smoogipoo
a7b5117d88 Fix attempting to add parent comments twice 2020-02-21 19:30:33 +09:00
smoogipoo
1cd84754c8 Add back parent-child linking 2020-02-21 19:27:32 +09:00
smoogipoo
db78b95228 Remove duplicated api request 2020-02-21 19:27:25 +09:00
smoogipoo
957b33b141 Fix included comment properties not being set correctly 2020-02-21 19:27:17 +09:00
Dean Herbert
cf08e036b3
Merge pull request #7817 from EVAST9919/ingame-rankings
Make RankingsOverlay available in-game
2020-02-21 19:24:37 +09:00
Dean Herbert
000787a766
Merge pull request #7935 from peppy/update-framework
Update framework
2020-02-21 19:23:32 +09:00
Dean Herbert
f9d7e7c6b8 Add simple updater support for linux AppImages 2020-02-21 19:16:08 +09:00
Dean Herbert
81f9103f9c Bind with global ruleset for now 2020-02-21 18:54:48 +09:00
Dean Herbert
556131cd5f Merge branch 'master' into ingame-rankings 2020-02-21 18:51:54 +09:00
Dean Herbert
514160e4bb Update framework 2020-02-21 18:38:25 +09:00
Dean Herbert
a55b2b8918 Add explosion effect when catching fruit 2020-02-21 18:09:50 +09:00
Dean Herbert
00b4fc1e1f Add fill to default skin slider ball when tracking 2020-02-21 17:38:23 +09:00
smoogipoo
41c6d2f2e7 Merge remote-tracking branch 'origin/master' into subcomments-alter-new 2020-02-21 17:02:58 +09:00
smoogipoo
37e295e4be Refactor orphaning to better follow osu-web specification 2020-02-21 17:02:48 +09:00
Dean Herbert
0b589eff45 Merge branch 'centralise-loading-animations' into use-loading-inbeatmap-listing 2020-02-21 17:01:13 +09:00
Dean Herbert
e7ac37715f Don't handle non-positional input 2020-02-21 16:31:16 +09:00
Dean Herbert
7d145a7470 Add test for loading spinner with box 2020-02-21 16:21:44 +09:00
Dean Herbert
bbac95958c Fix incorrect test scene name 2020-02-21 16:20:55 +09:00
Dean Herbert
38d9a46ffb Add test for relative sizing scenarios 2020-02-21 16:20:17 +09:00
Dean Herbert
2bda310fa7 Use new loading layer in beatmap listing overlay 2020-02-21 16:13:24 +09:00
Dean Herbert
dacbbb5eee Add a maximum size to ensure things don't get out of hand 2020-02-21 16:11:09 +09:00
Dean Herbert
b94f937f7e Fill in missing xmldoc 2020-02-21 15:35:40 +09:00
Dean Herbert
92f6f0207c Rename LoadingAnimation to LoadingSpinner 2020-02-21 15:33:31 +09:00
Dean Herbert
623b78d675 Combine all loading animation implementations 2020-02-21 15:32:46 +09:00
Andrei Zavatski
da41f4cd3f Add CommentsContainer to ChangelogOverlay 2020-02-21 08:02:40 +03:00
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