88b23d4e66
Merge branch 'master' into netcoreapp2.1
2018-06-04 05:30:25 +02:00
7701cac297
Merge branch 'master' into overlay-activation
2018-06-04 11:37:14 +09:00
0f7b23d765
Add param explanatory blurb to xmldoc
2018-06-04 11:11:07 +09:00
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
a7bab14b30
Add tooltip to ScoreComponentLabel.
2018-06-03 22:26:30 -03:00
db4c26e1ab
Rewrite ScoreComponentLabel.
2018-06-03 22:22:44 -03:00
bd7c9cd8bf
Set 'Colour' when creating 'textFlow'
2018-06-03 17:41:34 -07:00
7ca437aa8e
Merge branch 'master' into fix-expand-button-colour
2018-06-04 02:16:27 +09:00
3a823d6c25
Fix multiple issues causing database reset to fail
2018-06-04 02:12:16 +09:00
7101533926
Remove 'description' field
2018-06-03 08:02:57 -07:00
5c713ac2ab
Use default colour in MetadataSection
2018-06-03 07:51:57 -07:00
3795a55808
Fix menu flashes not extending to the edge of screen during parallax
2018-06-03 22:26:47 +09:00
2afe0feb24
remove white space
...
I think
2018-06-03 12:02:43 +02:00
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02:00
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
645f6efce7
Fix web request failures not being correctly handled at an APIRequest level
2018-06-03 13:01:52 +09:00
2ccffb9ac4
Add difficulty calculation mod types
2018-06-03 10:59:56 +09:00
0f13acf67e
Use updateExpanded method
2018-06-02 12:52:31 -07:00
9b69e1825d
Make PreviewTrack.owner private
2018-06-02 22:06:45 +03:00
dc2a004c87
Remove link colours for all unlinked text
2018-06-02 12:04:58 -07:00
652e2ccaf5
Merge branch 'master' into netcoreapp2.1
2018-06-03 03:55:33 +09:00
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
eb135b2e85
Merge branch 'master' into participant-count-default
2018-06-03 03:05:17 +09:00
88628812c6
Logexceptions when loading ruleset DLLs
2018-06-03 00:28:29 +09:00
5bb6757cbd
Remove unused previewTrackManager parameter
2018-06-02 13:03:17 +03:00
70120aa14c
Remove unused previewTrackManager variable
2018-06-02 12:28:16 +03:00
a0c643fae5
Fix SongProgressInfo timespan formatting
2018-06-02 11:25:49 +02:00
8d3de3affb
Use '?:' expression instead
2018-06-01 15:58:05 -07:00
5d1421c0e9
Fix visual settings expand button colour
2018-06-01 15:31:25 -07:00
330ce19041
Make PreviewTrack a component and use LoadComponentAsync
2018-06-01 23:36:25 +03:00
da8b1f996f
Override Type in Match.
2018-06-01 17:16:35 -03:00
5073057420
Cleanup.
2018-06-01 16:34:03 -03:00
a103acbd97
Merge https://github.com/ppy/osu into multiplayer-match
2018-06-01 16:27:38 -03:00
97b473ef30
Expose tabs and hide beatmap select button in Header.
2018-06-01 16:23:11 -03:00
5566732664
Get rid of PreviewTrackManager.onTrackStart and PreviewTrackManager.onTrackStop delegates
2018-06-01 21:36:30 +03:00
88ac427ba6
PreviewTrack.Owner
2018-06-01 21:06:37 +03:00
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
9b7741b353
Avoid using update for fading logic
2018-06-01 22:19:11 +09:00
ae6f603d16
Merge branch 'master' into match-panel-with-web
2018-06-01 21:31:18 +09:00
5c2a2e394e
Fix incorrect async logic in BeatmapInfoWedge
...
Closes #2653 .
Alternative to #2657 .
2018-06-01 20:31:29 +09:00
59762c0393
Change Room.Participants to an IEnumerable.
2018-06-01 06:15:23 -03:00
8dd36ee1a9
Default Max to null in ParticipantCount.
2018-06-01 06:08:57 -03:00
9989517ff0
Merge https://github.com/ppy/osu into multiplayer-match
2018-06-01 04:01:14 -03:00
b9c601074d
Formatting fixes
2018-06-01 15:45:09 +09:00
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation
2018-06-01 15:31:19 +09:00
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover
2018-06-01 15:20:59 +09:00
729f2ec725
Match authorinfo with web
2018-05-31 14:34:47 -07:00
b4d621a2cb
Add link colour to beatmap source
2018-05-31 10:21:22 -07:00
1095669a55
Match panel with web
2018-05-31 08:09:19 -07:00
b68a5f5eab
Tidy up Loader logic
2018-05-31 20:07:44 +09:00