13014 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into api-offline-early-return
  Dean Herbert · 2018-06-22 13:16:30 +09:00
  5d3b51b8d4
• Merge pull request #2469 from UselessToucan/multiple_previews_different_overlays

  Centralise preview track handling

  Dan Balasescu · 2018-06-22 13:13:07 +09:00
  2801c18845
• Rename Stop to StopAnyPlaying for clarity
  Dean Herbert · 2018-06-22 12:35:43 +09:00
  73e13e2d63
• Apply some code review
  Dean Herbert · 2018-06-22 12:33:30 +09:00
  4b2b1f51f9
• Merge branch 'master' into multiple_previews_different_overlays
  Dean Herbert · 2018-06-22 10:44:36 +09:00
  de10480e95
• Merge pull request #2848 from peppy/notification-usability

  Improve log to notification forwarding

  Dean Herbert · 2018-06-21 20:04:00 +09:00
  2018.621.0 91af960200
• Merge branch 'master' into notification-usability
  Dan Balasescu · 2018-06-21 19:48:16 +09:00
  465342c636
• Remove unused field
  smoogipoo · 2018-06-21 19:37:45 +09:00
  15bb301d14
• Add testcases
  smoogipoo · 2018-06-21 19:31:07 +09:00
  1932399521
• XMLDoc all the things
  smoogipoo · 2018-06-21 18:54:50 +09:00
  63a6fc2596
• Fix possible incorrect order of events due to threaded load
  smoogipoo · 2018-06-21 18:45:32 +09:00
  40ed3fdd05
• Rework preview tracks to reduce usage complexities
  smoogipoo · 2018-06-21 18:40:27 +09:00
  b2066c5d73
• Merge pull request #2851 from peppy/remove-dangling-files

  Remove vscode files from long-gone deploy project

  Dean Herbert · 2018-06-21 18:34:05 +09:00
  fcf7e211fa
• Merge pull request #2593 from frankhjwx/catch_star_rating

  Implement osu!catch star rating

  Dean Herbert · 2018-06-21 18:29:22 +09:00
  8706740825
• Merge remote-tracking branch 'upstream/master' into frankhjwx-catch_star_rating
  Dean Herbert · 2018-06-21 17:49:13 +09:00
  999d3a240d
• Use var where possible
  Dean Herbert · 2018-06-21 17:49:04 +09:00
  34498f7f86
• Remove unnecessary AimRating
  Dean Herbert · 2018-06-21 17:32:10 +09:00
  c64f64814f
• Merge pull request #2828 from smoogipoo/improve-editor-scrolling

  Always perform non-seeked scroll in the editor while audio is playing

  Dean Herbert · 2018-06-21 17:24:15 +09:00
  5c63b3ddac
• Remove vscode files from long-gone deploy project
  Dean Herbert · 2018-06-21 17:22:59 +09:00
  4982efce88
• Replace usage of GetEnumerator
  Dean Herbert · 2018-06-21 16:31:33 +09:00
  a9cb214aa9
• Merge branch 'master' into catch_star_rating
  Dean Herbert · 2018-06-21 15:57:55 +09:00
  d00c578b05
• Merge pull request #2841 from tom-arrow/taiko-mouse-input

  Bind mouse clicks with only one TaikoAction

  Dean Herbert · 2018-06-21 14:51:09 +09:00
  4c14f547dd
• Split out logic for subsequent log message and apply action to only itself
  Dean Herbert · 2018-06-21 14:50:42 +09:00
  6ec0aaee91
• Start displaying notifications earlier

  Also show important notifications and more in total.

  Dean Herbert · 2018-06-21 14:43:38 +09:00
  87d94591e4
• Decrease notification font size
  Dean Herbert · 2018-06-21 14:43:02 +09:00
  ed17a241f5
• Change order of default initialisation to look better in settings
  Dean Herbert · 2018-06-21 14:28:40 +09:00
  566d125658
• Add (one-way) migration for existing users
  Dean Herbert · 2018-06-21 14:22:25 +09:00
  6aa0ca5cc9
• Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays
  smoogipoo · 2018-06-21 13:24:02 +09:00
  ab2889da1f
• Merge remote-tracking branch 'upstream/master' into tom-arrow-taiko-mouse-input
  Dean Herbert · 2018-06-21 13:19:34 +09:00
  9908957412
• What the...
  smoogipoo · 2018-06-21 13:12:22 +09:00
  afcf91a4c5
• Merge pull request #2559 from KoziLord/ParallaxContainerImprovement

  Add support for negative ParallaxAmount in ParallaxContainer

  Dean Herbert · 2018-06-21 13:06:09 +09:00
  498302e298
• Expose the catch width from the Catcher
  smoogipoo · 2018-06-21 12:57:59 +09:00
  9314f49bc3
• Add documentation for negative values of ParallaxAmount
  Dean Herbert · 2018-06-21 12:49:07 +09:00
  74f732038f
• Add tests for ParallaxContainer
  Dean Herbert · 2018-06-21 12:48:57 +09:00
  df0083e3d9
• Dim TestCase background a bit
  Dean Herbert · 2018-06-21 12:48:44 +09:00
  5f2d1d4a1e
• Fix post-merge errors
  smoogipoo · 2018-06-21 12:26:21 +09:00
  5d0c847835
• Merge remote-tracking branch 'origin/master' into catch_star_rating

  # Conflicts:
  #	osu-framework
  #	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
  #	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs

  smoogipoo · 2018-06-21 12:15:25 +09:00
  c9581a2d56
• Merge branch 'master' into ParallaxContainerImprovement
  Dean Herbert · 2018-06-21 12:10:10 +09:00
  733b7d1177
• Merge pull request #2708 from DrabWeb/multiplayer-match

  Multiplayer match screen

  Dean Herbert · 2018-06-21 10:33:37 +09:00
  bf9b210a44
• Tidy up ReadyButton
  Dean Herbert · 2018-06-21 10:21:54 +09:00
  2a42418dbf
• Change required child to use same structure as other use cases
  Dean Herbert · 2018-06-21 10:12:12 +09:00
  4c068097c8
• Give TestLounge a background to make transitions work correctly
  Dean Herbert · 2018-06-21 09:54:13 +09:00
  2697579448
• Remove schedule logic (seems unnecessary)
  Dean Herbert · 2018-06-20 17:41:48 +09:00
  96100a2200
• Simplify and synchronise multiplayer screen transitions
  Dean Herbert · 2018-06-20 17:25:22 +09:00
  39649747aa
• Group ValueChanged attachment with bindings
  Dean Herbert · 2018-06-20 17:06:02 +09:00
  f0c72438a3
• Merge branch 'master' into multiplayer-match
  Dean Herbert · 2018-06-20 14:49:32 +09:00
  3f020a2802
• Merge pull request #2831 from ThePyrotechnic/ShowMorePadding

  Add padding to "show more" button

  Dean Herbert · 2018-06-20 12:27:47 +09:00
  a01a0b7d52
• Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
  Dean Herbert · 2018-06-20 10:45:43 +09:00
  3eb0a17978
• Use vertical/horizontal pair instead
  Dean Herbert · 2018-06-20 10:45:35 +09:00
  d7f65d62e0
• Merge pull request #2838 from tom-arrow/ruleset-container

  RulesetContainer<TObject> cannot be derived

  Dean Herbert · 2018-06-20 10:36:31 +09:00
  03db19eb9c