4131 Commits

• Merge branch 'master' into disallow-beatmap-change
  Dan Balasescu · 2018-06-06 20:26:17 +09:00
  c30861186b
• Give OsuScreen a mutable BindableBeatmap
  smoogipoo · 2018-06-06 20:19:53 +09:00
  e77084bec4
• Explicitly construct local beatmaps rather than using GetBoundCopy
  smoogipoo · 2018-06-06 20:19:30 +09:00
  ff60f69f47
• Rename GameBeatmap -> BindableBeatmap
  smoogipoo · 2018-06-06 20:16:20 +09:00
  72cc53aded
• 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

  smoogipoo · 2018-06-06 18:26:51 +09:00
  4086ff7313
• Move settings to subfolder.
  DrabWeb · 2018-06-06 06:25:34 -03:00
  4aff2ba2af
• Remove label option from SettingsTextBox.
  DrabWeb · 2018-06-06 06:22:16 -03:00
  915a4535d0
• Fix missing null checks
  Dean Herbert · 2018-06-06 18:21:03 +09:00
  9306fec498
• AvailabilityPickerItem -> RoomAvailabilityPickerItem
  DrabWeb · 2018-06-06 05:41:46 -03:00
  766e0d1e17
• Fix RoomSettingsOverlay not being updated when the rooms values are.
  DrabWeb · 2018-06-06 05:38:43 -03:00
  d6e3dc10e9
• Fix field containers padding being wrong.
  DrabWeb · 2018-06-06 05:20:03 -03:00
  a81fc9eb5d
• Update ApplyButton design.
  DrabWeb · 2018-06-06 04:32:04 -03:00
  fe73dbd58c
• Integrate RoomSettingsOverlay into Match.
  DrabWeb · 2018-06-06 04:27:53 -03:00
  a982a4ce37
• Rewrite much state logic
  Dean Herbert · 2018-06-06 16:17:51 +09:00
  55921efffb
• Rename variables
  Dean Herbert · 2018-06-06 15:49:27 +09:00
  d1fd09ed47
• Use UserTriggered in Player
  Dean Herbert · 2018-06-06 15:10:15 +09:00
  86be1bef6b
• Add applying to RoomSettingsOverlay.
  DrabWeb · 2018-06-06 02:38:09 -03:00
  24ba8261a1
• Add AvailabilityPicker.
  DrabWeb · 2018-06-06 02:25:08 -03:00
  4328223996
• Add GameTypePicker.
  DrabWeb · 2018-06-06 02:06:33 -03:00
  33e86cb81e
• Add SettingsTextBox.
  DrabWeb · 2018-06-06 01:29:36 -03:00
  4045ab3669
• Add sections and apply button.
  DrabWeb · 2018-06-06 00:53:24 -03:00
  2c86293f37
• Add empty RoomSettingsOverlay.
  DrabWeb · 2018-06-06 00:29:52 -03:00
  8c97999de9
• Merge https://github.com/ppy/osu into multiplayer-room-settings
  DrabWeb · 2018-06-06 00:19:23 -03:00
  b8e403f38a
• Merge branch 'master' into overlay-activation
  Dean Herbert · 2018-06-06 10:07:22 +09:00
  6be382aab6
• Merge branch 'master' into score-component-tooltips
  Dean Herbert · 2018-06-06 09:06:22 +09:00
  d2633a706d
• Merge branch 'master' into source-link-colour
  Dean Herbert · 2018-06-06 08:27:28 +09:00
  00c8d2ff11
• Merge branch 'master' into fix-beatmap-info-wedge-async
  Dan Balasescu · 2018-06-04 20:29:29 +09:00
  b2cc7b9a5c
• Merge branch 'master' into better-loading-logo
  Dan Balasescu · 2018-06-04 20:06:22 +09:00
  566470e852
• Merge branch 'master' into hide-flash-gap
  Dan Balasescu · 2018-06-04 19:29:10 +09:00
  f9b6de67b8
• Merge branch 'master' into netcoreapp2.1
  Thomas Müller · 2018-06-04 05:30:25 +02:00
  88b23d4e66
• Merge branch 'master' into overlay-activation
  Dean Herbert · 2018-06-04 11:37:14 +09:00
  7701cac297
• Merge branch 'master' into disallow-beatmap-change
  Dean Herbert · 2018-06-04 10:53:04 +09:00
  4b604bf055
• Add tooltip to ScoreComponentLabel.
  DrabWeb · 2018-06-03 22:26:30 -03:00
  a7bab14b30
• Rewrite ScoreComponentLabel.
  DrabWeb · 2018-06-03 22:22:44 -03:00
  db4c26e1ab
• Set 'Colour' when creating 'textFlow'
  Joehu · 2018-06-03 17:41:34 -07:00
  bd7c9cd8bf
• Merge branch 'master' into fix-expand-button-colour
  Dean Herbert · 2018-06-04 02:16:27 +09:00
  7ca437aa8e
• Use default colour in MetadataSection
  Joehu · 2018-06-03 07:51:57 -07:00
  5c713ac2ab
• Fix menu flashes not extending to the edge of screen during parallax
  Dean Herbert · 2018-06-03 22:26:47 +09:00
  3795a55808
• remove white space

  I think

  Aergwyn · 2018-06-03 12:02:43 +02:00
  2afe0feb24
• Merge branch 'master' into overlay-activation
  Aergwyn · 2018-06-03 11:52:33 +02:00
  f0095193b3
• apply feedback

  -don't directly set AllowOverlay Bindable
  this should be done specifically where needed
  -remove AllowOverlay Bindable from ButtonSystem
  -remove unnecessary xmldoc

  Aergwyn · 2018-06-03 11:31:04 +02:00
  707af02097
• Use updateExpanded method
  Joehu · 2018-06-02 12:52:31 -07:00
  0f13acf67e
• Remove link colours for all unlinked text
  Joehu · 2018-06-02 12:04:58 -07:00
  dc2a004c87
• Merge branch 'master' into netcoreapp2.1
  Dean Herbert · 2018-06-03 03:55:33 +09:00
  652e2ccaf5
• Update framework
  Dean Herbert · 2018-06-03 03:05:53 +09:00
  64eda27547
• Merge branch 'master' into participant-count-default
  Dean Herbert · 2018-06-03 03:05:17 +09:00
  eb135b2e85
• Fix SongProgressInfo timespan formatting
  FreezyLemon · 2018-06-02 11:25:49 +02:00
  a0c643fae5
• Use '?:' expression instead
  Joehu · 2018-06-01 15:58:05 -07:00
  8d3de3affb
• Fix visual settings expand button colour
  Joehu · 2018-06-01 15:31:25 -07:00
  5d1421c0e9
• Override Type in Match.
  DrabWeb · 2018-06-01 17:16:35 -03:00
  da8b1f996f