12038 Commits

This Branch

This Branch

All Branches

• 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
• 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
• 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
• Fix incorrect count
  smoogipoo · 2018-05-11 22:06:16 +09:00
  a337248999
• Merge pull request #2485 from santerinogelainen/modmouseup

  Selecting a mod triggers on release

  Dean Herbert · 2018-05-11 21:57:53 +09:00
  18de235486
• Fix incorrect osu! difficulty calculator combo count
  smoogipoo · 2018-05-11 21:49:16 +09:00
  224f1a0810
• Fix score accuracy not being populated
  smoogipoo · 2018-05-11 21:49:10 +09:00
  7e7a5f8964
• Fix score statistics not being read
  smoogipoo · 2018-05-11 21:49:06 +09:00
  8ca67f63ec
• Fix readonly field
  Dean Herbert · 2018-05-11 21:48:35 +09:00
  aa5d5ab2a8
• Merge branch 'master' into modmouseup
  Dean Herbert · 2018-05-11 21:41:14 +09:00
  f1fd2ae7be
• Make mods screen dynamically testable
  Dean Herbert · 2018-05-11 21:40:48 +09:00
  7cb0d328e6
• Add a pressing effect to make mouse up response feel good
  Dean Herbert · 2018-05-11 21:40:36 +09:00
  4fc887b25f
• Merge pull request #2492 from smoogipoo/ruleset-beatmap-statistics

  Add mode-specific beatmap statistics

  Dean Herbert · 2018-05-11 17:54:15 +09:00
  ac514c5d20
• Merge branch 'master' into ruleset-beatmap-statistics
  Dean Herbert · 2018-05-11 17:37:50 +09:00
  c19432dc6d
• Merge pull request #2518 from DrabWeb/breadcrumb-design-adjustments

  BreadcrumbControl design adjustments

  Dean Herbert · 2018-05-11 17:37:06 +09:00
  ed7d6f9268
• Merge branch 'master' into breadcrumb-design-adjustments
  Dean Herbert · 2018-05-11 17:19:26 +09:00
  2afc0c1abd
• Merge pull request #2519 from DrabWeb/multiplayer-folder-restructure

  Multiplayer folder restructure

  Dean Herbert · 2018-05-11 16:31:00 +09:00
  3ddeeadb8b
• Remove some unnecessary changes
  smoogipoo · 2018-05-11 14:13:52 +09:00
  fd9796d08c
• Pass down ruleset to the buffered wedge
  smoogipoo · 2018-05-11 14:10:53 +09:00
  816ad5c426
• Fix post-merge errors
  smoogipoo · 2018-05-11 14:08:17 +09:00
  2bab08c437
• Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics

  # Conflicts:
  #	osu.Game/Beatmaps/Beatmap.cs

  smoogipoo · 2018-05-11 14:05:40 +09:00
  73465c35fa
• Remove unused usings caused by multiplayer folder restructuring.
  DrabWeb · 2018-05-10 20:49:42 -03:00
  a86843ccc9
• Move multiplayer screens to osu.Game/Screens/Multi/Screens
  DrabWeb · 2018-05-10 20:47:25 -03:00
  bc9ac8f72a
• Move multiplayer screen components to osu.Game/Screens/Multi/Components
  DrabWeb · 2018-05-10 20:44:24 -03:00
  2d206d258a
• Rename osu.Game/Screens/Multiplayer to Multi.
  DrabWeb · 2018-05-10 20:39:05 -03:00
  c35760fdef
• Adjust BreadcrumbControl to better match the designs.
  DrabWeb · 2018-05-10 20:30:03 -03:00
  ecb8de29a2
• Merge pull request #2491 from smoogipoo/beatmap-conversion-rework

  Rework beatmap conversion process to use IBeatmap

  Dean Herbert · 2018-05-10 20:08:37 +08:00
  0afe33d32f
• Merge branch 'master' into beatmap-conversion-rework
  Dean Herbert · 2018-05-10 19:10:07 +08:00
  8a6ef0dabb
• Merge pull request #2490 from smoogipoo/i-beatmap

  Migrate the game to use an IBeatmap interface

  Dean Herbert · 2018-05-10 19:07:17 +08:00
  7fd38e4780
• Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
  Dean Herbert · 2018-05-10 19:51:52 +09:00
  9e26bcd571
• Move IBeatmap to its own file
  Dean Herbert · 2018-05-10 19:51:40 +09:00
  40c1b24b3d
• Merge pull request #2516 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-05-10 17:18:39 +08:00
  2bb671cf9e
• Update framework
  Dean Herbert · 2018-05-10 17:52:48 +09:00
  c7443e6b3b
• Merge pull request #2482 from smoogipoo/use-bindable-transforms

  Use bindable transforms

  Dean Herbert · 2018-05-10 13:50:13 +08:00
  3504f7393f
• Merge branch 'master' into use-bindable-transforms
  Dean Herbert · 2018-05-10 11:45:29 +08:00
  2e9c91c32f
• Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change

  Fix beatmap/ruleset being changeable while in the editor

  Dean Herbert · 2018-05-10 11:45:23 +08:00
  aa69e0ef12
• Merge branch 'master' into fix-editor-beatmap-change
  Dean Herbert · 2018-05-10 11:37:36 +08:00
  fff34be814
• Merge pull request #2501 from smoogipoo/remove-explicit-clock

  Remove explicit clock in TestCaseBreakOverlay

  Dean Herbert · 2018-05-10 11:15:06 +08:00
  e44faebea6
• Merge branch 'master' into remove-explicit-clock
  Dean Herbert · 2018-05-10 11:06:49 +08:00
  5f5e97220d
• Merge pull request #2471 from UselessToucan/change_ruleset_via_direct_while_on_scorescreen

  Decouple FilterControl.Ruleset from the game-wide ruleset bindable

  Dan Balasescu · 2018-05-09 14:09:54 +09:00
  3c689359af
• Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
  Dan Balasescu · 2018-05-09 14:02:20 +09:00
  929e8f16df
• Remove explicit clock in TestCaseBreakOverlay
  smoogipoo · 2018-05-09 12:40:04 +09:00
  c7bc79bce3
• Merge pull request #2498 from peppy/update-cfs

  Update CodeFileSanity

  Dan Balasescu · 2018-05-08 10:24:21 +09:00
  96baee4e5c
• Update CodeFileSanity
  Dean Herbert · 2018-05-07 22:08:45 +09:00
  c2979a5c48