3495 Commits

This Branch

This Branch

All Branches

• wip
  Dean Herbert · 2017-04-07 16:54:54 +09:00
  7e99fc47e2
• Merge branch 'music-controller-improvements' into song-progress-graph

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-04-07 15:49:14 +09:00
  06776443eb
• Better structure for button layout.
  Dean Herbert · 2017-04-07 15:28:18 +09:00
  2c2a4169c6
• Expose DragBar's seeking property.
  Dean Herbert · 2017-04-07 15:23:03 +09:00
  7d2af9310b
• Merge branch 'music-controller-improvements' into song-progress-graph

  # Conflicts:
  #	osu.Game/Overlays/DragBar.cs

  Dean Herbert · 2017-04-07 15:18:58 +09:00
  3dbf4879c7
• Temporarily disable button scaling.
  Dean Herbert · 2017-04-07 14:33:58 +09:00
  361e187949
• Improve clickability and visuals of MusicController buttons.
  Dean Herbert · 2017-04-07 14:09:26 +09:00
  fa28e7bdc3
• MusicController regression fixes.
  Dean Herbert · 2017-04-07 13:15:57 +09:00
  7c9f30c288
• Make DragBar animate seeks.
  Dean Herbert · 2017-04-07 13:14:41 +09:00
  bc4e0bfa8b
• Merge pull request #602 from peppy/general-fixes

  Don't recommend property code style changes for now.

  Dan Balasescu · 2017-04-07 12:07:20 +09:00
  a56643aa61
• Fix unneeded key.
  Dan Balasescu · 2017-04-07 12:02:30 +09:00
  c67f23a81d
• Update test case.
  Dean Herbert · 2017-04-07 09:43:08 +09:00
  1842d80e28
• Don't recommend property code style changes for now.
  Dean Herbert · 2017-04-07 09:41:10 +09:00
  6d001d8517
• Merge pull request #601 from peppy/general-fixes

  General fixes

  Dan Balasescu · 2017-04-07 09:38:55 +09:00
  9c6d08405a
• Snaking out on by default.
  Dean Herbert · 2017-04-07 09:28:13 +09:00
  fba72b9a9e
• Merge remote-tracking branch 'upstream/master' into song-progress-graph

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
  #	osu.Game/Modes/UI/HudOverlay.cs
  #	osu.Game/Screens/Play/PauseOverlay.cs
  #	osu.Game/Screens/Play/Player.cs
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-04-07 09:22:18 +09:00
  12d2102a88
• Merge pull request #599 from EVAST9919/testcase_fix

  Fix Pause/Fail testcase

  Dean Herbert · 2017-04-06 18:43:21 +09:00
  4a29263cd6
• Merge remote-tracking branch 'refs/remotes/ppy/master' into testcase_fix
  Andrey Zavadskiy · 2017-04-06 12:28:44 +03:00
  b380cbfd7a
• Fix Pause/Fail testcase
  Andrey Zavadskiy · 2017-04-06 12:27:45 +03:00
  c6f4cff2e7
• Merge pull request #598 from huoyaoyuan/code-sanity-update

  Update CodeFileSanity.

  Dean Herbert · 2017-04-06 18:22:47 +09:00
  7b7c0733d1
• Update resources for CodeFileSanity.
  Huo Yaoyuan · 2017-04-06 16:56:27 +08:00
  ff469ee5f6
• Remove all trailing whitespaces in this repo.
  Huo Yaoyuan · 2017-04-06 16:21:18 +08:00
  411988f038
• Fix filename mismatch.
  Huo Yaoyuan · 2017-04-06 16:05:41 +08:00
  9b1e010dcc
• Merge branch 'master' into code-sanity-update
  Huo Yaoyuan · 2017-04-06 15:55:14 +08:00
  f8f75430e4
• Merge pull request #595 from smoogipooo/taiko-fixes

  Taiko fixes

  Dean Herbert · 2017-04-06 16:32:03 +09:00
  v2017.406.0 96f814db6c
• Fix using.
  smoogipooo · 2017-04-06 16:25:46 +09:00
  0107772737
• Merge branch 'master' into taiko-fixes
  Dan Balasescu · 2017-04-06 16:23:22 +09:00
  6fc1384927
• Fix incorrect scroll time calculation.
  smoogipooo · 2017-04-06 16:21:18 +09:00
  9260d1c24d
• Legacy multiplier only needs to be applied to SliderMultiplier.
  smoogipooo · 2017-04-06 16:20:57 +09:00
  bc216f6470
• Merge pull request #594 from smoogipooo/better-hitsounds

  Better hitsounds

  Dean Herbert · 2017-04-06 16:12:40 +09:00
  85dfd8297b
• Fix merge fail.
  Dean Herbert · 2017-04-06 16:06:02 +09:00
  1942ef9e8f
• Merge branch 'master' into better-hitsounds
  Dean Herbert · 2017-04-06 16:00:56 +09:00
  4783d17d94
• Implement IJsonSerializable, BeatmapInfo IJsonSerializable.
  smoogipooo · 2017-04-06 15:54:50 +09:00
  cec8bca78a
• Merge pull request #562 from EVAST9919/pause_buttons_refactor

  PauseOverlay/FailOverlay refactor

  Dean Herbert · 2017-04-06 15:47:57 +09:00
  0a8d63ead8
• Remove unnecessary depth setting.
  Dean Herbert · 2017-04-06 15:36:03 +09:00
  7c63c8394b
• InGameOverlay -> MenuOverlay.
  Dean Herbert · 2017-04-06 15:34:52 +09:00
  a18367454d
• Fix incorrect verbatim strings.
  Dean Herbert · 2017-04-06 15:31:21 +09:00
  856696b17e
• Merge branch 'master' into pause_buttons_refactor
  Dean Herbert · 2017-04-06 15:00:48 +09:00
  6285f3eea8
• Make combo be changed by the base ScoreProcessor.
  smoogipooo · 2017-04-06 14:37:21 +09:00
  37129bf03d
• Merge pull request #580 from EVAST9919/hud_visibility

  HudOverlay visibility

  Dean Herbert · 2017-04-06 14:27:50 +09:00
  bb65d2e3d3
• fix typo
  Dean Herbert · 2017-04-06 14:27:23 +09:00
  2bb99eac72
• Update CodeFileSanity.
  Dean Herbert · 2017-04-06 13:58:32 +09:00
  5fa0d9f6f1
• Fix combo calculations.
  smoogipooo · 2017-04-06 13:46:26 +09:00
  98630dd06c
• Fix accuracy calculations.
  smoogipooo · 2017-04-06 13:44:43 +09:00
  d87a65f19e
• Merge branch 'master' into hud_visibility
  Dean Herbert · 2017-04-06 13:40:10 +09:00
  efe82ef88c
• Merge pull request #591 from peppy/taiko-wtf

  taiko improvements

  Dan Balasescu · 2017-04-06 13:23:25 +09:00
  0acf5b45b1
• Mark TODO for BeatmapVersion.
  Dean Herbert · 2017-04-06 13:15:33 +09:00
  18ff8efd46
• Add better defaults for BaseDifficulty.
  Dean Herbert · 2017-04-06 13:15:21 +09:00
  f193af2a2a
• Add better defaults for ControlPoint.
  Dean Herbert · 2017-04-06 13:15:12 +09:00
  c50960af63
• Fix typo.
  Dean Herbert · 2017-04-06 13:14:52 +09:00
  042aa787a5