61410 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into logo-beat
  Dean Herbert · 2017-05-24 11:41:02 +09:00
  b1bd88ae71
• Merge pull request #812 from ColdVolcano/menu-flashes

  Menu flashes

  Dean Herbert · 2017-05-24 11:40:53 +09:00
  3af7f89a95
• Merge branch 'master' into logo-beat
  Dan Balasescu · 2017-05-24 10:36:30 +09:00
  90d54a6cfe
• Merge branch 'master' into menu-flashes
  Dean Herbert · 2017-05-24 10:10:29 +09:00
  87a2cc2004
• Update to new syntax of OnNewBeat
  ColdVolcano · 2017-05-23 20:01:20 -05:00
  207d6e4ac3
• Merge branch 'master' of ppy/osu into menu-flashes
  ColdVolcano · 2017-05-23 20:00:02 -05:00
  c6d744eb7c
• Merge pull request #842 from MrTheMake/songselect-fix

  Fix song select scheduled beatmap change task not being canceled

  Dean Herbert · 2017-05-24 09:59:09 +09:00
  a22e11df03
• Merge branch 'master' into songselect-fix
  Dean Herbert · 2017-05-24 09:45:34 +09:00
  dee6a1e2be
• More formatting
  MrTheMake · 2017-05-24 02:38:05 +02:00
  24f64c8815
• Formatting fixes
  MrTheMake · 2017-05-24 02:30:32 +02:00
  67774192dd
• CI fix
  MrTheMake · 2017-05-24 02:23:52 +02:00
  0616256bd0
• Fix scheduled task not being canceled
  MrTheMake · 2017-05-24 02:22:30 +02:00
  09adb23591
• Remove ??, value can never be null
  DrabWeb · 2017-05-23 15:08:02 -03:00
  be1ae2bd8e
• Fix potential nullref
  Dean Herbert · 2017-05-24 02:53:21 +09:00
  b477e5cd9e
• Remove Func<T>'d-ness.
  smoogipooo · 2017-05-24 02:53:08 +09:00
  0a385055dc
• Tab character
  DrabWeb · 2017-05-23 14:46:23 -03:00
  7a4b476121
• Indentation
  DrabWeb · 2017-05-23 14:42:57 -03:00
  aa9a636c3c
• CI fixes
  DrabWeb · 2017-05-23 14:41:30 -03:00
  7b9eacc213
• Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct
  DrabWeb · 2017-05-23 14:34:58 -03:00
  fbbcc80a3e
• Make result counts scroll with the panels
  DrabWeb · 2017-05-23 14:34:34 -03:00
  4f17a4fe91
• Add comment.
  smoogipooo · 2017-05-24 02:24:10 +09:00
  41824e0179
• xmldoc fixes.
  smoogipooo · 2017-05-24 02:22:28 +09:00
  2d1df8fd8a
• Fix returning incorrect control points for non-timing points.
  smoogipooo · 2017-05-24 02:19:22 +09:00
  9e7f384203
• Remove unused parameter
  Dean Herbert · 2017-05-24 02:09:31 +09:00
  813b09189c
• Update framework
  Dean Herbert · 2017-05-24 01:58:07 +09:00
  84499275ad
• Add amplitude adjust
  Dean Herbert · 2017-05-24 01:45:01 +09:00
  7e827c4f11
• Expose Beatmap in BeatSyncedContainer
  Dean Herbert · 2017-05-24 01:44:47 +09:00
  f57b234cc3
• Simplify expression.
  smoogipooo · 2017-05-24 01:38:28 +09:00
  462bbd02ba
• Return first control point in the list if the time is before it.
  smoogipooo · 2017-05-24 01:38:04 +09:00
  7628cdf522
• make fields readonly
  Jorolf · 2017-05-23 18:19:01 +02:00
  af9b02746a
• Merge branch 'master'
  Dean Herbert · 2017-05-24 01:17:09 +09:00
  b12300391b
• Merge pull request #831 from smoogipooo/beat-sync-container-improvements

  Beat sync container improvements

  Dean Herbert · 2017-05-24 01:05:02 +09:00
  952179332f
• Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item
  Jorolf · 2017-05-23 17:51:46 +02:00
  64cee72464
• revert framework
  Jorolf · 2017-05-23 17:50:28 +02:00
  320e7b358e
• Merge branch 'master' into beat-sync-container-improvements
  Dean Herbert · 2017-05-24 00:46:14 +09:00
  ef1712a5af
• Merge pull request #830 from smoogipooo/controlpoint-rework

  Split out ControlPoints into more specific types

  Dean Herbert · 2017-05-24 00:41:59 +09:00
  acce59cdb3
• update framework
  Jorolf · 2017-05-23 17:35:40 +02:00
  7d28290a4a
• Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item
  Jorolf · 2017-05-23 17:32:48 +02:00
  7ad10009e6
• Merge branch 'master' into controlpoint-rework
  Dean Herbert · 2017-05-24 00:20:15 +09:00
  0842e00f13
• Merge pull request #832 from peppy/menu-music-osz

  Read menu music from osz resource

  Dean Herbert · 2017-05-24 00:09:46 +09:00
  d162a2b033
• Merge branch 'master' into menu-music-osz
  Dean Herbert · 2017-05-23 23:56:07 +09:00
  a48a03bf38
• Merge pull request #837 from EVAST9919/fixes

  Tidy ups

  Dean Herbert · 2017-05-23 23:50:44 +09:00
  7e3caa19fd
• Unregister OnBeatmapChanged() when exiting song selection
  MrTheMake · 2017-05-23 15:30:15 +02:00
  0603be5937
• overall fixes
  EVAST9919 · 2017-05-23 16:01:00 +03:00
  178f8127b8
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-23 14:45:38 +03:00
  2ca0794b37
• using autosize instead of constant height
  EVAST9919 · 2017-05-23 14:32:45 +03:00
  564abc1a5b
• Make transition a bit smoother
  EVAST9919 · 2017-05-23 12:30:39 +03:00
  165d6ef1bb
• Merge branch 'master' into menu-music-osz
  Dan Balasescu · 2017-05-23 18:26:48 +09:00
  2d806c7f11
• CI fixes and removed useless property
  EVAST9919 · 2017-05-23 12:24:16 +03:00
  2e28b10c36
• Better letterbox settings transition
  EVAST9919 · 2017-05-23 12:09:32 +03:00
  c7a241246e