3770 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into taiko-fixes
  Dan Balasescu · 2017-04-18 17:13:25 +09:00
  ce4e661148
• Merge remote-tracking branch 'origin/master' into taiko-fixes

  # Conflicts:
  #	osu.Game.Rulesets.Taiko/UI/TaikoHitRenderer.cs

  smoogipooo · 2017-04-18 17:12:23 +09:00
  579698f0a9
• Merge pull request #644 from ocboogie/player-loader-restart

  Memory increase on restart fix

  Dean Herbert · 2017-04-18 17:11:55 +09:00
  5ca8737a73
• Combine push logic and adjust transitions a bit more.
  Dean Herbert · 2017-04-18 17:07:02 +09:00
  5ba85818db
• Show metadata when loading between retries.

  Also speeds up the display a bit.

  Dean Herbert · 2017-04-18 17:00:58 +09:00
  ddff26d167
• Tidy up and comment PlayerLoader logic.
  Dean Herbert · 2017-04-18 16:56:01 +09:00
  edd71c0560
• Change conditional ordering to allow player to always run its fadeOut sequence.
  Dean Herbert · 2017-04-18 16:47:30 +09:00
  2ccb8b154f
• Merge branch 'master' into player-loader-restart
  Dean Herbert · 2017-04-18 16:36:25 +09:00
  24deaf05b6
• Merge pull request #643 from peppy/general-fixes

  Updates in-line with framework.

  Dean Herbert · 2017-04-18 16:34:34 +09:00
  3659ee891c
• Merge branch 'master' into general-fixes
  Dean Herbert · 2017-04-18 16:19:52 +09:00
  64a8992153
• Merge pull request #645 from peppy/no-more-modes

  Mode -> Ruleset.

  Dean Herbert · 2017-04-18 16:19:30 +09:00
  7fbbe74b65
• Update framework.
  Dean Herbert · 2017-04-18 16:15:16 +09:00
  6dc15963e0
• Mode -> Ruleset.
  Dean Herbert · 2017-04-18 16:05:58 +09:00
  fbd26a1d5e
• Removed unneeded restarting variable
  ocboogie · 2017-04-17 23:52:38 -07:00
  1f7373db8f
• Removed unneeded newPlayer
  ocboogie · 2017-04-17 23:48:21 -07:00
  2bd89e922f
• Merge pull request #642 from smoogipooo/better-conversion

  Better conversion

  Dean Herbert · 2017-04-18 15:40:26 +09:00
  0bed537239
• Added back PlayerLoader overlays
  ocboogie · 2017-04-17 23:36:11 -07:00
  c0f4cbcba6
• Updates in-line with framework.
  Dean Herbert · 2017-04-18 15:34:53 +09:00
  727086c0b2
• Fix adding duplicate hitobjects in the case where a hit object doesn't need to be converted.
  smoogipooo · 2017-04-18 14:48:18 +09:00
  7a6b062e72
• We shouldn't be adding null hitobjects.
  smoogipooo · 2017-04-18 14:46:56 +09:00
  cf404b4bcf
• Fixed HotkeyRetryOverlay just going to a black screen
  ocboogie · 2017-04-17 22:36:03 -07:00
  be8d32688b
• Trim whitespace.
  Dan Balasescu · 2017-04-18 14:34:39 +09:00
  0dd97c433f
• Refactor beatmap converters.
  smoogipooo · 2017-04-18 14:31:06 +09:00
  27ddf4b475
• Removed testing line
  ocboogie · 2017-04-17 21:35:48 -07:00
  5c48fa6cb1
• PlayerLoader creates a new instance of the Player class on Restart
  ocboogie · 2017-04-17 21:32:38 -07:00
  aa466d0e84
• Add constant for osu! playfield size.
  Dean Herbert · 2017-04-18 12:19:39 +09:00
  2df21066e7
• mode -> ruleset.
  smoogipooo · 2017-04-18 11:29:27 +09:00
  ef5d50e7d8
• Merge branch 'master' into better-conversion
  Dan Balasescu · 2017-04-18 11:26:33 +09:00
  f744b48399
• Merge pull request #640 from smoogipooo/remove-playmode

  Remove PlayMode enum and make Rulesets modular

  Dan Balasescu · 2017-04-18 11:21:02 +09:00
  1df3189e5d
• CI fixes.
  smoogipooo · 2017-04-18 11:20:39 +09:00
  8844ff7ab7
• Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter.
  smoogipooo · 2017-04-18 11:13:11 +09:00
  d04353aed0
• Remove using.
  Dean Herbert · 2017-04-18 10:59:50 +09:00
  7d3a1c5658
• Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
  smoogipooo · 2017-04-18 10:59:43 +09:00
  4a60e9299e
• Add fallback to allow FilterCriteria to run without a ruleset being set.
  Dean Herbert · 2017-04-18 10:55:45 +09:00
  8ef675d9b3
• Fix ruleset not always being initialised correctly.
  Dean Herbert · 2017-04-18 10:55:33 +09:00
  5939ba9143
• Convert chords to strong hits for osu!mania conversion.
  smoogipooo · 2017-04-18 10:41:49 +09:00
  3b9067e55e
• Fix CanConvert not returning correctly.
  smoogipooo · 2017-04-18 10:23:49 +09:00
  5a78ce15a1
• Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
  smoogipooo · 2017-04-18 10:09:36 +09:00
  d5c5b7eb6b
• Fix filtering by ruleset.
  Dean Herbert · 2017-04-18 10:04:41 +09:00
  6b6690caf7
• Fix song select.
  Dean Herbert · 2017-04-18 10:04:32 +09:00
  f2174054ea
• Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
  smoogipooo · 2017-04-18 09:58:39 +09:00
  1be1683a4f
• CI fixes.
  smoogipooo · 2017-04-18 09:51:02 +09:00
  0cef14ca63
• Fix beatmaps not getting the correct ruleset on import.
  Dean Herbert · 2017-04-18 09:47:29 +09:00
  d3c1520a2d
• Add unique constraints on RulesetInfo table to ensure things stay sane.
  Dean Herbert · 2017-04-18 09:47:16 +09:00
  2734983564
• Add unit tests to ensure all rulesets' beatmaps are added successfully.
  Dean Herbert · 2017-04-18 09:46:14 +09:00
  4393c2cb25
• Make IBeatmapProcessor a class with virtual methods.
  smoogipooo · 2017-04-18 09:43:43 +09:00
  0e1ce333e3
• Make IBeatmapConverter an abstract class instead of an interface.
  smoogipooo · 2017-04-18 09:38:52 +09:00
  efc050a95a
• Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace.
  smoogipooo · 2017-04-18 09:36:08 +09:00
  456aee63ca
• A few xmldoc additions/fixes.
  smoogipooo · 2017-04-18 09:20:38 +09:00
  c61e3265bb
• Fix post-rebase errors.
  smoogipooo · 2017-04-18 09:00:53 +09:00
  786446354e