9932 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-notification-overlay
  Dean Herbert · 2017-12-24 13:31:43 +09:00
  66fc447444
• dont play the same sound twice at once
  Shawdooow · 2017-12-23 23:13:53 -05:00
  72b5a370da
• fix the fix harder
  Shawdooow · 2017-12-23 23:12:10 -05:00
  af2a2781e7
• fix the fix

  silly me, that was configured for vitaru!

  Shawdooow · 2017-12-23 23:08:55 -05:00
  d333fc5efe
• the fix
  Shawdooow · 2017-12-23 22:47:32 -05:00
  a656656403
• Merge remote-tracking branch 'refs/remotes/ppy/master'
  Shawdooow · 2017-12-23 22:44:08 -05:00
  cf315cae56
• let NotificationOverlay move the background
  Aergwyn · 2017-12-23 14:56:23 +01:00
  2ffc479411
• fix NotificationOverlay going out of bounds at the bottom

  also fixes the overlap with the Toolbar at the top

  Aergwyn · 2017-12-23 14:33:43 +01:00
  9bb0cda525
• Merge pull request #1731 from Aergwyn/add-missing-repeat-samples

  Add Samples to RepeatPoint construction

  Dan Balasescu · 2017-12-23 22:00:16 +09:00
  77e4a7cec2
• Merge branch 'master' into add-missing-repeat-samples
  Dan Balasescu · 2017-12-23 21:40:53 +09:00
  030752dc33
• Merge remote-tracking branch 'upstream/master' into fix-info-wedge
  Dean Herbert · 2017-12-23 21:40:27 +09:00
  8e644e878a
• access list with index instead of using LINQ
  Aergwyn · 2017-12-23 13:30:44 +01:00
  47c75d01ce
• Merge pull request #1732 from Aergwyn/fix-ss-key-crash

  Fix crash in SongSelect when traversing while zero beatmaps are loaded

  Dean Herbert · 2017-12-23 21:00:28 +09:00
  7956a284a5
• Fix taiko strong hits not being handled
  smoogipoo · 2017-12-23 20:58:09 +09:00
  68d76d4380
• fix crash in SongSelect when traversing while zero beatmaps are loaded
  Aergwyn · 2017-12-23 12:53:11 +01:00
  1d67746d32
• Merge branch 'master' into fix-info-wedge
  Dean Herbert · 2017-12-23 20:36:24 +09:00
  117b744e37
• add Samples to RepeatPoint construction
  Aergwyn · 2017-12-23 12:32:21 +01:00
  c5aba9f247
• Merge pull request #1728 from peppy/fix-leaderboard-placeholder

  Improve state and feel of leaderboard placeholders

  Dan Balasescu · 2017-12-23 20:27:11 +09:00
  ea90c0cf40
• Add unavailable state to testcase
  smoogipoo · 2017-12-23 20:17:12 +09:00
  1f44e98f9c
• Merge branch 'master' into fix-leaderboard-placeholder
  Dan Balasescu · 2017-12-23 20:04:05 +09:00
  7ec4d230b9
• Merge pull request #1627 from FreezyLemon/taiko-hitsounds-fix

  Taiko playing hitsounds on click/keydown, not only on hitobjects being hit.

  Dan Balasescu · 2017-12-23 20:02:51 +09:00
  40bb82fe75
• finished up visual tests
  Aergwyn · 2017-12-23 11:56:53 +01:00
  49e855a29a
• Move list initialisation to pattern generation code
  Dean Herbert · 2017-12-23 19:17:05 +09:00
  e7c85d38a8
• Make Samples null by default and prepopulate in mania
  Dean Herbert · 2017-12-23 18:06:46 +09:00
  aeafa5645a
• Fix regressions
  Dean Herbert · 2017-12-23 17:24:28 +09:00
  298ac5468f
• Simplify DrawableHitObject's sample load code
  Dean Herbert · 2017-12-23 17:20:14 +09:00
  2db68df999
• Actually save changes
  Dean Herbert · 2017-12-23 16:52:23 +09:00
  cd8e8c8323
• Use a class instead of Tuple
  Dean Herbert · 2017-12-23 16:49:29 +09:00
  a30400ad29
• Simplify and tidy sample retrieval

  Less static weirdness

  Dean Herbert · 2017-12-23 16:46:02 +09:00
  9ca03c0209
• SoundControlPoint -> SampleControlPoint
  Dean Herbert · 2017-12-23 16:34:34 +09:00
  5026c7a95e
• Remove unnecessary newline
  Dean Herbert · 2017-12-23 16:23:33 +09:00
  ff0927e71b
• Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix

  # Conflicts:
  #	osu.Game/Audio/SampleInfo.cs

  Dean Herbert · 2017-12-23 14:50:35 +09:00
  46865bbacd
• Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
  Dean Herbert · 2017-12-23 14:20:16 +09:00
  1fa9dac1bb
• Merge branch 'master' into fix-info-wedge
  Dean Herbert · 2017-12-23 04:04:18 +09:00
  77f1b59853
• Merge pull request #1665 from smoogipoo/beatmap-serialization

  Implement a JSON Beatmap decoder

  Dean Herbert · 2017-12-23 03:16:30 +09:00
  751fcf3c7d
• fix failing tests

  1) waiting for loading to finish so Drawables are all present to do asserts on
  2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)

  Aergwyn · 2017-12-22 17:38:22 +01:00
  6a8fd74e05
• Merge branch 'master' into fix-info-wedge
  Dean Herbert · 2017-12-22 22:45:07 +09:00
  e8e551606d
• Merge branch 'master' into beatmap-serialization
  Dean Herbert · 2017-12-22 22:45:00 +09:00
  4d40004e97
• Move Placeholder classes to own files
  Dean Herbert · 2017-12-22 22:44:18 +09:00
  bdda1570d1
• Improve state and feel of leaderboard placeholders

  Closes #1721.

  Dean Herbert · 2017-12-22 22:42:23 +09:00
  26bb3715fe
• Merge pull request #1725 from smoogipoo/fix-editor-approachcircles

  Make editor discard approach circles

  Dean Herbert · 2017-12-22 22:30:10 +09:00
  166d6b555b
• Fix beatmap info wedge not showing up when zero beatmaps are loaded

  Closes #1722.

  Dean Herbert · 2017-12-22 22:19:11 +09:00
  2313ff0ddb
• Make editor discard approach circles

  Temporary solution for now.

  smoogipoo · 2017-12-22 22:16:54 +09:00
  def2e5bd17
• Update framework
  smoogipoo · 2017-12-22 21:44:12 +09:00
  d54b74e13a
• Make HitObjects construct nested hit objects
  smoogipoo · 2017-12-22 21:42:54 +09:00
  6a29f6020a
• Merge pull request #1549 from EVAST9919/rank-graph-improvements

  Fix profile rank graph being hidden (and improve visually)

  Dean Herbert · 2017-12-22 21:32:10 +09:00
  f1d170c390
• more visual tests for BeatmapInfoWedge

  also fix Author showing when not wanted

  Aergwyn · 2017-12-22 12:33:52 +01:00
  ed827d5424
• Better variable name
  Dean Herbert · 2017-12-22 19:25:59 +09:00
  e5faced9ba
• RankChart -> RankGraph
  Dean Herbert · 2017-12-22 19:25:18 +09:00
  82909f6585
• Formatting and more dynamically testable references
  Dean Herbert · 2017-12-22 19:24:54 +09:00
  728d1cb7f6