6601 Commits

This Branch

This Branch

All Branches

• Merge upstream/master in.
  Dean Herbert · 2017-08-18 22:20:45 +09:00
  bc7621607a
• Merge pull request #1110 from swoolcock/fix-spinner-ignoring-actions

  Fix spinner not handling left/right action bindings

  Dean Herbert · 2017-08-18 19:31:22 +09:00
  c0c90f85af
• Remove unnecessary using
  Shane Woolcock · 2017-08-18 19:39:28 +09:30
  9558d2a161
• Simplify OsuActionInputManager property
  Shane Woolcock · 2017-08-18 19:32:08 +09:30
  44feef78f1
• More CI fixes
  Shane Woolcock · 2017-08-18 16:58:01 +09:30
  529732ea47
• Trim whitespace
  Shane Woolcock · 2017-08-18 16:49:10 +09:30
  90dacd9861
• Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler
  Shane Woolcock · 2017-08-18 16:46:00 +09:30
  9628c0b6d6
• Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists
  Shane Woolcock · 2017-08-18 16:34:01 +09:30
  9c6ca2d159
• Update framework to include PR #977
  Shane Woolcock · 2017-08-18 16:26:48 +09:30
  306c00e593
• Merge branch 'master' into fix-spinner-ignoring-actions
  Shane Woolcock · 2017-08-18 16:25:26 +09:30
  f951120775
• Merge pull request #1102 from swoolcock/make-rulesetinfo-iequatable

  Fix RulesetInfo equality comparison giving false negatives

  Dan Balasescu · 2017-08-18 15:17:50 +09:00
  9cda37a386
• Round 2 of CI fixes.
  smoogipooo · 2017-08-18 15:09:54 +09:00
  90885a31ae
• Fix CI issues.
  smoogipooo · 2017-08-18 14:40:36 +09:00
  a47b6526a2
• Merge branch 'master' into make-rulesetinfo-iequatable
  Dan Balasescu · 2017-08-18 14:28:42 +09:00
  68303accef
• Merge pull request #1100 from swoolcock/fix-ruleset-changing

  No longer update the current ruleset when selecting a new beatmap set

  Dan Balasescu · 2017-08-18 14:27:58 +09:00
  6ffec70028
• Merge branch 'master' into fix-ruleset-changing
  Dan Balasescu · 2017-08-18 13:42:29 +09:00
  0f635c77b3
• Merge pull request #1125 from swoolcock/fix-duplicate-difficulty-control-points

  Fix duplicate DifficultyControlPoints breaking slider velocities

  Dan Balasescu · 2017-08-18 13:41:36 +09:00
  5c84dd1dab
• Merge branch 'master' into fix-ruleset-changing
  Dan Balasescu · 2017-08-18 13:40:52 +09:00
  cc6a5824f0
• Update OsuLegacyDecoder.cs
  Dan Balasescu · 2017-08-18 13:27:16 +09:00
  243a6ca774
• Merge branch 'master' into fix-duplicate-difficulty-control-points
  Dan Balasescu · 2017-08-18 13:12:00 +09:00
  5a9375f336
• Merge pull request #1129 from peppy/fix-nullref

  FIx a possible null reference when login fails

  Dean Herbert · 2017-08-18 12:48:38 +09:00
  7f6b7e2937
• Merge branch 'master' into fix-nullref
  Dan Balasescu · 2017-08-18 12:38:20 +09:00
  f5c3af2f20
• Merge pull request #1116 from MrTheMake/toolbar-button-swap

  Swap the order of the social and chat toolbar buttons

  Dean Herbert · 2017-08-18 11:24:10 +09:00
  a1049ffe01
• Merge branch 'master' into toolbar-button-swap
  Dean Herbert · 2017-08-18 11:18:19 +09:00
  02aa38d1c2
• Merge pull request #1127 from MrTheMake/onscreendisplay-fix

  Fix unlit initial state of the OnScreenDisplay

  Dean Herbert · 2017-08-18 11:12:42 +09:00
  34c1834d38
• Merge branch 'master' into onscreendisplay-fix
  Dean Herbert · 2017-08-18 11:06:12 +09:00
  d919d8b0a3
• Fix a possible nullref when login fails
  Dean Herbert · 2017-08-18 10:49:41 +09:00
  e4b832e8a6
• Merge pull request #1128 from PoULkY/master

  Allow OsuButtons to be filtered in settings

  Dean Herbert · 2017-08-18 10:43:36 +09:00
  34698ed983
• Fix OsuButton doesn't implement IFilterable
  PoULkY · 2017-08-18 01:23:44 +07:00
  cc39aad7f8
• Fix unlit initial state of the OnScreenDisplay
  MrTheMake · 2017-08-17 18:46:16 +02:00
  6118209200
• Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations
  Shane Woolcock · 2017-08-17 23:28:26 +09:30
  df683d9114
• Merge pull request #1121 from peppy/settings-transition-fixes

  Visually improve settings transitions and back button

  Dean Herbert · 2017-08-17 21:18:21 +09:00
  4ad99a2464
• Update MainSettings.cs
  Dean Herbert · 2017-08-17 18:11:15 +09:00
  f459794665
• Remove unused DI retrieval
  Dean Herbert · 2017-08-17 17:47:55 +09:00
  58b1e9c954
• Fix regression causing global hotkeys to no longer work
  Dean Herbert · 2017-08-17 17:47:44 +09:00
  a44ff5a2c2
• Visually improve settings transitions and back button
  Dean Herbert · 2017-08-17 17:31:14 +09:00
  a19fc28cff
• Merge pull request #1119 from smoogipooo/fix-testcasehitobjects

  Fix hitobjects in TestCaseHitObjects not receiving actions

  Dean Herbert · 2017-08-17 13:40:18 +09:00
  18980bc26e
• Merge branch 'master' into fix-spinner-ignoring-actions
  Dan Balasescu · 2017-08-17 12:33:18 +09:00
  f7ccc81875
• Fix hitobjects in TestCaseHitObjects not receiving actions.
  smoogipooo · 2017-08-17 12:16:33 +09:00
  cceeb864d5
• Merge branch 'master' into toolbar-button-swap
  Dan Balasescu · 2017-08-17 10:39:02 +09:00
  69a3251f61
• Merge pull request #1113 from Tom94/use-slider-step

  Use SliderStep instead of TestCaseSliderBar

  Dan Balasescu · 2017-08-17 09:47:11 +09:00
  166301fb2d
• Merge remote-tracking branch 'origin/master' into use-slider-step
  Thomas Müller · 2017-08-17 08:50:48 +09:00
  94d081064d
• Merge pull request #1118 from peppy/key-config-integration

  Integrate key configuration with settings overlay

  Thomas Müller · 2017-08-17 08:49:44 +09:00
  d031f4c101
• More localised key binding hover colour logic
  Thomas Müller · 2017-08-17 08:43:45 +09:00
  4ef1be3080
• Update framework
  Thomas Müller · 2017-08-17 07:28:07 +09:00
  118d0f0970
• Remove unnecessary usings
  Thomas Müller · 2017-08-17 07:26:24 +09:00
  55b159b976
• Use SliderStep instead of TestCaseSliderBar

  This greatly simplifies TestCaseKeyCounter and TestCaseHitObject and allows more future automation.

  Thomas Müller · 2017-08-17 07:26:24 +09:00
  8c05a40fbf
• Swap the order of the social and chat toolbar buttons
  MrTheMake · 2017-08-16 17:00:30 +02:00
  94d664a626
• Update framework
  Dean Herbert · 2017-08-16 23:22:12 +09:00
  c6c9c5431f
• Add basic back button
  Dean Herbert · 2017-08-16 23:20:18 +09:00
  0c19202b9a