24822 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into update-deploy-paths
  Dan Balasescu · 2017-08-19 12:33:39 +09:00
  96e8635f05
• Merge pull request #1135 from peppy/input-hotfix

  Fix custom logic still existing in OsuInputManager

  Dan Balasescu · 2017-08-19 12:33:31 +09:00
  583056d62a
• Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134.
  smoogipooo · 2017-08-19 12:28:54 +09:00
  3ea7be1ccf
• Update paths
  Dean Herbert · 2017-08-19 12:28:23 +09:00
  1e6d99a4ef
• Fix sliders not checking the correct cursor position once it moves out of the follow circle
  Shane Woolcock · 2017-08-19 12:19:37 +09:30
  51af233d66
• Fix custom logic still existing in OsuInputManager
  Dean Herbert · 2017-08-19 07:24:29 +09:00
  f829caf197
• CI fix
  MrTheMake · 2017-08-19 00:13:06 +02:00
  f831832c59
• Merge branch 'master' into leaderboard-scores
  MrTheMake · 2017-08-19 00:00:40 +02:00
  6d401b5f21
• Merge pull request #1115 from swoolcock/fix-sliders-ignoring-actions

  Fix sliders ignoring actions past the initial hitcircle

  Dean Herbert · 2017-08-19 00:44:36 +09:00
  v2017.819.0 41072640c8
• Merge branch 'master' into fix-sliders-ignoring-actions
  Dean Herbert · 2017-08-19 00:30:40 +09:00
  a8996b8b5f
• Merge pull request #1095 from smoogipooo/taiko-timingchanges-2

  Make taiko use the new ScrollingPlayfield.

  Dean Herbert · 2017-08-18 22:51:07 +09:00
  1249cc8eb9
• Merge branch 'master' into taiko-timingchanges-2
  Dean Herbert · 2017-08-18 22:44:36 +09:00
  86d97aa16b
• Merge pull request #1099 from swoolcock/fix-track-not-resetting

  Fixes an issue where a beatmap would not reset after playing it

  Dean Herbert · 2017-08-18 22:39:28 +09:00
  49422a61d7
• Merge branch 'master' into fix-track-not-resetting
  Dean Herbert · 2017-08-18 22:31:59 +09:00
  c34033c94a
• Merge upstream/master in.
  Dean Herbert · 2017-08-18 22:20:45 +09:00
  bc7621607a
• Merge pull request #1131 from peppy/actionable-mouse-buttons

  Add support for binding mouse buttons to actions

  Dan Balasescu · 2017-08-18 21:52:58 +09:00
  df2a5835eb
• Add support for binding mouse buttons to actions
  Dean Herbert · 2017-08-18 20:01:41 +09:00
  d6249e7a63
• Fix slider tracking to use pressed actions rather than directly querying the mouse buttons
  Shane Woolcock · 2017-08-18 20:19:23 +09:30
  7e0fe6cbcb
• 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
• Add some comments explaining why the Track is being forcefully added to the TrackManager
  Shane Woolcock · 2017-08-18 18:01:18 +09:30
  4901ac9e35
• Merge branch 'master' into fix-track-not-resetting
  Dean Herbert · 2017-08-18 17:24:22 +09:00
  ffc8f763e5
• Make current value behaviour between channels and tabs consistent.

  - Trim whitespace

  naoey · 2017-08-18 13:35:48 +05:30
  7ad4c046db
• 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