18289 Commits

This Branch

This Branch

All Branches

• Fix incorrect DI reference and update naming of SettingsOverlay classes
  Dean Herbert · 2019-05-14 10:45:05 +09:00
  7553e2da25
• Centralise caching of components at OsuGame level
  Dean Herbert · 2019-05-13 17:10:25 +09:00
  4b508915f6
• Merge pull request #4770 from HoLLy-HaCKeR/fix-ctb-2b-diffcalc

  Fix order of nested hitobjects on 2B Catch maps

  Dan Balasescu · 2019-05-13 14:40:37 +09:00
  6e0fbaa96d
• Merge branch 'master' into fix-ctb-2b-diffcalc
  Dan Balasescu · 2019-05-13 14:25:46 +09:00
  173a543853
• Merge pull request #4768 from Joehuu/use-volumemute-icon

  Use VolumeMute icon for mute button

  Dean Herbert · 2019-05-13 09:30:50 +09:00
  79e86071bc
• Merge remote-tracking branch 'upstream/master' into use-volumemute-icon
  Dean Herbert · 2019-05-13 07:24:39 +09:00
  5ea87d9467
• Inherit OsuButton
  Dean Herbert · 2019-05-13 07:24:34 +09:00
  8110d6768c
• Swap profile "play styles" and "last visit" positions to match web (#4767)

  Swap profile "play styles" and "last visit" positions to match web

  Dean Herbert · 2019-05-13 06:54:53 +09:00
  bcabc9d61f
• Merge branch 'master' into fix-ctb-2b-diffcalc
  HoLLy · 2019-05-12 22:09:55 +02:00
  b2cdfceafb
• Change OfType<> to Cast<> to be more clear
  HoLLy · 2019-05-12 22:08:47 +02:00
  cb664dd183
• Fix order of nested hitobjects on 2B Catch maps
  HoLLy · 2019-05-12 21:31:16 +02:00
  3981cf55fa
• Use VolumeMute icon for mute button
  Joehu · 2019-05-12 09:30:43 -07:00
  c119a6a135
• Swap profile play styles and last visit positions
  Joehu · 2019-05-12 09:04:11 -07:00
  f14690e3b8
• Implement skinning for slider border thickness (#4471)

  Implement skinning for slider border thickness
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-13 00:02:04 +09:00
  dc486579fb
• Merge branch 'master' into dev
  Dean Herbert · 2019-05-12 23:13:46 +09:00
  da2338581b
• Fix game not always failing when minimum HP is hit (#4763)

  Fix game not always failing when minimum HP is hit

  Dean Herbert · 2019-05-12 23:13:26 +09:00
  fbb7338ea3
• Use a constant for the default value
  Dean Herbert · 2019-05-12 23:08:42 +09:00
  daa2786dbd
• Fix CI issues
  Dean Herbert · 2019-05-12 22:53:12 +09:00
  487a56549e
• Use more standard parsing method
  Dean Herbert · 2019-05-12 22:53:03 +09:00
  41e13aef23
• Use Precision.AlmostBigger
  Paul Teng · 2019-05-12 09:02:22 -04:00
  1c3b768266
• Merge branch 'master' into dev
  Dean Herbert · 2019-05-12 21:45:52 +09:00
  ce0e4c506e
• Compare Health with small value
  Paul Teng · 2019-05-12 08:44:20 -04:00
  1a6c8e91a5
• Fix clicking "+" tab showing an empty channel in some cases (#4759)

  Fix clicking "+" tab showing an empty channel in some cases
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 21:14:45 +09:00
  50c4e788af
• Merge branch 'master' into patch-1
  Dean Herbert · 2019-05-12 20:30:25 +09:00
  82599127fd
• Move tab channel class into tab item class
  Paul Teng · 2019-05-12 06:31:11 -04:00
  7adaa09263
• Instantiate channel in tab item
  Paul Teng · 2019-05-12 06:26:03 -04:00
  8957ad5a7e
• Check against type instead of channel name
  Paul Teng · 2019-05-12 06:11:16 -04:00
  d53fb9a5c8
• Create separate type for Join-Channel button
  Paul Teng · 2019-05-12 06:02:21 -04:00
  496a9dd41d
• Fix slider border not reverting to default color (#4713)

  Fix slider border not reverting to default color
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 19:00:20 +09:00
  cc298a7e57
• Fix fallbacks for SliderTrackOverride and SliderBall too
  Dean Herbert · 2019-05-12 18:51:31 +09:00
  b8446fb67f
• Merge branch 'master' into fix-slider-border-color
  Dean Herbert · 2019-05-12 17:25:49 +09:00
  cbf126db25
• Don’t allow ResumeContainers to appear during breaks (#4607)

  Don’t allow ResumeContainers to appear during breaks
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 17:25:15 +09:00
  bfa6156092
• Move conditional to within BreakPeriod
  Dean Herbert · 2019-05-12 16:25:25 +09:00
  038e49701e
• Merge branch 'master' into break-pause
  Dean Herbert · 2019-05-12 16:15:24 +09:00
  1391aa342c
• Fix pauses being triggered in unexpected scenarios (#4750)

  Fix pauses being triggered in unexpected scenarios
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 16:07:37 +09:00
  df4e08dd9b
• Merge branch 'master' into fix-more-pause-cases
  Dean Herbert · 2019-05-12 15:57:45 +09:00
  3566da73cc
• Close beatmap options when suspending (#4761)

  Close beatmap options when suspending

  Dean Herbert · 2019-05-12 15:50:10 +09:00
  9add2562f9
• Fix beatmap carousel overlapping beatmap info wedge (#4760)

  Fix beatmap carousel overlapping beatmap info wedge
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 15:49:50 +09:00
  71d3c9c495
• Use more correct calculation
  Dean Herbert · 2019-05-12 15:40:58 +09:00
  790700d8bf
• Merge remote-tracking branch 'upstream/master' into fix-carousel-sizing
  Dean Herbert · 2019-05-12 15:39:55 +09:00
  9925aafa98
• Close beatmap options when suspending
  Joehu · 2019-05-11 21:26:42 -07:00
  175daac16a
• Fix player loader testcase potentially failing (#4720)

  Fix player loader testcase potentially failing
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 13:18:38 +09:00
  f5d7330a20
• Fix beatmap carousel overlapping beatmap info wedge
  Joehu · 2019-05-11 20:08:45 -07:00
  29cec54b3c
• Trim whitespace
  Paul Teng · 2019-05-11 19:21:12 -04:00
  c508b8ed6b
• Ignore Add-channel button
  Paul Teng · 2019-05-11 19:16:15 -04:00
  3971a49549
• Do not try to join the Add-channel button
  Paul Teng · 2019-05-11 19:13:48 -04:00
  6cf1ca288f
• Merge remote-tracking branch 'origin/master' into fix-more-pause-cases

  # Conflicts:
  #	osu.Game.Tests/Visual/Gameplay/TestCasePause.cs

  smoogipoo · 2019-05-10 22:16:59 +09:00
  bde2d552b6
• Remove unused variable
  smoogipoo · 2019-05-10 22:15:33 +09:00
  01eb1a34a9
• Allow song progress bar to show current position during a seek (#4746)

  Allow song progress bar to show current position during a seek
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-05-10 21:10:11 +09:00
  2019.510.0 ad93eda399
• Merge pull request #4743 from peppy/fix-score-deletion

  Fix score deletion not considering ScoreManager ownership

  Dan Balasescu · 2019-05-10 19:25:42 +09:00
  c157f3e817