6006 Commits

This Branch

This Branch

All Branches

• Stop playing previous beatmap even if new beatmap has no track
  Dean Herbert · 2017-07-19 15:16:36 +09:00
  df60fc0f0a
• Don't show theme song in playlist
  Dean Herbert · 2017-07-19 15:16:35 +09:00
  59416584c1
• Add a dummy beatmap provider for use in BeatmapInfoWedge
  Dean Herbert · 2017-07-19 15:16:33 +09:00
  e47faf4e85
• 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
• 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
• 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
• 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 pull request #1009 from peppy/fix-track-rotation

  Fix track rotation

  Dan Balasescu · 2017-07-14 19:48:43 +10:00
  aa15d369c3
• Merge branch 'master' into fix-track-rotation
  Dan Balasescu · 2017-07-14 19:38:48 +10:00
  fa0c0e3b48
• Merge pull request #1016 from peppy/settings-improvements

  Settings improvements

  Dan Balasescu · 2017-07-14 19:32:08 +10:00
  68d1e920fd
• Merge branch 'master' into fix-track-rotation
  Dan Balasescu · 2017-07-14 19:25:54 +10:00
  c13dc943f8
• Merge branch 'master' into settings-improvements
  Dan Balasescu · 2017-07-14 19:22:45 +10:00
  a6d917285a
• Merge pull request #1013 from peppy/right-mouse-scrollbar

  Add support for right mouse absolute scrolling (when enabled)

  Dan Balasescu · 2017-07-14 19:22:29 +10:00
  cb213a5f0f
• Merge branch 'master' into right-mouse-scrollbar
  Dan Balasescu · 2017-07-14 19:15:00 +10:00
  3914b3ba13
• Make comment different
  Dean Herbert · 2017-07-14 18:08:47 +09:00
  b7612af20c
• Use button boundaries to decide when to expand sidebar
  Dean Herbert · 2017-07-14 17:57:01 +09:00
  9dba363b08
• Merge branch 'master' into settings-improvements
  Dan Balasescu · 2017-07-14 18:43:08 +10:00
  3702d4b921
• Merge pull request #978 from EVAST9919/mods_overlay_fix

  Hide "Unranked" text in ModDisplay if play is ranked

  Dean Herbert · 2017-07-14 17:36:46 +09:00
  36594afee3
• Merge branch 'master' into mods_overlay_fix
  Dean Herbert · 2017-07-14 17:31:52 +09:00
  95a40e39ec
• Merge branch 'master' into settings-improvements
  Dean Herbert · 2017-07-14 17:27:09 +09:00
  b957bca4c5
• Merge pull request #970 from DrabWeb/drawable-room-update

  DrawableRoom design update

  Dean Herbert · 2017-07-14 15:35:44 +09:00
  e433684899
• Merge branch 'master' into drawable-room-update
  Dean Herbert · 2017-07-14 15:29:27 +09:00
  3aeed86392
• Merge pull request #1012 from DrabWeb/medal-splash

  Medal splash

  Dean Herbert · 2017-07-14 14:47:24 +09:00
  e2223a24f6
• Formatting
  Dean Herbert · 2017-07-14 14:40:50 +09:00
  bce4b838d8
• Move async loading to a higher level to simplify logic
  Dean Herbert · 2017-07-14 14:39:15 +09:00
  133bcdec7a
• Remove unnecessary alpha/alwayspresent changes
  Dean Herbert · 2017-07-14 14:30:35 +09:00
  980fb18ed6
• Nest delays and implement IStateful, allowing for flushing on early dismiss

  Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.

  Dean Herbert · 2017-07-14 13:25:31 +09:00
  20052b060c
• Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash
  Dean Herbert · 2017-07-14 09:46:36 +09:00
  ab5341eadc
• Merge pull request #1018 from Nabile-Rahmani/skip-button-fix

  Make the skip button clickable only once.

  Dean Herbert · 2017-07-14 09:45:16 +09:00
  e3ff79fdd1
• Add comment
  Dean Herbert · 2017-07-14 09:39:40 +09:00
  6c9219856d