1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 04:32:53 +08:00
Commit Graph

12581 Commits

Author SHA1 Message Date
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
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
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
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
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
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
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
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
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
Dean Herbert
4b828b1048 Fix incorrect release build vscode configurations 2018-06-04 10:37:24 +09:00
DrabWeb
a7bab14b30 Add tooltip to ScoreComponentLabel. 2018-06-03 22:26:30 -03:00
DrabWeb
db4c26e1ab Rewrite ScoreComponentLabel. 2018-06-03 22:22:44 -03:00
Joehu
bd7c9cd8bf Set 'Colour' when creating 'textFlow' 2018-06-03 17:41:34 -07:00
Dean Herbert
281299ef0e
Merge pull request #2710 from Joehuu/fix-expand-button-colour
Fix initial state of visual settings expand button colour
2018-06-04 02:24:32 +09:00
Dean Herbert
7ca437aa8e
Merge branch 'master' into fix-expand-button-colour 2018-06-04 02:16:27 +09:00
Joehu
7101533926 Remove 'description' field 2018-06-03 08:02:57 -07:00
Joehu
5c713ac2ab Use default colour in MetadataSection 2018-06-03 07:51:57 -07:00
ekrctb
ed1918cd43 Wait for loading beatmaps 2018-06-03 23:11:45 +09:00
Dean Herbert
3795a55808 Fix menu flashes not extending to the edge of screen during parallax 2018-06-03 22:26:47 +09:00
Dean Herbert
645f6efce7 Fix web request failures not being correctly handled at an APIRequest level 2018-06-03 13:01:52 +09:00
Joehu
0f13acf67e Use updateExpanded method 2018-06-02 12:52:31 -07:00
Joehu
dc2a004c87 Remove link colours for all unlinked text 2018-06-02 12:04:58 -07:00
Dean Herbert
652e2ccaf5
Merge branch 'master' into netcoreapp2.1 2018-06-03 03:55:33 +09:00
Dean Herbert
68910745d8
Merge pull request #2702 from DrabWeb/participant-count-default
Default ParticipantCount.Max to null
2018-06-03 03:55:23 +09:00
Dean Herbert
ea3d97a757 Update appveyor to support netcore2.1 2018-06-03 03:05:58 +09:00
Dean Herbert
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
Dean Herbert
eb135b2e85
Merge branch 'master' into participant-count-default 2018-06-03 03:05:17 +09:00
Dean Herbert
941a1b616c
Merge pull request #2713 from FreezyLemon/fix-songprogress-time-formatting
Fix song progress elapsed time rounding up on some cultures
2018-06-03 02:42:34 +09:00
Dean Herbert
88628812c6 Logexceptions when loading ruleset DLLs 2018-06-03 00:28:29 +09:00
Dean Herbert
6781807e23 Remove unnecessary EF tools references 2018-06-03 00:28:10 +09:00
Dean Herbert
d287e32faf Update project build configurations to target netcoreapp2.1 2018-06-02 22:20:17 +09:00