1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:07:25 +08:00
Commit Graph

8049 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
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
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
26569b434c
Merge branch 'master' into fix-replay-updates 2018-06-06 09:40:46 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips 2018-06-06 09:06:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
Dan Balasescu
b2cc7b9a5c
Merge branch 'master' into fix-beatmap-info-wedge-async 2018-06-04 20:29:29 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo 2018-06-04 20:06:22 +09:00
Dan Balasescu
5d45664669
Merge branch 'master' into handle-web-request-failures 2018-06-04 19:49:12 +09:00
Dan Balasescu
f9b6de67b8
Merge branch 'master' into hide-flash-gap 2018-06-04 19:29:10 +09:00
Thomas Müller
88b23d4e66
Merge branch 'master' into netcoreapp2.1 2018-06-04 05:30:25 +02: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
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
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
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
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
88628812c6 Logexceptions when loading ruleset DLLs 2018-06-03 00:28:29 +09:00
FreezyLemon
a0c643fae5 Fix SongProgressInfo timespan formatting 2018-06-02 11:25:49 +02:00
Joehu
8d3de3affb Use '?:' expression instead 2018-06-01 15:58:05 -07:00
Joehu
5d1421c0e9 Fix visual settings expand button colour 2018-06-01 15:31:25 -07:00
DrabWeb
cc32adf51f Move max text updating into updateMax. 2018-06-01 14:28:24 -03:00
Dean Herbert
9b7741b353 Avoid using update for fading logic 2018-06-01 22:19:11 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web 2018-06-01 21:31:18 +09:00
Dean Herbert
5c2a2e394e Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
2018-06-01 20:31:29 +09:00
DrabWeb
59762c0393 Change Room.Participants to an IEnumerable. 2018-06-01 06:15:23 -03:00
DrabWeb
8dd36ee1a9 Default Max to null in ParticipantCount. 2018-06-01 06:08:57 -03:00
Dean Herbert
b9c601074d Formatting fixes 2018-06-01 15:45:09 +09:00
Dean Herbert
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation 2018-06-01 15:31:19 +09:00
Dean Herbert
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover 2018-06-01 15:20:59 +09:00
Joehu
729f2ec725 Match authorinfo with web 2018-05-31 14:34:47 -07:00
Joehu
b4d621a2cb Add link colour to beatmap source 2018-05-31 10:21:22 -07:00
Joehu
1095669a55 Match panel with web 2018-05-31 08:09:19 -07:00
Dean Herbert
b68a5f5eab Tidy up Loader logic 2018-05-31 20:07:44 +09:00
smoogipoo
4eb7a34944 Always update children when ruleset input manager is updated 2018-05-31 18:02:10 +09:00
DrabWeb
6781b81336 Cleanup. 2018-05-31 05:48:42 -03:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover 2018-05-31 17:33:31 +09:00
Dean Herbert
dfbcf4d7b7 Add tests 2018-05-31 17:29:59 +09:00