475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
ef287eaa7f
Merge branch 'master' into fix-menu-notifications
2018-06-07 15:35:30 +09:00
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
18fc63bac2
Add back removed using
2018-06-06 20:32:37 +09:00
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
e77084bec4
Give OsuScreen a mutable BindableBeatmap
2018-06-06 20:19:53 +09:00
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
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
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +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
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +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
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
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
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
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
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
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
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
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
b4d621a2cb
Add link colour to beatmap source
2018-05-31 10:21:22 -07:00
