19824 Commits

This Branch

This Branch

All Branches

• Fix code style
  HoLLy · 2019-06-24 18:09:42 +02:00
  7734c4b41a
• Merge branch 'master' into user_profile_modes
  Dean Herbert · 2019-06-25 00:59:51 +09:00
  6a541d9a10
• Allow controlling music and effect volume via arrow keys when h… (#5135)

  Allow controlling music and effect volume via arrow keys when hovering
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-24 22:21:08 +09:00
  12faffc7b8
• Merge branch 'master' into music-effect-arrow-keys-hover
  Dean Herbert · 2019-06-24 21:49:45 +09:00
  c0b5153094
• Merge pull request #2996 from HoutarouOreki/quickEscape

  Add quick exit hotkey

  Dean Herbert · 2019-06-24 19:02:42 +09:00
  afaea9a5fa
• Merge branch 'master' into generic-download-model-manager
  Dean Herbert · 2019-06-24 18:35:58 +09:00
  88b182ab3f
• Fix licence header
  Dean Herbert · 2019-06-24 18:34:23 +09:00
  f91467eddc
• Merge branch 'master' into quickEscape
  Dean Herbert · 2019-06-24 18:21:39 +09:00
  bd2f34a102
• Change case to match; change hotkey to be more globally usable (previous has conflict on macOS)
  Dean Herbert · 2019-06-24 18:19:17 +09:00
  2ea5165803
• Add correct conditionals to allow exit
  Dean Herbert · 2019-06-24 18:15:27 +09:00
  fad1ced1b5
• Merge remote-tracking branch 'upstream/master' into quickEscape
  Dean Herbert · 2019-06-24 18:14:48 +09:00
  d70248338d
• Add basic skinning capabilities to osu!catch catcher (#5128)

  Add basic skinning capabilities to osu!catch catcher
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-24 18:03:48 +09:00
  b40eefcf7c
• Update TabControl in User Overlay in line with the web version (#5057)

  Update TabControl in User Overlay in line with the web version
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-06-24 18:03:32 +09:00
  5aa98a4da3
• Replace Reset with overridden TransformImmediately/TransformDuration
  HoLLy · 2019-06-24 10:51:45 +02:00
  aed83471f4
• Merge remote-tracking branch 'upstream/master' into catch-catcher-skinning
  Dean Herbert · 2019-06-24 17:45:33 +09:00
  cc9e46f8ee
• Add missing using
  Dean Herbert · 2019-06-24 17:38:11 +09:00
  2473a9487a
• Merge branch 'master' into useroverlay-tabs
  Dean Herbert · 2019-06-24 17:27:47 +09:00
  6e2138491b
• Add SkinnableSprite class (#5137)

  Add SkinnableSprite class

  Dean Herbert · 2019-06-24 17:11:21 +09:00
  303fb508af
• Merge branch 'master' into skinnable-sprite
  Dean Herbert · 2019-06-24 16:33:17 +09:00
  36d54fdbfc
• Merge pull request #5109 from Aergwyn/add-numberbox

  Add OsuNumberBox

  Dan Balasescu · 2019-06-24 15:33:04 +09:00
  dfbcbf443a
• Move method below ctor
  Dean Herbert · 2019-06-24 15:27:46 +09:00
  06eaba766b
• Add some more xmldoc
  Dean Herbert · 2019-06-24 15:25:01 +09:00
  9593e66a96
• Merge branch 'master' into add-numberbox
  Dan Balasescu · 2019-06-24 15:22:30 +09:00
  18d64df0c4
• Use SkinnableSprite for approach circle
  Dean Herbert · 2019-06-24 15:17:56 +09:00
  aca9289d89
• Add SkinnableSprite implementation
  Dean Herbert · 2019-06-24 15:17:35 +09:00
  3f22c0a311
• Make test a bit more sane
  Dean Herbert · 2019-06-24 15:10:50 +09:00
  9ab5204947
• Remove pointless SkinReloadableDrawable specification
  Dean Herbert · 2019-06-24 15:10:50 +09:00
  9baf8160d1
• Use SkinnableSprite to reduce complexity of implementation
  Dean Herbert · 2019-06-24 15:10:50 +09:00
  d9f7011769
• Allow controlling music and effect volume by arrow keys when hovering
  Joehu · 2019-06-23 22:53:02 -07:00
  7ac6558f59
• Merge pull request #5127 from peppy/custom-tournament-header

  Allow customisation of the colour portion of the tournament logo header

  Dan Balasescu · 2019-06-24 14:45:08 +09:00
  85fdf7d97f
• Add SkinnableSprite implementation
  Dean Herbert · 2019-06-24 14:39:20 +09:00
  06b087db70
• Merge branch 'master' into custom-tournament-header
  Dan Balasescu · 2019-06-24 14:35:51 +09:00
  8708d69351
• Rename test scene
  smoogipoo · 2019-06-24 13:47:37 +09:00
  2a4bd612d7
• Merge remote-tracking branch 'origin/master' into catch-catcher-skinning
  smoogipoo · 2019-06-24 13:40:51 +09:00
  003bdda765
• Merge pull request #5116 from EVAST9919/useroverlay-overall-improvements

  Update user overlay sections design in line with the web version

  Dan Balasescu · 2019-06-24 13:40:37 +09:00
  0265f57f55
• Fix unsafe caching of dependencies
  smoogipoo · 2019-06-24 13:37:06 +09:00
  4cd8b6a2bd
• Merge branch 'master' into useroverlay-overall-improvements
  Dan Balasescu · 2019-06-24 13:28:17 +09:00
  00a2aa7881
• Use .Darken() instead of hex-based colour
  smoogipoo · 2019-06-24 13:27:58 +09:00
  5272b3a929
• Fix multiplayer create button appearing in match song selection (#5132)

  Fix multiplayer create button appearing in match song selection

  Dean Herbert · 2019-06-24 12:31:39 +09:00
  1057301322
• Merge pull request #5130 from mulraf/master

  Fix dialog going off-screen when UI scaling is applied

  Dean Herbert · 2019-06-24 12:30:26 +09:00
  0717eccd04
• Merge branch 'master' into master
  Dan Balasescu · 2019-06-24 12:15:06 +09:00
  64628e6174
• Fix multiplayer create button appearing in match song selection
  smoogipoo · 2019-06-24 11:54:41 +09:00
  8d6fc3edf0
• Merge pull request #5131 from peppy/fix-timing-tests

  Fix test timing regressions due to increased step count

  Dan Balasescu · 2019-06-24 11:49:16 +09:00
  e89fb409ae
• Make things a bit more sensible
  Dean Herbert · 2019-06-24 11:43:34 +09:00
  c988dfbdaa
• Remove unnecessary type specification
  Dean Herbert · 2019-06-24 11:10:29 +09:00
  024157b13f
• Allow tests to be run in non-sequential order
  Dean Herbert · 2019-06-24 11:09:59 +09:00
  da2ba5bf09
• Fix test timing regressions due to increased step count
  Dean Herbert · 2019-06-24 11:00:00 +09:00
  4ec064e179
• Add missing blank line
  Andrei Zavatski · 2019-06-24 02:09:00 +03:00
  bbdb114f04
• Remove useless bindable check
  Andrei Zavatski · 2019-06-24 02:01:00 +03:00
  35db20a337
• Finally fix the problem when we can't apply a ruleset in the multi screen

  because it's disabled

  Andrei Zavatski · 2019-06-24 01:55:35 +03:00
  94e819578e