19539 Commits

This Branch

This Branch

All Branches

• 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
• Make sure that 0 SR is returned when there are no hitobjects
  smoogipoo · 2018-06-21 12:04:14 +09:00
  48989df6eb
• Merge branch 'master' into improve-volume-controls
  Dean Herbert · 2018-06-21 11:56:56 +09:00
  65487d1610
• Merge branch 'master' into master
  Dean Herbert · 2018-06-21 11:40:37 +09:00
  285062d93e
• Merge branch 'master' into Private_Messages
  Dean Herbert · 2018-06-21 11:37:19 +09:00
  5157a069bc
• 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
• Merge branch 'master' into more-diffcalc-attributes
  Dan Balasescu · 2018-06-21 09:26:50 +09:00
  bf11a61d52
• don't expose HyperDashModifier directly
  ekrctb · 2018-06-20 20:08:27 +09:00
  9194fd8dfe
• Merge remote-tracking branch 'origin/master' into catch-stable-hyper
  ekrctb · 2018-06-20 19:06:54 +09:00
  79c5596b27
• Fix droplet position clamping
  ekrctb · 2018-06-20 18:29:23 +09:00
  516b1c5495
• 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
• Clamp juice stream position
  ekrctb · 2018-06-20 17:23:55 +09:00
  9d7e5b4920
• 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 branch 'master' into select_resolution_in_fullscreen_mode
  Dean Herbert · 2018-06-20 13:19:39 +09:00
  ee0950a845
• Fix background screens not supporting early-exit condition

  Closes #2681.

  Dean Herbert · 2018-06-20 12:43:48 +09:00
  b95042e370
• 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
• Remove default bindings for right actions
  Tom Arrow · 2018-06-19 18:04:53 +02:00
  d753df65a5
• Merge branch 'master' into ruleset-container
  Dan Balasescu · 2018-06-19 21:47:10 +09:00
  77e03a59a9
• RulesetContainer<TObject> cannot be derived
  Tom Arrow · 2018-06-19 14:31:24 +02:00
  ad883e087a
• Merge pull request #2836 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-06-19 21:12:16 +09:00
  2018.618.0 58b551b98e
• Merge branch 'master' into update-framework
  Dan Balasescu · 2018-06-19 20:57:19 +09:00
  0b1b3319aa
• Merge branch 'master' into improve-editor-scrolling
  Dean Herbert · 2018-06-19 20:23:41 +09:00
  e17d60db8a
• Update framework
  Dean Herbert · 2018-06-19 20:19:52 +09:00
  3819ecb2be
• Merge pull request #2829 from tom-arrow/reverse-arrow-fix

  Fix reverse arrow displayed with incorrect angle

  Dean Herbert · 2018-06-19 20:17:16 +09:00
  b9d63ee7b1
• Merge branch 'master' into reverse-arrow-fix
  Dean Herbert · 2018-06-19 20:06:37 +09:00
  cb24957c62