9694 Commits

This Branch

This Branch

All Branches

• Add RemoveSpeedAdjustment
  smoogipooo · 2017-08-22 16:06:14 +09:00
  c3cfad4eb5
• Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
  smoogipooo · 2017-08-22 16:06:09 +09:00
  4fc77be624
• Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
  smoogipooo · 2017-08-22 16:06:04 +09:00
  6f662d721c
• Let's not construct scrolling containers in load() for now

  This isn't utilized at the moment, and we should be avoiding this here in the first place.

  smoogipooo · 2017-08-22 16:05:59 +09:00
  b7b8d8b764
• Fix incorrect inequality with multiple speed adjustments at the same start time.
  smoogipooo · 2017-08-22 16:05:53 +09:00
  5fcd94880d
• Move beatmap/ruleset change restrictions to OsuGame

  Allows test cases to more freely exist

  Dean Herbert · 2017-08-22 15:59:32 +09:00
  09dd0cabd6
• Update volume control logic to use key bindings

  Fixes them not working at all, too.

  Dean Herbert · 2017-08-22 14:48:04 +09:00
  18645fcf29
• Add support for binding mousewheel actions
  Dean Herbert · 2017-08-22 14:44:34 +09:00
  ff8ad30127
• CI fixes.
  smoogipooo · 2017-08-22 14:21:28 +09:00
  909cae5861
• Fix cherry pick issues.
  smoogipooo · 2017-08-22 14:18:17 +09:00
  68c7226d12
• Disable reversing for now - this needs to be re-implemented in a later PR.
  smoogipooo · 2017-08-22 14:17:57 +09:00
  9a7c9e9af0
• Fix mania playfield not working.
  smoogipooo · 2017-08-22 14:07:46 +09:00
  cd3c825bd2
• Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
  smoogipooo · 2017-08-22 14:07:39 +09:00
  88151eff3f
• Only set the number of availableColumns once, at ManiaRulesetContainer level.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
  #	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
  #	osu.Game/Rulesets/UI/RulesetContainer.cs

  smoogipooo · 2017-08-22 14:07:37 +09:00
  4eec59f669
• Remove now unneeded ApplyBeatmap.
  smoogipooo · 2017-08-22 14:05:28 +09:00
  964982e2e6
• Merge pull request #1090 from tgi74/master

  Fix replays crashing and not finding their associated beatmap

  Dean Herbert · 2017-08-22 12:59:49 +09:00
  3254e16e9c
• Merge branch 'master' into ranks-section
  Dean Herbert · 2017-08-22 12:46:28 +09:00
  250fb33fbc
• Add comment and index on column
  Dean Herbert · 2017-08-22 12:42:35 +09:00
  31bb1ebe0e
• Merge branch 'master' into master
  Dean Herbert · 2017-08-22 12:35:36 +09:00
  881eecb528
• Merge pull request #1140 from jorolf/mask-settings-overlay

  mask the settings overlay

  Dean Herbert · 2017-08-22 00:30:11 +09:00
  7c0c0775ee
• Merge branch 'master' into mask-settings-overlay
  Dean Herbert · 2017-08-22 00:22:39 +09:00
  7693fc1382
• Merge pull request #1154 from peppy/chat-local-echo-v2

  Add local chat echo support

  Dan Balasescu · 2017-08-22 00:04:44 +09:00
  v2017.821.1 24eeaea5db
• Update framework
  Dean Herbert · 2017-08-21 23:46:37 +09:00
  5c489eb3f0
• Remove unnecessary using
  Dean Herbert · 2017-08-21 23:41:51 +09:00
  a9fe1d94f7
• Review fixes
  Dean Herbert · 2017-08-21 23:34:08 +09:00
  7d1c270126
• Restore usage of AddRange
  Dean Herbert · 2017-08-21 18:51:14 +09:00
  1d0b89d592
• Merge branch 'master' into chat-local-echo-v2
  Dean Herbert · 2017-08-21 18:27:32 +09:00
  102caf4b91
• Merge pull request #1151 from peppy/action-key-counter

  Update KeyCounterCollection to support action-based buttons

  Dean Herbert · 2017-08-21 18:27:24 +09:00
  fb43895908
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 17:47:19 +09:00
  7903f49d27
• Add spaces for smoogipoo
  Dean Herbert · 2017-08-21 17:44:39 +09:00
  9ba2258f80
• Add local chat echo support
  Dean Herbert · 2017-08-21 17:43:26 +09:00
  877c69d5fe
• Merge pull request #1153 from smoogipooo/fix-taiko-barlines

  Fix taiko major bar lines not showing triangles

  Dean Herbert · 2017-08-21 17:10:11 +09:00
  5068bbfd87
• Merge branch 'master' into fix-taiko-barlines
  Dean Herbert · 2017-08-21 16:53:47 +09:00
  4ea82694bd
• Merge pull request #1150 from smoogipooo/fix-taiko-drumroll-conversion

  Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits

  Dean Herbert · 2017-08-21 16:53:31 +09:00
  26788e73c7
• Merge branch 'master' into fix-taiko-barlines
  Dean Herbert · 2017-08-21 16:46:25 +09:00
  52dadad1e1
• Merge branch 'master' into fix-taiko-drumroll-conversion
  Dean Herbert · 2017-08-21 16:35:31 +09:00
  8c84732a40
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 16:25:44 +09:00
  ea450fecf5
• CI.
  smoogipooo · 2017-08-21 16:24:16 +09:00
  6e0d2182cb
• Update framework.
  smoogipooo · 2017-08-21 16:18:04 +09:00
  9369c18d77
• Merge pull request #1148 from smoogipooo/fix-speed-multipliers

  Make DifficultyPoint.SpeedMultiplier actually reflect an increase/decrease in speed

  Dean Herbert · 2017-08-21 16:17:46 +09:00
  2a57dc2bda
• Remove the concept of "queued hit objects", add a default speed adjustment.
  smoogipooo · 2017-08-21 16:17:00 +09:00
  5d13efa76d
• Merge branch 'master' into fix-speed-multipliers
  Dean Herbert · 2017-08-21 15:55:52 +09:00
  ced919edd3
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 15:54:54 +09:00
  be8bc5bdc8
• Make taiko major bar line triangles show up again. Fixes #1081
  smoogipooo · 2017-08-21 15:36:01 +09:00
  6a7e868a2e
• Further support for null judgements.
  smoogipooo · 2017-08-21 15:35:16 +09:00
  7a5708ce92
• Merge pull request #1152 from peppy/fix-sqlite-ci-failures

  Fix CI failing on SQLite concurrency errors

  Dean Herbert · 2017-08-21 13:23:36 +09:00
  76fb84e082
• Ensure the sqlite connection is correctly closed before the game ends

  Hopefully fixes CI race conditions between consecutive tests.

  Dean Herbert · 2017-08-21 13:05:47 +09:00
  e7c9aec1b1
• Remove type check for now
  Dean Herbert · 2017-08-21 12:50:48 +09:00
  a63923a497
• Update KeyCounterCollection to support action-based buttons
  Dean Herbert · 2017-08-21 12:39:22 +09:00
  16e96888ab
• Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits. Fixes #1149
  smoogipooo · 2017-08-21 12:05:56 +09:00
  0970439e34