17120 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into simplify-gameplay-clock
  Dean Herbert · 2019-03-05 20:22:46 +09:00
  8a6fa0915e
• Use a safer method of setting the clock
  Dean Herbert · 2019-03-05 20:14:04 +09:00
  558dbafb71
• Fix potential infinite loop
  Dean Herbert · 2019-03-05 20:06:04 +09:00
  d5943330b1
• Merge pull request #4412 from LeNitrous/local-leaderboard-display

  Fix local leaderboard not displaying when logged out

  Dean Herbert · 2019-03-05 19:33:17 +09:00
  cc855a8dcc
• Rename PauseContainer
  Dean Herbert · 2019-03-05 19:30:55 +09:00
  76ce3954a0
• Fix typo

  Co-Authored-By: peppy <pe@ppy.sh>

  Dan Balasescu · 2019-03-05 18:50:46 +09:00
  fafc80818c
• Add documentation for FetchScores
  Dean Herbert · 2019-03-05 18:48:59 +09:00
  f98d55531f
• Merge branch 'master' into local-leaderboard-display
  Nathan Alo · 2019-03-05 17:43:28 +08:00
  2a741d5853
• Merge pull request #4411 from smoogipoo/fix-custom-sample-volume

  Fix volume not being considered for file samples

  Dean Herbert · 2019-03-05 18:41:52 +09:00
  424e02f165
• only check IsLoggedIn after requesting scores
  LeNitrous · 2019-03-05 17:34:23 +08:00
  8ad258f426
• Merge pull request #4374 from Joehuu/status-direct-list

  Add beatmap status on direct list panels

  Dean Herbert · 2019-03-05 18:22:56 +09:00
  5aaa2511eb
• Merge pull request #4158 from LeNitrous/show-mods-on-loader

  Show mods on player loading screen

  Dan Balasescu · 2019-03-05 18:22:14 +09:00
  0f6f8c5af5
• Fix volume not being considered for file samples
  smoogipoo · 2019-03-05 18:21:29 +09:00
  a08086cc8a
• Merge remote-tracking branch 'origin/master' into show-mods-on-loader
  smoogipoo · 2019-03-05 18:08:11 +09:00
  aefaceb397
• Merge branch 'master' of https://github.com/ppy/osu
  LeNitrous · 2019-03-05 17:01:04 +08:00
  d66b0e3039
• Remove null check (beatmap cannot be null)
  smoogipoo · 2019-03-05 17:58:30 +09:00
  c06dac5b1a
• Combine creation + assignment
  smoogipoo · 2019-03-05 17:58:05 +09:00
  2fee7276ae
• Merge pull request #4101 from Joehuu/update-beatmap-sections

  Update osu!direct beatmap categories sorting

  Dean Herbert · 2019-03-05 17:52:46 +09:00
  34ae3c111c
• Merge branch 'master' into show-mods-on-loader
  Dan Balasescu · 2019-03-05 17:46:35 +09:00
  bb6c83ab25
• Merge branch 'master' into update-beatmap-sections
  Dan Balasescu · 2019-03-05 17:39:47 +09:00
  8e99f54fed
• Merge pull request #4320 from peppy/fix-disabled-set-crash

  Ensure beatmap is not disabled before continuing with present

  Dan Balasescu · 2019-03-05 17:34:49 +09:00
  ebd9eb35e3
• Merge branch 'master' into fix-disabled-set-crash
  Dan Balasescu · 2019-03-05 17:25:13 +09:00
  fd147dae21
• Remove using
  smoogipoo · 2019-03-05 17:23:11 +09:00
  896088bc02
• Fix sizings
  smoogipoo · 2019-03-05 17:14:49 +09:00
  d01ec59acb
• Add testcase
  smoogipoo · 2019-03-05 17:14:30 +09:00
  4764a771d0
• Prefill some more properties of TestWorkingBeatmap
  smoogipoo · 2019-03-05 17:14:24 +09:00
  e73cef5f94
• Fix excess line
  Dean Herbert · 2019-03-05 16:41:11 +09:00
  9a9b4efb8d
• Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock
  Dean Herbert · 2019-03-05 16:41:01 +09:00
  93c79023dc
• Update RulesetInputManager to support new clock structure more accurately
  Dean Herbert · 2019-03-05 16:34:50 +09:00
  ec063a13db
• Revert "Use same size labels from song select"

  This reverts commit 7077e405ab.

  smoogipoo · 2019-03-05 16:02:07 +09:00
  76aca738a9
• Merge pull request #4398 from peppy/limit-blank-lines

  Enforce max consecutive blank lines

  Dean Herbert · 2019-03-05 15:45:10 +09:00
  a676eed2f9
• Merge branch 'master' into limit-blank-lines
  Dan Balasescu · 2019-03-05 15:40:11 +09:00
  b5fb6e2a59
• Merge pull request #4134 from Aergwyn/move-osu-settings

  Move osu! specific settings into its own ConfigManager

  Dan Balasescu · 2019-03-05 15:40:01 +09:00
  0267ed855a
• Merge branch 'master' into move-osu-settings
  Dan Balasescu · 2019-03-05 15:32:54 +09:00
  07c7d03a04
• Merge branch 'master' into limit-blank-lines
  Dean Herbert · 2019-03-05 14:51:56 +09:00
  34f0967873
• Make config nullable, removing testcase code
  smoogipoo · 2019-03-05 14:40:27 +09:00
  0322bd8812
• Merge pull request #4407 from peppy/fix-square-graph

  Fix SquareGraph not correctly filling columns when loaded with a non-zero time

  Dean Herbert · 2019-03-05 14:37:51 +09:00
  000d5843b4
• Merge branch 'master' into fix-square-graph
  Dan Balasescu · 2019-03-05 14:29:54 +09:00
  86b75a8581
• Move gameplay clock to own class
  Dean Herbert · 2019-03-05 13:53:47 +09:00
  4e33a98dbc
• Make restart private
  Dean Herbert · 2019-03-05 13:37:51 +09:00
  c5cd9972c4
• Tidy up clock logic using DI and a GameplayClock
  Dean Herbert · 2019-03-05 13:37:51 +09:00
  01f1018d02
• Fix SquareGraph not correctly filling columns when loaded with a non-zero time
  Dean Herbert · 2019-03-05 13:37:28 +09:00
  5bb0511f0a
• Merge remote-tracking branch 'origin/master' into move-osu-settings

  # Conflicts:
  #	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
  #	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs

  smoogipoo · 2019-03-05 13:25:03 +09:00
  78596dfe80
• Merge pull request #4392 from HoLLy-HaCKeR/ctb-hyperdash-fix

  Add 1/4th of a frame of grace time to hyperdash calculation

  Dean Herbert · 2019-03-05 12:47:20 +09:00
  47f41128e5
• Merge branch 'master' into ctb-hyperdash-fix
  Dan Balasescu · 2019-03-05 12:30:50 +09:00
  6e7232bcec
• Merge pull request #4250 from Poyo-SSB/update-difficulty-brackets

  Update difficulty color bracket thresholds

  Dean Herbert · 2019-03-05 12:01:06 +09:00
  7c54e67b6e
• Merge branch 'master' into update-difficulty-brackets
  Dean Herbert · 2019-03-05 10:16:18 +09:00
  0ff17103e8
• Fix remaining case
  Dean Herbert · 2019-03-04 14:03:59 +09:00
  3f197935d7
• Enforce max consecutive blank lines
  Dean Herbert · 2019-03-04 13:20:26 +09:00
  b076ac95f0
• Merge pull request #4332 from jorolf/supporter-disclaimer

  Don't show the supporter text if the user already has supporter status

  Dean Herbert · 2019-03-03 20:22:11 +09:00
  35ffccc2a5