1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

12786 Commits

Author SHA1 Message Date
Dean Herbert
e7fa043226
Merge pull request #2201 from Vidalee/osu-hd-setting
Add a setting to increase visibility of the first object in "Hidden" mod
2018-06-06 14:41:34 +09:00
Dean Herbert
d3cd267036 Formatting fixes 2018-06-06 14:20:51 +09:00
smoogipoo
e19ca0c120 Add nomod mod type 2018-06-06 14:08:02 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
Dean Herbert
a5679f7bf5 Improve readability of code 2018-06-06 14:04:20 +09:00
Dean Herbert
f253828d49 Fix regressions 2018-06-06 13:51:51 +09:00
Dean Herbert
1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
Dean Herbert
316c928e44
Merge pull request #2692 from smoogipoo/fix-replay-updates
Always update children when the ruleset input manager is updated
2018-06-06 09:58:07 +09:00
Dean Herbert
26569b434c
Merge branch 'master' into fix-replay-updates 2018-06-06 09:40:46 +09:00
Dean Herbert
a133a8229b
Merge branch 'master' into fix-ImportBeatmapTest 2018-06-06 09:34:19 +09:00
Dean Herbert
ce94f87b1f
Merge pull request #2727 from DrabWeb/score-component-tooltips
Rewrite ScoreComponentLabel
2018-06-06 09:32:58 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips 2018-06-06 09:06:22 +09:00
Dean Herbert
21837c64cf
Merge pull request #2698 from Joehuu/source-link-colour
Remove link colours from beatmap tags
2018-06-06 08:51:54 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
DrabWeb
80951eae68 Inherit BeatmapSetDownloader from Component. 2018-06-05 18:09:26 -03:00
Dean Herbert
fe35c0220a Update deploy script 2018-06-05 20:33:55 +09:00
Dean Herbert
59277de0df Remove osu.Desktop.Deploy 2018-06-05 19:45:25 +09:00
Dean Herbert
9af9b1c937 Remove framework submodule reference completely 2018-06-05 19:41:37 +09:00
Dean Herbert
115595251d Remove unnecessary reference in osu.Desktop 2018-06-05 15:02:34 +09:00
Dean Herbert
601ef3b6f7 Consume osu.Framework via nuget 2018-06-05 14:14:56 +09:00
Dean Herbert
3b03a25ea5 Fix beatmaps with subfolders importing incorrectly on windows
Closes #2718.
2018-06-05 11:36:44 +09:00
DrabWeb
4cf7a64636 Remove unused parameter. 2018-06-04 22:26:52 -03:00
DrabWeb
d8154f8cad Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded. 2018-06-04 21:11:27 -03:00
DrabWeb
61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
DrabWeb
c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
DrabWeb
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb
9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00
DrabWeb
698a42f145 BeatmapSetDownloadButton -> BeatmapSetDownloader
Allows it to integrate better with existing buttons, like HeaderButton.
2018-06-04 20:12:43 -03:00
ekrctb
b84441ab87 Fix TestImportOverIPC 2018-06-04 22:25:18 +09:00
Dan Balasescu
69e75bfa09
Merge pull request #2705 from peppy/fix-beatmap-info-wedge-async
Fix incorrect async logic in BeatmapInfoWedge
2018-06-04 20:42:55 +09:00
Dan Balasescu
b2cc7b9a5c
Merge branch 'master' into fix-beatmap-info-wedge-async 2018-06-04 20:29:29 +09:00
Dan Balasescu
877bc3ce5c
Merge pull request #2683 from peppy/better-loading-logo
Improve feel of initial loading osu! logo
2018-06-04 20:29:18 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo 2018-06-04 20:06:22 +09:00
Dan Balasescu
faa305528e
Merge pull request #2721 from peppy/handle-web-request-failures
Fix web request failures not being correctly handled at an APIRequest level
2018-06-04 20:05:54 +09:00
Dan Balasescu
5d45664669
Merge branch 'master' into handle-web-request-failures 2018-06-04 19:49:12 +09:00
Dan Balasescu
6a04e87690
Merge pull request #2716 from peppy/hide-flash-gap
Fix menu flashes not extending to the edge of screen during parallax
2018-06-04 19:49:08 +09:00
Dan Balasescu
f9b6de67b8
Merge branch 'master' into hide-flash-gap 2018-06-04 19:29:10 +09:00
DrabWeb
4bdc1fb781 Remove unused using. 2018-06-04 07:10:33 -03:00
DrabWeb
416384956d Use a protected Downloaded bindable instead of abstract methods. 2018-06-04 06:47:39 -03:00
DrabWeb
7eeba2cf9a Unsubscribe from BeatmapManager events in Dispose. 2018-06-04 06:34:48 -03:00
DrabWeb
b332c22fe5 Update DirectPanel to use BeatmapSetDownloadButton. 2018-06-04 06:29:35 -03:00
DrabWeb
7b7236929a Add BeatmapSetDownloadButton. 2018-06-04 06:08:39 -03:00
Thomas Müller
92377b5810
Merge pull request #2714 from peppy/netcoreapp2.1
Update framework to .NET Core 2.1
2018-06-04 05:43:27 +02:00
Thomas Müller
88b23d4e66
Merge branch 'master' into netcoreapp2.1 2018-06-04 05:30:25 +02:00
Dean Herbert
7701cac297
Merge branch 'master' into overlay-activation 2018-06-04 11:37:14 +09:00
Dean Herbert
27ad1c4ee9
Merge pull request #2725 from ekrctb/fix-TestCaseBeatmapCarousel
Fix TestCaseBeatmapCarousel occasionally failing
2018-06-04 11:24:51 +09:00
Dean Herbert
3ad0735a33
Merge branch 'master' into fix-TestCaseBeatmapCarousel 2018-06-04 11:16:17 +09:00
Dan Balasescu
0f7b23d765
Add param explanatory blurb to xmldoc 2018-06-04 11:11:07 +09:00