235 Commits

• Merge branch 'master' into Private_Messages
  miterosan · 2018-07-08 19:29:33 +02:00
  c56a4ea893
• Add "Select" action

  Allows progressing forwards in the interface

  Dean Herbert · 2018-07-03 18:39:15 +09:00
  5fc17bacf3
• Merge branch 'master' into Private_Messages
  miterosan · 2018-07-03 07:58:15 +02:00
  d791216505
• Add back support for closing focused overlays using back key
  Dean Herbert · 2018-07-01 15:52:47 +09:00
  b1403d837e
• Merge branch 'master' into Private_Messages
  miterosan · 2018-06-30 16:17:56 +02:00
  621f4218a3
• Merge branch 'master' into fix-dialog-overlay-sounds
  Dan Balasescu · 2018-06-29 18:45:37 +09:00
  513129d4a8
• Re-privatise
  smoogipoo · 2018-06-29 18:33:28 +09:00
  1e696d247e
• Merge branch 'master' into Private_Messages
  miterosan · 2018-06-28 21:04:02 +02:00
  884ac71874
• Add word wrap support
  Dean Herbert · 2018-06-28 13:04:39 +09:00
  c44a81bdf5
• Merge branch 'master' into fix-dialog-overlay-sounds
  Dean Herbert · 2018-06-27 12:21:29 +09:00
  bebf47d0d5
• Merge branch 'master' into Private_Messages
  miterosan · 2018-06-23 20:44:43 +02:00
  6049303c40
• Rename Stop to StopAnyPlaying for clarity
  Dean Herbert · 2018-06-22 12:35:43 +09:00
  73e13e2d63
• Rework preview tracks to reduce usage complexities
  smoogipoo · 2018-06-21 18:40:27 +09:00
  b2066c5d73
• Fix dialog overlay playing double samples on show/hide
  Dean Herbert · 2018-06-21 16:47:05 +09:00
  a2fa55c426
• Add documentation for negative values of ParallaxAmount
  Dean Herbert · 2018-06-21 12:49:07 +09:00
  74f732038f
• Merge branch 'master' into ParallaxContainerImprovement
  Dean Herbert · 2018-06-21 12:10:10 +09:00
  733b7d1177
• Merge branch 'master' into Private_Messages
  Dean Herbert · 2018-06-21 11:37:19 +09:00
  5157a069bc
• Update framework
  Dean Herbert · 2018-06-19 20:19:52 +09:00
  3819ecb2be
• Merge branch 'master' of https://github.com/ppy/osu into Private_Messages

  # Conflicts:
  #	osu.Game.Tests/Visual/TestCaseChatLink.cs

  miterosan · 2018-06-17 14:15:14 +02:00
  cd0fe6a09e
• Remove easily-confused comment
  Dan Balasescu · 2018-06-15 17:07:07 +09:00
  aaf3ef240e
• Fix incorrect comment
  Dean Herbert · 2018-06-15 16:12:18 +09:00
  a2950b1d80
• Merge branch 'master' into disallow-beatmap-change
  Dan Balasescu · 2018-06-06 20:26:17 +09:00
  c30861186b
• Rename GameBeatmap -> BindableBeatmap
  smoogipoo · 2018-06-06 20:16:20 +09:00
  72cc53aded
• 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
• 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
• Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
  Dean Herbert · 2018-05-31 14:50:20 +09:00
  49a683e386
• add OverlayActivation enum

  + fix Toolbar being toggleable when it shouldn't be able to
  + allow opening overlays in MenuState.Initial again

  Aergwyn · 2018-05-28 13:43:47 +02:00
  2b3a630270
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• Merge branch 'master' into ParallaxContainerImprovement
  Jacob · 2018-05-22 12:10:50 +02:00
  caad47b569
• Fix class name
  Dean Herbert · 2018-05-22 16:04:36 +09:00
  5f8eb6d823
• Merge branch 'master' into ParallaxContainerImprovement
  Jacob · 2018-05-21 20:31:44 +02:00
  e878e65e83
• Share code with HoldToConfirm implementations elsewhere
  Dean Herbert · 2018-05-22 01:44:06 +09:00
  ebda287e81
• expose two Bindables with split logic instead of one with mixed logic
  Aergwyn · 2018-05-21 15:53:55 +02:00
  b7e3ea348b
• Rename for better understanding

  ShowOverlays -> AllowOverlays
  ShowOverlaysOnEnter -> HideOverlaysOnEnter

  Aergwyn · 2018-05-21 09:42:29 +02:00
  1482bca147
• fix VisualTests and Samples still playing
  Aergwyn · 2018-05-20 10:57:15 +02:00
  4d528c4e67
• prevent Overlays from showing in intro/outro sequences
  Aergwyn · 2018-05-18 08:00:05 +02:00
  67db539172
• Use the absolute value of ParallaxAmount to make sure we're not scaling things down when using a negative value for the Parallax (moving against the cursor instead of with it)
  KoziLord · 2018-05-16 01:38:46 +02:00
  d2b2d3e2e0
• Revert the ParallaxContainer changes I made by accident back.
  KoziLord · 2018-05-16 01:27:18 +02:00
  1e88f216f2
• Use the absolute value of ParallaxAmount to make sure we're not scaling stuff down when using a negative ParallaxAmount
  KoziLord · 2018-05-15 15:56:49 +02:00
  be1159444d
• Stop overlays from handling DragStart

  This was causing weird behaviour with the key configuration section and back button in settings.

  Dean Herbert · 2018-05-14 15:44:19 +09:00
  fe1c1fec0d
• Merge remote-tracking branch 'origin/master' into Private_Messages

  # Conflicts:
  #	osu.Game/Online/API/Requests/GetMessagesRequest.cs
  #	osu.Game/Overlays/Chat/ChatTabControl.cs

  miterosan · 2018-05-06 19:45:33 +02:00
  ba5861b527
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-20 18:05:24 +09:00
  27437cfbaf
• Make forum posts a web link
  Dean Herbert · 2018-04-20 13:01:23 +09:00
  8649ddc68b
• Merge remote-tracking branch 'origin/master' into Private_Messages
  miterosan · 2018-04-18 20:55:12 +02:00
  3b68dda23e
• Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
  Dean Herbert · 2018-04-18 13:08:53 +09:00
  f62677222c
• Merge remote-tracking branch 'upstream/master' into wave-container
  Dean Herbert · 2018-04-15 21:03:18 +09:00
  ae77c010e2
• Merge remote-tracking branch 'origin/master' into Private_Messages
  miterosan · 2018-04-14 13:31:03 +02:00
  5bfb386226
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Rename var chatmanager -> channelManager

  Apply requested changes

  miterosan · 2018-04-12 23:19:13 +02:00
  e39f5a1adf