19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into exit-hold-confirmation
  Dean Herbert · 2018-05-14 18:13:40 +09:00
  f14948c022
• Move hud below the skip button
  smoogipoo · 2018-05-14 18:02:18 +09:00
  115c2dc239
• Merge pull request #2542 from peppy/overlays-dont-handle-dragstart

  Stop focused overlays from handling DragStart

  Dan Balasescu · 2018-05-14 17:58:10 +09:00
  f0b7ed238c
• Fix instant movement not doing anything
  smoogipoo · 2018-05-14 17:47:38 +09:00
  027f6c3fa4
• Inline method
  smoogipoo · 2018-05-14 17:45:11 +09:00
  4ceae6ba1f
• Make MusicController handle all movement to previous/next tracks
  smoogipoo · 2018-05-14 17:42:01 +09:00
  6eb7590ab0
• Merge branch 'master' into ruleset-keybindings
  ocboogie · 2018-05-14 01:28:57 -07:00
  bfcfeec9b9
• Stop overlays from handling DragStart

  This was causing weird behaviour with the key configuration section and back button in settings.

  Dean Herbert · 2018-05-14 15:44:19 +09:00
  fe1c1fec0d
• Proxy the ruleset cursor above the break overlay
  smoogipoo · 2018-05-14 15:36:56 +09:00
  64fba5f6d1
• Place break overlay underneath the hud
  smoogipoo · 2018-05-14 15:36:42 +09:00
  43409127b7
• Merge pull request #2538 from smoogipoo/fix-diffcalc-timerates

  Fix performance calculation not considering time-adjustment mods

  Dean Herbert · 2018-05-14 15:35:22 +09:00
  1045199a17
• Merge branch 'master' into fix-diffcalc-timerates
  Dean Herbert · 2018-05-14 15:19:51 +09:00
  39970c831e
• Merge pull request #2533 from peppy/fix-wedge-nullref

  Fix nullref when changing ruleset at main menu

  Dean Herbert · 2018-05-14 15:19:35 +09:00
  07fc71e077
• Re-enable slider distance overflow

  Fixes #2467.

  smoogipoo · 2018-05-14 15:14:29 +09:00
  f5068804d5
• Merge branch 'master' into fix-wedge-nullref
  Dean Herbert · 2018-05-14 15:08:48 +09:00
  345e213eff
• Merge pull request #2527 from peppy/fix-mousewheel-startup-crash

  Fix crash on startup when adjusting volume before volume control loaded

  Dean Herbert · 2018-05-14 14:23:08 +09:00
  5c41e7c39c
• Merge branch 'master' into fix-diffcalc-timerates
  Dean Herbert · 2018-05-14 14:22:39 +09:00
  ecd8b69e5e
• Fix drumroll completions always giving GREAT judgements

  Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.

  smoogipoo · 2018-05-14 14:13:07 +09:00
  7d027098ec
• Merge branch 'master' into fix-wedge-nullref
  Dan Balasescu · 2018-05-14 13:36:07 +09:00
  d7cba000ab
• Merge pull request #2526 from peppy/fix-song-progress-counters

  Fix song progress time counters wrapping after an hour

  Dan Balasescu · 2018-05-14 13:35:58 +09:00
  4a87bbefa0
• Merge branch 'master' into fix-song-progress-counters
  Dan Balasescu · 2018-05-14 13:27:50 +09:00
  2e648a90c8
• Strip whitespaces
  smoogipoo · 2018-05-14 11:54:11 +09:00
  a81921118d
• Resolve linting issues in ToolbarModeSelector.cs
  ocboogie · 2018-05-13 19:43:26 -07:00
  ebd9d1a037
• Use OnKeyDown instead of a IKeyBindingHandler
  ocboogie · 2018-05-13 19:33:52 -07:00
  327c7432be
• Fix mania testcases
  smoogipoo · 2018-05-14 11:33:23 +09:00
  8c86f170a9
• Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
  smoogipoo · 2018-05-14 11:17:39 +09:00
  6e1d651087
• Add more attributes to OsuPerformanceCalculator's output
  smoogipoo · 2018-05-14 11:15:37 +09:00
  ce6b4cc2d3
• Fix TimeRate not being considered for performance calculation
  smoogipoo · 2018-05-14 11:15:14 +09:00
  e1b8a1589b
• Merge branch 'master' into mapping-del
  Dean Herbert · 2018-05-14 10:58:58 +09:00
  ede4d6dd11
• Fix nullref when changing ruleset at main menu
  Dean Herbert · 2018-05-13 12:55:54 +09:00
  db0470243a
• Resolve linting issues in ToolbarModeSelector.cs
  ocboogie · 2018-05-12 17:25:15 -07:00
  26f06a9ae1
• Merge branch 'master' into ruleset-keybindings
  ocboogie · 2018-05-12 16:40:27 -07:00
  76800421c4
• Add global key bindings for changing current ruleset
  ocboogie · 2018-05-12 16:30:29 -07:00
  8a5bd27c20
• Fixes capitalization of enableSeek
  Jacob Odgård Tørring · 2018-05-12 23:10:03 +02:00
  861a8cf9a7
• Merge pull request #2346 from smoogipoo/joystick

  Implement joystick input

  Dean Herbert · 2018-05-13 01:50:14 +09:00
  9515eb4281
• Update framework
  Dean Herbert · 2018-05-13 01:31:17 +09:00
  df43fc6ff8
• Merge remote-tracking branch 'upstream/master' into joystick

  # Conflicts:
  #	osu-framework
  #	osu.Game/Overlays/KeyBinding/KeyBindingRow.cs

  Dean Herbert · 2018-05-13 00:11:17 +09:00
  a162453e9b
• Merge pull request #2525 from smoogipoo/diffcalc-fixes

  Fix osu! difficulty/performance calculation failing or giving wrong values

  Dean Herbert · 2018-05-12 23:25:42 +09:00
  4c55b90fc1
• Merge branch 'master' into diffcalc-fixes
  Dean Herbert · 2018-05-12 22:16:20 +09:00
  f6df704deb
• Simplify expression
  AlFasGD · 2018-05-12 15:09:53 +03:00
  2a90686da6
• Merge pull request #2531 from smoogipoo/pp-hd-change

  Apply HD as speed adjustment

  Dean Herbert · 2018-05-12 21:08:12 +09:00
  0f1af85457
• Merge branch 'master' into diffcalc-fixes
  Dean Herbert · 2018-05-12 21:01:58 +09:00
  36af7feab3
• Enables/Disables seek and Play/Resume on call to beatmapDisabledChanged
  Jacob Odgård Tørring · 2018-05-12 11:55:52 +02:00
  a7e7c3a74a
• Port osu-performance changes into OsuPerformanceCalculator
  smoogipoo · 2018-05-12 15:46:25 +09:00
  416ed72597
• Merge pull request #2530 from peppy/update-framework

  Update framework with upstream fixes

  Dan Balasescu · 2018-05-12 11:19:32 +09:00
  v2018.511.0 67e1dca0f9
• Update framework with upstream fixes
  Dean Herbert · 2018-05-12 11:11:09 +09:00
  6ebe9f88e7
• Remove unused using.
  DrabWeb · 2018-05-11 13:56:27 -03:00
  937ff50a5a
• Merge https://github.com/ppy/osu into screen-breadcrumbs
  DrabWeb · 2018-05-11 13:45:19 -03:00
  9c8ef0f0aa
• Make DrawableRooms select when they are clicked.
  DrabWeb · 2018-05-11 13:43:53 -03:00
  41de02fc78
• Merge https://github.com/ppy/osu into drawable-room-improvements
  DrabWeb · 2018-05-11 13:41:50 -03:00
  518dec0c68