13791 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into breadcrumb-design-adjustments
  Dean Herbert · 2018-05-11 17:19:26 +09:00
  2afc0c1abd
• Merge branch 'master' of https://github.com/odgaard/osu
  Jacob Odgård Tørring · 2018-05-11 09:57:00 +02:00
  e89ff7e519
• Converts OnSeek assignment to method group
  Jacob Odgård Tørring · 2018-05-11 09:56:36 +02:00
  c55d47ff10
• Add test step to test pushing after a previous screen is made current.
  DrabWeb · 2018-05-11 04:49:40 -03:00
  fa403e4e2a
• Merge branch 'master' into master
  Jacob Odgård Tørring · 2018-05-11 09:43:07 +02:00
  37893f9dfe
• Merge branch 'master' of https://github.com/odgaard/osu
  Jacob Odgård Tørring · 2018-05-11 09:42:45 +02:00
  28e8d10d8d
• Moves seek restrictions to Player
  Jacob Odgård Tørring · 2018-05-11 09:41:31 +02:00
  17ed5e4839
• Changes conditionSeek return type to void
  Jacob Odgård Tørring · 2018-05-11 09:39:55 +02:00
  a877855fc6
• Merge pull request #2519 from DrabWeb/multiplayer-folder-restructure

  Multiplayer folder restructure

  Dean Herbert · 2018-05-11 16:31:00 +09:00
  3ddeeadb8b
• Fix tests
  smoogipoo · 2018-05-11 16:13:00 +09:00
  3e7fa45ad1
• Make HitWindows not return null by default
  smoogipoo · 2018-05-11 15:52:51 +09:00
  97a523584d
• Standardise naming
  smoogipoo · 2018-05-11 15:42:34 +09:00
  bfad101d17
• Add info about when CreateHitWindows is invoked
  smoogipoo · 2018-05-11 15:36:53 +09:00
  5245d2d426
• Add todo because TailNote shouldn't hardcore lenience
  smoogipoo · 2018-05-11 15:32:13 +09:00
  0cdd39b8b8
• Add convert mania HitWindows
  smoogipoo · 2018-05-11 15:32:00 +09:00
  8563291796
• Add convert osu HitWindows
  smoogipoo · 2018-05-11 15:31:36 +09:00
  c052ee71c1
• Add convert taiko HitWindows
  smoogipoo · 2018-05-11 15:31:12 +09:00
  9c65d347ba
• Pass original hitobject HitWindows during conversion
  smoogipoo · 2018-05-11 15:30:50 +09:00
  faa82f17cc
• Restructure HitWindows to allow outside setting
  smoogipoo · 2018-05-11 15:30:26 +09:00
  8216bc311a
• Remove some unnecessary changes
  smoogipoo · 2018-05-11 14:13:52 +09:00
  fd9796d08c
• Pass down ruleset to the buffered wedge
  smoogipoo · 2018-05-11 14:10:53 +09:00
  816ad5c426
• Fix post-merge errors
  smoogipoo · 2018-05-11 14:08:17 +09:00
  2bab08c437
• Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics

  # Conflicts:
  #	osu.Game/Beatmaps/Beatmap.cs

  smoogipoo · 2018-05-11 14:05:40 +09:00
  73465c35fa
• Cleanup.
  DrabWeb · 2018-05-10 22:50:03 -03:00
  a241ff1c05
• Add selection to DrawableRoom.
  DrabWeb · 2018-05-10 22:48:07 -03:00
  ec53927d8e
• Create the drawable hierarchy for DrawableRoom in load.
  DrabWeb · 2018-05-10 22:12:25 -03:00
  d87ac5a1cb
• Remove redundant default value.
  DrabWeb · 2018-05-10 22:02:27 -03:00
  6f7d0c19ef
• Add steps and asserts to TestCaseScreenBreadcrumbs.
  DrabWeb · 2018-05-10 21:52:26 -03:00
  a294f187ee
• Add ScreenBreadcrumbControl.
  DrabWeb · 2018-05-10 21:35:26 -03:00
  b9adeeb063
• Remove unused usings caused by multiplayer folder restructuring.
  DrabWeb · 2018-05-10 20:49:42 -03:00
  a86843ccc9
• Move multiplayer screens to osu.Game/Screens/Multi/Screens
  DrabWeb · 2018-05-10 20:47:25 -03:00
  bc9ac8f72a
• Move multiplayer screen components to osu.Game/Screens/Multi/Components
  DrabWeb · 2018-05-10 20:44:24 -03:00
  2d206d258a
• Rename osu.Game/Screens/Multiplayer to Multi.
  DrabWeb · 2018-05-10 20:39:05 -03:00
  c35760fdef
• Adjust BreadcrumbControl to better match the designs.
  DrabWeb · 2018-05-10 20:30:03 -03:00
  ecb8de29a2
• Update CircularProgress.FillTo calls
  Roman Kapustin · 2018-05-10 21:08:02 +03:00
  86430da6d6
• Remove mouseWheelCheckbox from InputSettings player overlay
  Roman Kapustin · 2018-05-10 20:38:55 +03:00
  93029fd548
• Merge branch 'master' into master
  Jacob Odgård Tørring · 2018-05-10 17:55:37 +02:00
  7de502b20b
• Merge pull request #2491 from smoogipoo/beatmap-conversion-rework

  Rework beatmap conversion process to use IBeatmap

  Dean Herbert · 2018-05-10 20:08:37 +08:00
  0afe33d32f
• Merge branch 'master' into master
  Jacob Odgård Tørring · 2018-05-10 13:21:28 +02:00
  0496deee08
• Adds DisableSeek property to MusicController
  Jacob Odgård Tørring · 2018-05-10 13:20:04 +02:00
  d54a7295f6
• Merge branch 'master' into beatmap-conversion-rework
  Dean Herbert · 2018-05-10 19:10:07 +08:00
  8a6ef0dabb
• Merge pull request #2490 from smoogipoo/i-beatmap

  Migrate the game to use an IBeatmap interface

  Dean Herbert · 2018-05-10 19:07:17 +08:00
  7fd38e4780
• Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
  Dean Herbert · 2018-05-10 19:51:52 +09:00
  9e26bcd571
• Move IBeatmap to its own file
  Dean Herbert · 2018-05-10 19:51:40 +09:00
  40c1b24b3d
• Merge branch 'master' into exit-hold-confirmation
  Dean Herbert · 2018-05-10 18:37:56 +08:00
  ea838f57fc
• Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons
  Dean Herbert · 2018-05-10 19:16:52 +09:00
  4b3c2466a4
• Keep shortcut padding even when there is no shortut
  smoogipoo · 2018-05-10 18:49:33 +09:00
  df604c40cc
• Improve TestCaseOnScreenDisplay

  Now doesn't rely on framesync.

  smoogipoo · 2018-05-10 18:48:48 +09:00
  c03ab9014f
• Merge branch 'master' of https://github.com/odgaard/osu
  Jacob Odgård Tørring · 2018-05-10 11:29:39 +02:00
  a8ca0c899d
• Fixes private method name capitalization
  Jacob Odgård Tørring · 2018-05-10 11:29:19 +02:00
  5b99d8df62