3627 Commits

• Merge branch 'master' into Private_Messages
  miterosan · 2018-06-28 21:04:02 +02:00
  884ac71874
• Move to local components namespace
  Dean Herbert · 2018-06-28 19:23:56 +09:00
  8ba2ac922f
• Tidy up code, remove unnecessary string.Formats
  Dean Herbert · 2018-06-28 19:19:00 +09:00
  0ef5b8f464
• Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates
  Dean Herbert · 2018-06-28 19:14:47 +09:00
  98fec94693
• Add word wrap support
  Dean Herbert · 2018-06-28 13:04:39 +09:00
  c44a81bdf5
• Cleanup
  smoogipoo · 2018-06-27 12:59:19 +09:00
  f8acd9e451
• 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
• Lengthen PopIn transition slightly
  Dean Herbert · 2018-06-22 14:26:24 +09:00
  3824354cb8
• Merge remote-tracking branch 'upstream/master' into make-loading-more-visible
  Dean Herbert · 2018-06-22 14:21:01 +09:00
  fccd4f965c
• Improve the visibility of the global loading animation

  Updates design to match new `osu-web` design.
  Adds TestCase for visual testing.

  Dean Herbert · 2018-06-22 13:14:43 +09:00
  eb6d6dc2de
• 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
• Add some default LengthLimit to OsuTextBox
  Michael Manis · 2018-06-18 19:49:12 -04:00
  53bd3a1c30
• 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
• Set text at updateTime
  HoutarouOreki · 2018-06-15 14:34:01 +02:00
  38feb7651c
• DrawableJoinDate handles "Here since the beginning" text
  HoutarouOreki · 2018-06-15 14:28:49 +02:00
  d122547c1e
• Adjust formats to be EN-UK
  HoutarouOreki · 2018-06-15 14:11:21 +02:00
  f0fbc04d92
• 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
• Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

  # Conflicts:
  #	osu.Game/Overlays/Music/PlaylistOverlay.cs
  #	osu.Game/Screens/OsuScreen.cs

  smoogipoo · 2018-05-28 18:01:15 +09:00
  a3470f9ec3
• Move screen titles to OsuScreen
  Dean Herbert · 2018-05-28 13:30:24 +09:00
  02c37ebc1f
• Merge branch 'master' into CursorOverrideContainer-rename
  Dean Herbert · 2018-05-26 12:19:47 +09:00
  79442ad238
• Forgot file name
  HoutarouOreki · 2018-05-25 21:20:42 +02:00
  63fb9ddec4
• Rename CursorOverrideContainer to MenuCursorContainer
  HoutarouOreki · 2018-05-25 21:13:40 +02:00
  e2d840c2de
• Try satisfying AppVeyor
  HoutarouOreki · 2018-05-25 14:25:12 +02:00
  39224931f8
• Add license header to the new file
  HoutarouOreki · 2018-05-25 14:10:54 +02:00
  71c04f4605
• Remove horizontal white space
  HoutarouOreki · 2018-05-25 14:05:50 +02:00
  29fbdf4d92
• Remove not removed comment
  HoutarouOreki · 2018-05-25 14:04:12 +02:00
  e3ebc849c5
• Create Format(), override TooltipText..
  HoutarouOreki · 2018-05-25 14:00:32 +02:00
  3efb51e464
• Make TooltipText virtual
  HoutarouOreki · 2018-05-25 13:31:12 +02:00
  a446b627da
• Create DrawableJoinDate somehow and remove dateFormat argument
  HoutarouOreki · 2018-05-25 13:30:29 +02:00
  05b0564381
• Apply the format fix to the tooltip text across the board
  HoutarouOreki · 2018-05-25 13:05:41 +02:00
  961702aadf
• Add and use default size (smaller than before)
  Dean Herbert · 2018-05-25 18:51:57 +09:00
  1cb7d50407
• Document parameters more properly
  HoutarouOreki · 2018-05-23 12:07:28 +02:00
  29de8e5e2d
• Apply suggested changes
  HoutarouOreki · 2018-05-23 11:17:13 +02:00
  10bc3917b5
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• Allow formatting for DrawableDate class
  HoutarouOreki · 2018-05-23 03:24:18 +02:00
  6cf227a7af