19083 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into chat-async-improvements
  Dan Balasescu · 2019-06-21 12:59:58 +09:00
  cbc1eff8f1
• Fix position of gradient in beatmap carousel when scaling UI (#5093)

  Fix position of gradient in beatmap carousel when scaling UI
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-06-21 12:59:38 +09:00
  d0fb08d918
• Add comment for why it's not a fill flow
  Dan Balasescu · 2019-06-21 12:42:35 +09:00
  8ab7a8641b
• Merge branch 'master' into carousel-gradient
  Dan Balasescu · 2019-06-21 12:40:24 +09:00
  0571bbd555
• Merge pull request #5084 from peppy/music-controller-always-present

  Remove necessity for MusicController to be always visible

  Dan Balasescu · 2019-06-21 12:37:12 +09:00
  0cd3e7a35c
• Merge branch 'master' into music-controller-always-present
  Dan Balasescu · 2019-06-21 11:57:36 +09:00
  61d8cb628a
• Merge pull request #5083 from peppy/modselect-async-improvements

  Fix mod icons in ModSelect being loaded in a blocking fashion

  Dan Balasescu · 2019-06-21 11:53:17 +09:00
  daad16b5e7
• Merge branch 'master' into modselect-async-improvements
  Dan Balasescu · 2019-06-21 11:42:25 +09:00
  6deee968ac
• Merge pull request #5076 from peppy/remove-debug-utils

  Remove osu!-side DebugUtils

  Dan Balasescu · 2019-06-21 11:25:22 +09:00
  cd52dbf1a7
• Merge branch 'master' into remove-debug-utils
  Dan Balasescu · 2019-06-21 11:10:59 +09:00
  4d02e17539
• Use correct button type
  Dean Herbert · 2019-06-21 00:26:55 +09:00
  fa94f063be
• Attempt to fix tests
  Dean Herbert · 2019-06-21 00:12:39 +09:00
  fa263b91a7
• Fix failing test
  Dean Herbert · 2019-06-20 23:51:47 +09:00
  7b4180ce86
• Remove necessity for MusicController to be always visible
  Dean Herbert · 2019-06-20 23:40:25 +09:00
  f2200594c9
• Fix mod icons in ModSelect being loaded in a blocking fashion
  Dean Herbert · 2019-06-20 23:06:07 +09:00
  52ca5f9c00
• Improve ChatOverlay load behaviour
  Dean Herbert · 2019-06-20 23:02:02 +09:00
  74fabf8db4
• Fix DrawableChannel async flow
  Dean Herbert · 2019-06-20 23:01:39 +09:00
  4a25a84975
• Fix ChatLine not being correctly loaded asynchronously
  Dean Herbert · 2019-06-20 23:01:02 +09:00
  4ef165fdac
• Fix position of gradient in beatmap carousel
  David Zhao · 2019-06-20 15:05:15 +09:00
  65c84428cc
• Merge pull request #5077 from Joehuu/remove-bad-words-1

  Remove bad words on code comments

  Dan Balasescu · 2019-06-20 13:54:08 +09:00
  35ce032be1
• Remove bad words on code comments
  Joehu · 2019-06-19 21:33:58 -07:00
  ca919f02e6
• Remove osu!-side DebugUtils
  Dean Herbert · 2019-06-20 12:48:45 +09:00
  97d65783db
• Fix a couple of README typos
  Dean Herbert · 2019-06-20 11:23:36 +09:00
  471c5b7386
• Fix beatmap set cover goes out of its container (#5073)

  Fix beatmap set cover goes out of its container

  Dean Herbert · 2019-06-20 11:21:22 +09:00
  7482ecb8e7
• Fix scores header is visible even with no scores (#5074)

  Fix scores header is visible even with no scores

  Dean Herbert · 2019-06-20 11:09:07 +09:00
  a2ca798dc2
• Add a testcase
  Andrei Zavatski · 2019-06-19 23:15:00 +03:00
  e83710d3b8
• Fix scores header is visible even if no scores are loaded
  Andrei Zavatski · 2019-06-19 23:14:53 +03:00
  0da8a483c5
• Enable masking for the beatmap set cover
  iiSaLMaN · 2019-06-19 21:20:00 +03:00
  ee2268caba
• Improve vertical flexibility of BeatmapSetOverlay's header (#5067)

  Improve vertical flexibility of BeatmapSetOverlay's header

  Dean Herbert · 2019-06-20 02:22:19 +09:00
  9858419c69
• Merge branch 'master' into header-improvements
  iiSaLMaN · 2019-06-19 20:00:28 +03:00
  865af00ab6
• Hide empty categories in mod selector overlay (#5021)

  Hide empty categories in mod selector overlay
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-20 01:59:30 +09:00
  a4ceefdc9d
• Rename mod select test scene
  Dean Herbert · 2019-06-20 01:40:58 +09:00
  cd2999d0d1
• Adjust for readability
  Dean Herbert · 2019-06-20 01:39:54 +09:00
  08cf8dd299
• Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty
  Dean Herbert · 2019-06-20 01:35:24 +09:00
  2773cfba42
• Show user online status in user overlay (#5058)

  Show user online status in user overlay

  Dean Herbert · 2019-06-20 01:31:24 +09:00
  bcee8fe9c3
• Separate beatmap info container from details (avoid overlapping)
  iiSaLMaN · 2019-06-19 17:47:47 +03:00
  3e285e5dde
• Make header expandable
  iiSaLMaN · 2019-06-19 17:45:39 +03:00
  15229f3a23
• Add TOP_PADDING
  iiSaLMaN · 2019-06-19 17:38:43 +03:00
  5fb4f2fadf
• Add a testcase
  Andrei Zavatski · 2019-06-19 12:34:01 +03:00
  e16de58450
• Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix
  Andrei Zavatski · 2019-06-19 12:17:31 +03:00
  17749e84f9
• Fix audio being dimmed during multiplayer (#5041)

  Fix audio being dimmed during multiplayer
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-19 14:45:51 +09:00
  82515a52fe
• Merge branch 'master' into fix-multiplayer-audio
  Dean Herbert · 2019-06-19 14:36:05 +09:00
  3043f42eb5
• Merge pull request #5064 from peppy/fix-main-menu-nullref

  Fix startup crash if main menu does not load fast enough

  Dan Balasescu · 2019-06-19 14:17:00 +09:00
  0895a01172
• Merge branch 'master' into fix-multiplayer-audio
  Dean Herbert · 2019-06-19 13:36:25 +09:00
  b51aad7433
• Fix startup crash if main menu does not load fast enough
  Dean Herbert · 2019-06-19 13:16:19 +09:00
  f26fe53feb
• Move logic out of update (and simplify, hopefully)
  Dean Herbert · 2019-06-19 13:15:58 +09:00
  6426983de0
• Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable

  Unbind from previous bindable when rebinding a SettingsItem

  Dean Herbert · 2019-06-19 13:09:19 +09:00
  fbd9ebf02d
• Remove unused property from chat message (#5053)

  Remove unused property from chat message
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-06-19 13:09:04 +09:00
  262129b96b
• Merge branch 'master' into remote-unused-property
  Dan Balasescu · 2019-06-19 11:18:12 +09:00
  aef29e2767
• Merge pull request #5059 from iiSaLMaN/update-framework

  Update framework

  Dean Herbert · 2019-06-19 06:27:13 +09:00
  d0d2be0aca