23617 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into math_clamp
  Dan Balasescu · 2019-11-21 11:08:56 +09:00
  a7c074ff37
• Merge pull request #6890 from peppy/fix-song-select-scroll

  Fix song select not always scrolling to the correct location

  Dan Balasescu · 2019-11-21 10:53:33 +09:00
  7d21118c77
• Merge branch 'master' into fix-song-select-scroll
  Dan Balasescu · 2019-11-21 10:22:52 +09:00
  ec35d92ec0
• Merge pull request #6896 from iiSaLMaN/implement-aggregate-audio-adjustment-properties

  Implement IAggregateAudioAdjustments properties for FallbackSampleStore

  Dean Herbert · 2019-11-21 09:44:04 +09:00
  31e58eb682
• Implement IAggregateAudioAdjustments properties for FallbackSampleStore
  iiSaLMaN · 2019-11-21 03:20:08 +03:00
  5391c752b4
• Fix CI
  Berkan Diler · 2019-11-20 14:25:44 +01:00
  66a3837ff4
• Merge branch 'math_clamp' of https://github.com/turbedi/osu into math_clamp
  Berkan Diler · 2019-11-20 13:40:30 +01:00
  a36c2aa266
• .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
  Berkan Diler · 2019-11-20 13:37:47 +01:00
  6cab517b2d
• Merge branch 'math_clamp' of https://github.com/turbedi/osu into math_clamp
  Berkan Diler · 2019-11-20 13:20:27 +01:00
  6fec9826c6
• .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
  Berkan Diler · 2019-11-20 13:19:49 +01:00
  da41b70d43
• Remove unused Using directives
  Berkan Diler · 2019-11-20 13:18:03 +01:00
  b7d5e36890
• Merge branch 'master' into math_clamp
  Berkan Diler · 2019-11-20 13:05:03 +01:00
  39d5ceb77d
• Replace all Mathhelper.Clamp usages with Math.Clamp
  Berkan Diler · 2019-11-20 12:43:14 +01:00
  6cace0c5f5
• Fix song select not always scrolling to the correct location
  Dean Herbert · 2019-11-20 19:39:13 +09:00
  3ba9f840fd
• Fix carousel filtering twice on startup due to unpopulated rule… (#6833)

  Fix carousel filtering twice on startup due to unpopulated ruleset

  Dean Herbert · 2019-11-20 19:39:00 +09:00
  a81c26577d
• Move to .NET Standard 2.1 (#6837)

  Move to .NET Standard 2.1
  
  Co-authored-by: Shane Woolcock <samahnub@gmail.com>

  Dean Herbert · 2019-11-20 17:57:00 +09:00
  8d7be98b8b
• Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
  Dean Herbert · 2019-11-20 17:24:54 +09:00
  8c9ed99b1b
• Move initial filter to run on entering
  Dean Herbert · 2019-11-20 17:24:43 +09:00
  5b416eb7ba
• Fix crash when loading results after gameplay (#6886)

  Fix crash when loading results after gameplay

  Dean Herbert · 2019-11-20 15:52:09 +09:00
  74c034aee8
• Move method
  Dean Herbert · 2019-11-20 15:43:00 +09:00
  e0f59d8e24
• Add null check
  smoogipoo · 2019-11-20 13:42:54 +09:00
  6288e6da56
• Fix crash when loading results after gameplay
  smoogipoo · 2019-11-20 12:21:49 +09:00
  76ed573c56
• Merge branch 'master' into netstandard2.1
  Huo Yaoyuan · 2019-11-19 21:40:12 +08:00
  b5c20fecee
• Re-add package references to osu.iOS.props
  Shane Woolcock · 2019-11-19 13:47:29 +09:00
  465c8c2618
• Merge pull request #6872 from huoyaoyuan/xml-doc-fixes

  Fix bad references in xml doc

  Dan Balasescu · 2019-11-19 12:12:53 +09:00
  7eaafe63cb
• Bump Android test projects version.
  Huo Yaoyuan · 2019-11-18 18:48:29 +08:00
  efbab54206
• Update .Net Standard projects to 2.1
  Huo Yaoyuan · 2019-11-18 18:35:58 +08:00
  608785b99a
• Bump Xamarin.Android version to 10.0
  Huo Yaoyuan · 2019-11-18 18:35:58 +08:00
  140278bf4c
• Use costum displaying text for inherited references.
  Huo Yaoyuan · 2019-11-18 15:29:18 +08:00
  53bc2dcab7
• Sadly, xmldoc doesn't support tuple elements.
  Huo Yaoyuan · 2019-11-17 21:01:56 +08:00
  4d1513cef6
• Reference elements in origin definition.
  Huo Yaoyuan · 2019-11-17 20:55:40 +08:00
  b04bca7db6
• Use paramref.
  Huo Yaoyuan · 2019-11-17 20:49:36 +08:00
  b1b234c6fb
• Use typeparamref.
  Huo Yaoyuan · 2019-11-17 20:48:23 +08:00
  f05b83d7d4
• Turn on xmldoc warning, and use appendive syntax for NoWarn.
  Huo Yaoyuan · 2019-11-17 20:43:34 +08:00
  5727963f86
• Add private setter for FilterControl
  Dean Herbert · 2019-11-15 18:23:35 +09:00
  e9e37fc821
• Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
  Dean Herbert · 2019-11-15 18:20:36 +09:00
  296fff9243
• Merge pull request #6846 from peppy/fix-mod-retention

  Fix selected mods not being retained on exiting song select

  Dan Balasescu · 2019-11-15 18:07:00 +09:00
  3e3427c3e8
• Remove unintentional dependency
  Dean Herbert · 2019-11-15 14:51:01 +09:00
  813aebca1d
• Fix broken merge
  Dean Herbert · 2019-11-15 13:51:39 +09:00
  2c3109980a
• Allow screen to specify whether to apply audio rate adjustments from mods
  Dean Herbert · 2019-11-15 13:47:14 +09:00
  6d06b444ba
• Merge remote-tracking branch 'upstream/master' into fix-mod-retention
  Dean Herbert · 2019-11-15 13:46:44 +09:00
  b8bb97607b
• Clean up carousel tests (#6834)

  Clean up carousel tests
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-11-15 13:19:21 +09:00
  aa0feea3c3
• Merge branch 'master' into clean-carousel-tests
  Dan Balasescu · 2019-11-15 12:12:43 +09:00
  1fd6bf54d2
• Fix remaining cases of pollution
  Dean Herbert · 2019-11-15 11:46:32 +09:00
  e81dfcad4c
• Fix database unique constraint issues on some imports (#6852)

  Fix database unique constraint issues on some imports

  Dean Herbert · 2019-11-15 11:32:12 +09:00
  20ab8f64c4
• Clear count variables on carousel creation
  Dean Herbert · 2019-11-15 11:26:01 +09:00
  22c3be2c6f
• Merge branch 'master' into fix-duplicate-online-ids
  Dan Balasescu · 2019-11-15 11:12:06 +09:00
  644c581c92
• Merge branch 'master' into clean-carousel-tests
  Dan Balasescu · 2019-11-15 10:28:59 +09:00
  af01d8ca34
• Merge pull request #6847 from peppy/commit-on-focus-lost

  Make settings textboxes commit on focus lost

  Dan Balasescu · 2019-11-15 10:27:40 +09:00
  1d581b3073
• Merge branch 'master' into fix-duplicate-online-ids
  Dean Herbert · 2019-11-15 10:18:53 +09:00
  0e587cb9f5