Commit Graph

8054 Commits

Author SHA1 Message Date
00b4a2519f Update framework 2018-06-06 21:22:22 +09:00
ea1336d243 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 21:09:51 +09:00
a645a109be Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
0a97b8ae25 Implement DebugUtils locally
Has been removed from framework
2018-06-06 18:33:10 +09:00
5a4408e359 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 18:22:22 +09:00
9306fec498 Fix missing null checks 2018-06-06 18:21:03 +09:00
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
9e25e02696 Ensure notifications don't appear during UserTriggered mode
Closes #2640.
2018-06-06 15:50:24 +09:00
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
d3cd267036 Formatting fixes 2018-06-06 14:20:51 +09:00
a5679f7bf5 Improve readability of code 2018-06-06 14:04:20 +09:00
1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
ee92986494 Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
26569b434c Merge branch 'master' into fix-replay-updates 2018-06-06 09:40:46 +09:00
d2633a706d Merge branch 'master' into score-component-tooltips 2018-06-06 09:06:22 +09:00
00c8d2ff11 Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
601ef3b6f7 Consume osu.Framework via nuget 2018-06-05 14:14:56 +09:00
b2cc7b9a5c Merge branch 'master' into fix-beatmap-info-wedge-async 2018-06-04 20:29:29 +09:00
566470e852 Merge branch 'master' into better-loading-logo 2018-06-04 20:06:22 +09:00
5d45664669 Merge branch 'master' into handle-web-request-failures 2018-06-04 19:49:12 +09:00
f9b6de67b8 Merge branch 'master' into hide-flash-gap 2018-06-04 19:29:10 +09:00
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
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
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
0f13acf67e Use updateExpanded method 2018-06-02 12:52:31 -07: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
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
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