24822 Commits

This Branch

This Branch

All Branches

• Remove redundant variable, handle all request failures
  naoey · 2019-06-19 19:43:09 +05:30
  4b46601eae
• Move the horizontal margin into the sprite text itself
  KingLuigi4932 · 2019-06-19 15:05:53 +03:00
  a6c268ef5c
• Remove empty line
  KingLuigi4932 · 2019-06-19 14:47:29 +03:00
  475b40cc02
• Use TextFlowContainer + small changes
  KingLuigi4932 · 2019-06-19 14:43:18 +03:00
  4600336581
• 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 colour issues
  Andrei Zavatski · 2019-06-19 12:15:32 +03:00
  1c44fa84fb
• Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs
  Andrei Zavatski · 2019-06-19 12:08:34 +03:00
  c8604b2c17
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2019-06-19 14:55:34 +09:00
  dd926f55bd
• Remove migration code
  Dean Herbert · 2019-06-19 14:55:28 +09:00
  d6469aed58
• 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 generic-download-model-manager
  Dean Herbert · 2019-06-19 12:50:54 +09:00
  26c32ceeb1
• Merge branch 'master' into remote-unused-property
  Dan Balasescu · 2019-06-19 11:18:12 +09:00
  aef29e2767
• Fix another test
  KingLuigi4932 · 2019-06-19 04:27:31 +03:00
  6e28294182
• Seperate updateable from drawable
  KingLuigi4932 · 2019-06-19 03:50:16 +03:00
  97dd34e26c
• More simplifies + fix test
  KingLuigi4932 · 2019-06-19 03:37:08 +03:00
  3876442143
• Revert some changes + simplify BeatmapNotAvailable
  KingLuigi4932 · 2019-06-19 01:43:28 +03:00
  a0609f28d7
• Merge branch 'master' into not-available-to-download
  iiSaLMaN · 2019-06-19 01:14:32 +03:00
  5278c5f365
• Merge branch 'master' into use-modelbackeddrawable
  Dean Herbert · 2019-06-19 06:27:36 +09:00
  bc8ce5d188
• Merge pull request #5059 from iiSaLMaN/update-framework

  Update framework

  Dean Herbert · 2019-06-19 06:27:13 +09:00
  d0d2be0aca
• Add missing space
  Andrei Zavatski · 2019-06-18 21:04:36 +03:00
  2fb1052a1e
• Update framework
  KingLuigi4932 · 2019-06-18 20:37:56 +03:00
  a5adc89839
• Make generic covariant
  Dean Herbert · 2019-06-19 01:57:38 +09:00
  1bcff8a3e2
• Merge branch 'master' into android
  Dean Herbert · 2019-06-19 01:48:21 +09:00
  a2cba24f73
• Simplify download method
  Dean Herbert · 2019-06-19 01:41:19 +09:00
  341dc74834
• Move private event handling logic to bottom of class
  Dean Herbert · 2019-06-19 01:32:37 +09:00
  f2e0ced052
• Merge branch 'master' into generic-download-model-manager
  Dean Herbert · 2019-06-19 01:29:06 +09:00
  d65c20bbdc
• Initial implementation
  Andrei Zavatski · 2019-06-18 19:13:21 +03:00
  03d560ed41
• Make ProfileTabControl based on OverlayTabControl
  Andrei Zavatski · 2019-06-18 16:23:57 +03:00
  3c3757f12e
• Implement OverlayTabControl class

  An abstraction for OverlayHeaderTabControl

  Andrei Zavatski · 2019-06-18 16:20:35 +03:00
  a7306248d1
• Merge branch 'master' into tournament-tools
  Dean Herbert · 2019-06-18 20:20:13 +09:00
  7b68ac667b
• Remove test which is failing due to magic numbers (#5055)

  Remove test which is failing due to magic numbers

  Dean Herbert · 2019-06-18 20:19:00 +09:00
  f15df51514
• Update Android Framework reference to 2019.615.0

  # Conflicts:
  #	osu.Android.props

  Dan Silk · 2019-06-18 20:06:33 +09:30
  35ad9d5240
• Merge branch 'master' into android
  Shane Woolcock · 2019-06-18 20:05:14 +09:30
  17d103181c
• Remove test which is failing due to magic numbers
  Dean Herbert · 2019-06-18 18:31:42 +09:00
  2d20c088f7
• Merge pull request #5052 from peppy/make-osu-button-instantiable

  Make OsuButton non-abstract again

  Dan Balasescu · 2019-06-18 18:29:35 +09:00
  9776494c63
• Merge branch 'make-osu-button-instantiable' into tournament-tools
  Dean Herbert · 2019-06-18 18:06:09 +09:00
  1ca0047956
• Merge branch 'remote-unused-property' into tournament-tools
  Dean Herbert · 2019-06-18 18:06:06 +09:00
  fd9a759cba
• Merge branch 'settings-item-unbind-previous-bindable' into tournament-tools
  Dean Herbert · 2019-06-18 18:06:03 +09:00
  5c523dbe60
• Revert unnecessary changes to APIBeatmap
  Dean Herbert · 2019-06-18 18:03:16 +09:00
  4911bf1157
• Add missing space
  Dean Herbert · 2019-06-18 17:59:47 +09:00
  9a319e3f96
• Add more functionality and share more logic between editor screens
  Dean Herbert · 2019-06-18 17:59:33 +09:00
  ba589b2139
• Use OsuButton everywhere
  Dean Herbert · 2019-06-18 17:17:46 +09:00
  711214ed09