6725 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into zero-notifications-closes
  Dean Herbert · 2017-08-22 22:45:52 +09:00
  a257c6846e
• Merge pull request #1167 from peppy/cursor-rotation-delay

  Don't start rotating the cursor until it has travelled a minimum distance

  Dean Herbert · 2017-08-22 22:45:35 +09:00
  1ebc3ace58
• Merge branch 'master' into cursor-rotation-delay
  Dan Balasescu · 2017-08-22 20:28:28 +09:00
  7689c06471
• Merge pull request #1159 from smoogipooo/mania-key-conversion

  Implement mania key conversion for converted beatmaps

  Dean Herbert · 2017-08-22 20:26:32 +09:00
  bf13618c77
• Merge branch 'master' into mania-key-conversion
  Dean Herbert · 2017-08-22 20:08:39 +09:00
  9f52ecbb8a
• Merge branch 'master' into cursor-rotation-delay
  Dan Balasescu · 2017-08-22 19:54:10 +09:00
  f371ca73f1
• Merge pull request #1161 from peppy/volume-control-fixes

  Update volume control logic to use key bindings

  Dan Balasescu · 2017-08-22 19:52:39 +09:00
  a06cd9b419
• Allow the notification overlay to close when all notifications are dismissed
  Dean Herbert · 2017-08-22 19:51:42 +09:00
  480d839d67
• Merge branch 'master' into volume-control-fixes
  Dean Herbert · 2017-08-22 18:59:02 +09:00
  9e96ee989d
• Merge branch 'master' into cursor-rotation-delay
  Dean Herbert · 2017-08-22 18:58:57 +09:00
  2f915fce40
• Merge pull request #1162 from peppy/nullref-fix

  Fix a nullref when reaching the results screen with no user provided

  Dan Balasescu · 2017-08-22 18:56:06 +09:00
  ad16f41e26
• Remove permitNulls
  Dean Herbert · 2017-08-22 18:28:32 +09:00
  c5a20e3372
• Tidy up conditionals
  Dean Herbert · 2017-08-22 18:21:00 +09:00
  97acff535d
• Merge branch 'master' into nullref-fix
  Dean Herbert · 2017-08-22 18:19:15 +09:00
  acf5442ca3
• Merge pull request #1165 from peppy/move-screen-restrictions

  Fix backwards conditional causing crash at song select

  Dean Herbert · 2017-08-22 18:16:34 +09:00
  236a9ea728
• Merge branch 'master' into move-screen-restrictions
  Dean Herbert · 2017-08-22 17:52:59 +09:00
  fc076eaff3
• Merge pull request #1164 from smoogipooo/fix-speed-adjustments

  Fix hit objects not being given the correct speed adjustments

  Dean Herbert · 2017-08-22 17:52:44 +09:00
  398169782e
• Don't start rotating the cursor until it has travelled a minimum disatnce

  Some people, myself included, were annoyed by the rotation starting too soon (especially when dragging up and left one pixel).

  Dean Herbert · 2017-08-22 17:38:51 +09:00
  d8de6e289c
• Update framework
  Dean Herbert · 2017-08-22 17:25:45 +09:00
  a26885c1ab
• Fix backwards conditional
  Dean Herbert · 2017-08-22 17:21:19 +09:00
  8f32fd28c9
• Merge branch 'master' into fix-speed-adjustments
  Dean Herbert · 2017-08-22 17:07:31 +09:00
  8df72e0fec
• Ensure score's user is set directly from API

  Previously would fail in visualtests due to `OsuGame` case.

  Dean Herbert · 2017-08-22 16:59:54 +09:00
  803cbddfe2
• Merge pull request #1163 from peppy/move-screen-restrictions

  Move beatmap/ruleset change restrictions to OsuGame

  Dan Balasescu · 2017-08-22 16:48:13 +09:00
  841805f8f0
• Add exceptions galore.
  smoogipooo · 2017-08-22 16:46:12 +09:00
  2f2abf122b
• Make availableColumns into a ctor argument.
  smoogipooo · 2017-08-22 16:22:40 +09:00
  e337fbcf4f
• Explicitly store defaultSpeedAdjustment, and make it un-removable
  smoogipooo · 2017-08-22 16:15:50 +09:00
  0189f01402
• Fix further incorrect comparison.
  smoogipooo · 2017-08-22 16:10:58 +09:00
  5a3c0de7ad
• CI fixes.
  smoogipooo · 2017-08-22 16:06:25 +09:00
  a737f5fe0d
• Add NUnit test for ScrollingHitObjectContainer

  Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.

  smoogipooo · 2017-08-22 16:06:19 +09:00
  d20ea97e7f
• 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
• 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