1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00
Commit Graph

12790 Commits

Author SHA1 Message Date
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
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
Dean Herbert
3a823d6c25 Fix multiple issues causing database reset to fail 2018-06-04 02:12:16 +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
Aergwyn
2afe0feb24 remove white space
I think
2018-06-03 12:02:43 +02:00
Aergwyn
f0095193b3 Merge branch 'master' into overlay-activation 2018-06-03 11:52:33 +02:00
Aergwyn
707af02097 apply feedback
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
Dean Herbert
645f6efce7 Fix web request failures not being correctly handled at an APIRequest level 2018-06-03 13:01:52 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +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
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
53b11155d1
Merge pull request #2695 from Joehuu/match-panel-with-web
Add storyboard icon and fix preview button overlap on direct panels
2018-06-01 22:49:45 +09:00
Dean Herbert
de64e4500f Update framework 2018-06-01 22:20:28 +09: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
e537d8cd6b
Merge pull request #2703 from DrabWeb/room-participants-ienumerable
Change Room.Participants to an IEnumerable
2018-06-01 21:13:25 +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
6b48370092
Merge pull request #2669 from DrabWeb/multiplayer-logic-encapsulation
Multiplayer shared logic encapsulation
2018-06-01 15:58:15 +09: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
03cc4e878e
Merge pull request #2667 from DrabWeb/updateable-beatmap-set-cover
Centralise beatmap set cover update logic
2018-06-01 15:31:08 +09:00
Dean Herbert
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover 2018-06-01 15:20:59 +09:00
Dean Herbert
9c906e3121
Merge pull request #2700 from ppy/osu/fix-authorinfo
Match authorinfo with web
2018-06-01 12:23:32 +09:00