1410 Commits

• Merge branch 'master' into Private_Messages
  Dean Herbert · 2018-06-21 11:37:19 +09:00
  5157a069bc
• Give TestLounge a background to make transitions work correctly
  Dean Herbert · 2018-06-21 09:54:13 +09:00
  2697579448
• Merge branch 'master' into multiplayer-match
  Dean Herbert · 2018-06-19 17:18:33 +09:00
  b8f9caf418
• Add testfixture annotation
  smoogipoo · 2018-06-18 17:06:21 +09:00
  01b909eaa7
• Fix some incorrect test case values
  smoogipoo · 2018-06-18 17:05:04 +09:00
  ffc5d7bd43
• Cleanup testcase
  smoogipoo · 2018-06-18 16:09:38 +09:00
  0d154621b6
• Merge branch 'master' into mania-playfield-inversions
  Dean Herbert · 2018-06-18 04:41:17 +09:00
  1d9d240454
• Merge branch 'master' into timeline-markers
  Dean Herbert · 2018-06-18 03:14:04 +09:00
  d58ef96a23
• Merge branch 'master' into timeline-input-adjustment
  Dean Herbert · 2018-06-18 02:54:25 +09:00
  ae160baa6e
• Merge branch 'master' into timeline-markers
  Dean Herbert · 2018-06-18 02:09:20 +09:00
  48613ea1f6
• Cache the dependencies using the static method of the class Dependencies.
  miterosan · 2018-06-17 15:08:13 +02:00
  1f04dd9ada
• Merge branch 'master' of https://github.com/ppy/osu into Private_Messages

  # Conflicts:
  #	osu.Game.Tests/Visual/TestCaseChatLink.cs

  miterosan · 2018-06-17 14:15:14 +02:00
  cd0fe6a09e
• Merge branch 'master' into timeline-audio-scrolling
  Dean Herbert · 2018-06-17 19:01:21 +09:00
  a20ec0d4cc
• Make testcase work on appveyor (no BASS)
  smoogipoo · 2018-06-17 19:01:18 +09:00
  08f172ba98
• Remove MusicController from compose timeline testcase
  smoogipoo · 2018-06-17 19:01:14 +09:00
  0695615c6a
• Use existing instance of beatmap rather than adding more resources
  smoogipoo · 2018-06-17 19:00:58 +09:00
  6c100caba7
• Fix CI error
  smoogipoo · 2018-06-17 17:54:05 +09:00
  4eda017fa5
• Fix pixellation of volume meter progress bars
  Dean Herbert · 2018-06-13 19:22:39 +09:00
  b318b770d4
• Remove unused using
  Dan Balasescu · 2018-06-12 16:36:46 +09:00
  ac1990c093
• Adjust precision for failing test
  smoogipoo · 2018-06-12 16:20:38 +09:00
  93d2b5c4de
• Fix unit tests
  smoogipoo · 2018-06-12 16:20:31 +09:00
  34f23359bb
• Fix rebase error
  smoogipoo · 2018-06-12 14:34:28 +09:00
  7dfe171869
• Add a centre marker to the timeline
  smoogipoo · 2018-06-12 14:34:28 +09:00
  6ceac8ab0a
• Remove unused variable
  smoogipoo · 2018-06-12 14:33:33 +09:00
  b90cdfbfd1
• Merge branch 'master' into timeline-audio-scrolling
  Dan Balasescu · 2018-06-12 14:23:05 +09:00
  f71b0456e8
• Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling

  # Conflicts:
  #	osu-framework
  #	osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
  #	osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs

  smoogipoo · 2018-06-12 14:22:27 +09:00
  30b7b7961f
• Merge branch 'master' into populate-missing-online-ids
  Dan Balasescu · 2018-06-12 13:11:21 +09:00
  0a35a81c2d
• Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
  Dean Herbert · 2018-06-11 20:17:41 +09:00
  37ea4c273b
• Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
  Dean Herbert · 2018-06-11 20:17:33 +09:00
  8092d70402
• Remove OnlineBeatmapSetID from BeatmapInfo

  It should now be retrieved via the linked BeatmapSetInfo

  Dean Herbert · 2018-06-08 15:26:27 +09:00
  955a78e76d
• Merge https://github.com/ppy/osu into multiplayer-room-settings
  DrabWeb · 2018-06-08 01:16:22 -03:00
  0815e0ba83
• Remove OnlineBeatmapSetID from BeatmapMetadata
  Dean Herbert · 2018-06-08 12:46:34 +09:00
  8220e0c79a
• Reorganise API requests and response classes

  They were previously breaking the two-class-per-file rule.

  Dean Herbert · 2018-06-08 11:42:35 +09:00
  8cc31aca54
• Test steps.
  DrabWeb · 2018-06-06 23:30:17 -03:00
  ed97d35ef7
• Expose Dependencies from base OsuTestCase
  smoogipoo · 2018-06-06 20:25:40 +09:00
  ebcfe97ccf
• CreatePlayer shouldn't receive a beatmap
  smoogipoo · 2018-06-06 20:21:47 +09:00
  f2ac5b8b2d
• Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

  # Conflicts:
  #	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
  #	osu.Game/Screens/Menu/Intro.cs
  #	osu.Game/Screens/Menu/MenuSideFlashes.cs

  smoogipoo · 2018-06-06 18:26:51 +09:00
  4086ff7313
• Fix RoomSettingsOverlay not being updated when the rooms values are.
  DrabWeb · 2018-06-06 05:38:43 -03:00
  d6e3dc10e9
• Add empty RoomSettingsOverlay.
  DrabWeb · 2018-06-06 00:29:52 -03:00
  8c97999de9
• Merge https://github.com/ppy/osu into multiplayer-room-settings
  DrabWeb · 2018-06-06 00:19:23 -03:00
  b8e403f38a
• Merge branch 'master' into fix-beatmap-info-wedge-async
  Dan Balasescu · 2018-06-04 20:29:29 +09:00
  b2cc7b9a5c
• Merge branch 'master' into better-loading-logo
  Dan Balasescu · 2018-06-04 20:06:22 +09:00
  566470e852
• Merge branch 'master' into disallow-beatmap-change
  Dean Herbert · 2018-06-04 10:53:04 +09:00
  4b604bf055
• Wait for loading beatmaps
  ekrctb · 2018-06-03 23:11:45 +09:00
  ed1918cd43
• Fix incorrect async logic in BeatmapInfoWedge

  Closes #2653.
  Alternative to #2657.

  Dean Herbert · 2018-06-01 20:31:29 +09:00
  5c2a2e394e
• Merge https://github.com/ppy/osu into multiplayer-match
  DrabWeb · 2018-06-01 04:01:14 -03:00
  9989517ff0
• Fix webexception due to invalid user ids
  miterosan · 2018-05-31 22:56:12 +02:00
  6e0099d2b1
• Fix automated testing
  Dean Herbert · 2018-05-31 20:07:55 +09:00
  a6f2561be8
• Add tests
  Dean Herbert · 2018-05-31 17:29:59 +09:00
  dfbcf4d7b7
• Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
  Dean Herbert · 2018-05-31 14:50:20 +09:00
  49a683e386