6229 Commits

This Branch

This Branch

All Branches

• Fix nullref error on re-importing a DeletePending beatmap

  Callback was expecting the beatmap to be populated where it wasn't being.

  Dean Herbert · 2017-07-19 14:56:20 +09:00
  5761eb30a0
• Merge pull request #1023 from Tom94/custom-chat-colours

  Use a background for custom-coloured users

  Dean Herbert · 2017-07-19 09:09:56 +09:00
  11ddded6fc
• Ensure toolbar disappears when osu logo transition is cancelled
  Thomas Müller · 2017-07-18 17:09:53 +03:00
  3ba119c115
• Fix osu logo shockwave playing when transition is aborted

  This is a very nice use-case scenario for TransformSequence.OnComplete

  Thomas Müller · 2017-07-18 15:28:56 +03:00
  b40c897dbd
• Update framework
  Thomas Müller · 2017-07-18 15:20:00 +03:00
  ed793328f1
• Merge branch 'master' of https://github.com/ppy/osu into better-transforms

  # Conflicts:
  #	osu-framework
  #	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
  #	osu.Game/Overlays/DragBar.cs

  Thomas Müller · 2017-07-18 15:16:02 +03:00
  4d8261fe0b
• Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
  Thomas Müller · 2017-07-18 12:35:48 +03:00
  6d8bdadf2d
• Sender is always non-null
  Thomas Müller · 2017-07-18 12:35:36 +03:00
  a225b542d5
• Migrate padding into the scroll content to not cut off effects
  Thomas Müller · 2017-07-18 12:26:27 +03:00
  fce5a191f1
• Improve design as requested
  Thomas Müller · 2017-07-18 12:26:05 +03:00
  e58ea97604
• Merge pull request #1024 from Tom94/fix-broken-tooltip

  Fix OsuTooltipContainer.PopIn not overriding PopOut transforms

  Dean Herbert · 2017-07-18 18:11:26 +09:00
  b33c8226c1
• Update framework
  Thomas Müller · 2017-07-18 11:57:41 +03:00
  b2dd43075f
• Fix OsuTooltipContainer.PopIn not overriding PopOut transforms
  Thomas Müller · 2017-07-18 11:53:56 +03:00
  7acff29bd3
• Update framework
  Thomas Müller · 2017-07-18 10:54:57 +03:00
  52acd23a5a
• Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
  Thomas Müller · 2017-07-18 10:54:15 +03:00
  c8eeea64c3
• Highlight custom-named users
  Thomas Müller · 2017-07-18 10:53:41 +03:00
  e72c009dd7
• Merge pull request #966 from jai-sharma/remove-dragbar

  Remove DragBar and replace with classes that inherit SliderBar

  Dean Herbert · 2017-07-18 15:43:40 +09:00
  0034b718a9
• Don't use dodgy OnLoaded "event"
  Dean Herbert · 2017-07-18 15:37:58 +09:00
  4b4b03756a
• Fix dodgy event clearing

  Also use local ariables where possible.

  Dean Herbert · 2017-07-18 15:24:52 +09:00
  82217be988
• Merge remote-tracking branch 'upstream/master' into remove-dragbar

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-07-18 13:44:23 +09:00
  c5d23daa6b
• Merge pull request #949 from MrTheMake/songselect-preview-fix

  Fix not applying song select preview seek

  Dean Herbert · 2017-07-18 13:09:59 +09:00
  ef869cb501
• Merge branch 'master' into songselect-preview-fix
  Dean Herbert · 2017-07-18 13:05:03 +09:00
  b5035ec245
• Rename link class, add hover colour
  Dean Herbert · 2017-07-18 10:51:11 +09:00
  4229f933fe
• Reorder code based on depth (and avoid possible conflicts)
  Dean Herbert · 2017-07-18 10:41:52 +09:00
  ae58e18178
• replace SpriteText with OsuSpriteText
  Jorolf · 2017-07-17 21:12:50 +02:00
  9c70d03a33
• address CI concerns
  Jorolf · 2017-07-17 21:11:54 +02:00
  80dc888769
• add hyper links to twitter, website and skype
  Jorolf · 2017-07-17 20:31:10 +02:00
  edd4e622cf
• make chat message users open UserProfileOverlay
  Jorolf · 2017-07-17 20:26:55 +02:00
  b9eb7a8445
• minor improvements
  Jorolf · 2017-07-17 20:25:57 +02:00
  689866f5dd
• Remove remaining usages of AddDelay
  Thomas Müller · 2017-07-17 18:16:15 +03:00
  440878945e
• Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu
  Thomas Müller · 2017-07-17 17:05:24 +03:00
  546efc0181
• Get rid of raw AddDelay calls within osu.Game
  Thomas Müller · 2017-07-17 16:51:21 +03:00
  87bcd526f3
• Merge pull request #936 from huoyaoyuan/profile

  Basic User Profile Page

  Dean Herbert · 2017-07-17 14:10:52 +09:00
  v2017.717.0 406cf9d0d4
• Rename populate method
  Dean Herbert · 2017-07-17 13:56:50 +09:00
  93290ef966
• User property instead of weirdly named method
  Dean Herbert · 2017-07-17 13:39:29 +09:00
  a63124c935
• One constant per line
  Dean Herbert · 2017-07-17 13:24:05 +09:00
  f322c264a0
• Allow closing profile by clicking basically anywhere
  Dean Herbert · 2017-07-17 10:15:55 +09:00
  5d77a5f988
• Try different formatting style
  Thomas Müller · 2017-07-16 18:28:20 +03:00
  19fb03e737
• Update framework
  Thomas Müller · 2017-07-16 17:48:47 +03:00
  e6916ec57b
• ApplyDelay -> AddDelay
  Thomas Müller · 2017-07-16 17:47:29 +03:00
  032e9df67b
• Replace several usages of BeginDelayedSequence with LINQ-style
  Thomas Müller · 2017-07-16 17:42:01 +03:00
  99221260c4
• Delay -> ApplyDelay; DelayReset -> ResetDelay
  Thomas Müller · 2017-07-16 14:06:46 +03:00
  71105bb9ee
• Update framework
  Thomas Müller · 2017-07-16 13:59:26 +03:00
  6063219b72
• Remove some unnecessary usings
  Thomas Müller · 2017-07-14 19:35:44 +03:00
  5372b94674
• Update framework and fix compilation

  Most issues were related to BeginLoopedSequence usage and lack of
  "this." in front of transform helpers.

  Thomas Müller · 2017-07-14 19:18:12 +03:00
  a5e610a7ba
• Nicer generic rolling counters
  Thomas Müller · 2017-07-14 19:14:07 +03:00
  fd58c6e835
• Prefer ScrollTo in SectionsContainer.
  Huo Yaoyuan · 2017-07-14 22:56:27 +08:00
  26b36c08a3
• Merge branch 'master' into profile
  Huo Yaoyuan · 2017-07-14 22:52:19 +08:00
  6cf36da389
• Merge branch 'master' of https://github.com/ppy/osu into better-transforms
  Thomas Müller · 2017-07-14 16:46:18 +03:00
  b5fbb26f8f
• Use TransformTo in rolling counters
  Thomas Müller · 2017-07-14 16:46:00 +03:00
  c73a1ae058