22646 Commits

This Branch

This Branch

All Branches

• Update framework (#6467)

  Update framework

  Dean Herbert · 2019-10-11 14:10:58 +09:00
  45318bdcdd
• Update framework
  Dean Herbert · 2019-10-11 13:55:58 +09:00
  44853c262c
• Update to .NET core 3.0 (#6458)

  Update to .NET core 3.0
  
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-10-10 23:54:48 +09:00
  2019.1010.0 a4501e8ad5
• Merge branch 'master' into netcore-30
  Dan Balasescu · 2019-10-10 23:38:24 +09:00
  d2f1f54078
• Merge pull request #6219 from LeNitrous/cleanup-intros

  Move common logic to IntroScreen

  Dan Balasescu · 2019-10-10 22:15:49 +09:00
  11c0071429
• Merge branch 'master' into cleanup-intros
  Dan Balasescu · 2019-10-10 21:58:54 +09:00
  356c0fdca0
• Update cake dependencies
  Dean Herbert · 2019-10-10 17:51:56 +09:00
  4a4830c717
• Remove cake csproj
  Dean Herbert · 2019-10-10 17:51:00 +09:00
  d75275c0ee
• Update appveyor images
  Dean Herbert · 2019-10-10 17:50:00 +09:00
  3fd4b0da50
• Update cake bootstrap scripts
  Dean Herbert · 2019-10-10 17:48:56 +09:00
  a6588adbec
• Update 2.2 references
  Dean Herbert · 2019-10-10 17:45:38 +09:00
  5d6648d9c9
• Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.1010.0' into netcore-30
  Dean Herbert · 2019-10-10 17:43:18 +09:00
  3de670c56a
• Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework-2019.1010.0' into netcore-30
  Dean Herbert · 2019-10-10 17:42:56 +09:00
  b9a14b06a7
• Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.1010.0' into netcore-30
  Dean Herbert · 2019-10-10 17:42:53 +09:00
  8c2f37ede5
• Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.NativeLibs-2019.1010.0' into netcore-30
  Dean Herbert · 2019-10-10 17:42:50 +09:00
  7dbf243605
• Bump ppy.osu.Framework.iOS from 2019.930.0 to 2019.1010.0

  Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-10-10 08:30:37 +00:00
  e50d8419fd
• Bump ppy.osu.Framework from 2019.930.0 to 2019.1010.0

  Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-10-10 08:16:28 +00:00
  bc4c1a2371
• Bump ppy.osu.Framework.Android from 2019.930.0 to 2019.1010.0

  Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-10-10 08:16:07 +00:00
  efa5cedf4f
• Bump ppy.osu.Framework.NativeLibs from 2019.813.0 to 2019.1010.0

  Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.1010.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.1010.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-10-10 08:15:47 +00:00
  65df7902f3
• Use empty HitWindows to fix editor slider display (#6445)

  Use empty HitWindows to fix editor slider display
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-10-10 17:10:34 +09:00
  c6a6ea3890
• Merge branch 'master' into fix-editor-slider-display
  Dan Balasescu · 2019-10-10 16:22:30 +09:00
  5497d210b6
• Merge pull request #6444 from peppy/screen-with-timeline

  Add abstract implementation for editor screens which display a timeline

  Dan Balasescu · 2019-10-10 16:14:48 +09:00
  c708ea327d
• Return correct allowed value for Perfect

  Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>

  Dean Herbert · 2019-10-09 19:50:05 +09:00
  4e273fc628
• Revert "Warn on incorrect null usage"

  This reverts commit 93d2c3d7a1.

  Dean Herbert · 2019-10-09 19:38:07 +09:00
  e6f857d0d8
• Add full asserts
  Dean Herbert · 2019-10-09 19:23:37 +09:00
  9f2a648432
• Add result offset bounding to result itself, rather than just transforms
  Dean Herbert · 2019-10-09 19:08:55 +09:00
  ad6b8d3e04
• Use empty hitwindows instead of null
  Dean Herbert · 2019-10-09 19:08:31 +09:00
  51bf600ea7
• Warn on incorrect null usage
  Dean Herbert · 2019-10-09 19:03:20 +09:00
  93d2c3d7a1
• Fix potential nullref
  Dean Herbert · 2019-10-09 16:49:10 +09:00
  0681bb9a2b
• Extract timeline and layout logic from ComposeScreen
  Dean Herbert · 2019-10-09 16:05:55 +09:00
  2d8e5615e4
• Rename test case to better match underlying class
  Dean Herbert · 2019-10-09 16:05:38 +09:00
  f2adae8fd1
• Make EditorScreen abstract
  Dean Herbert · 2019-10-09 16:04:58 +09:00
  3dd2b18ff0
• Merge pull request #6423 from peppy/fix-ss-track-playback

  Fix song select not correctly playing tracks in some cases

  Dan Balasescu · 2019-10-09 12:38:25 +09:00
  10c7fc139e
• Merge branch 'master' into fix-ss-track-playback
  Dan Balasescu · 2019-10-09 12:26:07 +09:00
  69b9e359bf
• Merge pull request #6427 from peppy/editor-wip-screens

  Better signify under construction screens in editor

  Dan Balasescu · 2019-10-09 12:18:53 +09:00
  52b065b560
• Merge branch 'master' into editor-wip-screens
  Dan Balasescu · 2019-10-09 12:04:12 +09:00
  ed41429fc1
• Merge pull request #6429 from peppy/add-slider-tail-todo

  Add todo in slider tail to avoid confusion

  Dan Balasescu · 2019-10-09 12:04:05 +09:00
  fca2a5bc6e
• Merge branch 'master' into add-slider-tail-todo
  Dan Balasescu · 2019-10-09 11:53:27 +09:00
  34d50e3b73
• Merge pull request #6428 from peppy/fix-ignored-test

  Fix ignored song select test

  Dan Balasescu · 2019-10-09 11:53:07 +09:00
  09f950ea59
• Merge branch 'master' into fix-ignored-test
  Dan Balasescu · 2019-10-09 11:39:40 +09:00
  e8276dc562
• Merge pull request #6430 from peppy/move-wave-tests

  Move WaveContainer test out of editor namespace

  Dan Balasescu · 2019-10-08 19:28:30 +09:00
  9a26cf3a61
• Move WaveContainer test out of editor namespace
  Dean Herbert · 2019-10-08 18:08:05 +09:00
  4446a2972c
• Add todo in slider tail to avoid confusion
  Dean Herbert · 2019-10-08 17:56:56 +09:00
  b09d9b7e1f
• Rework osu! selection blueprint updates (#6291)

  Rework osu! selection blueprint updates
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-10-08 17:43:13 +09:00
  47768b7063
• Add comprehensive audio state tests
  Dean Herbert · 2019-10-08 17:03:13 +09:00
  8ebccfe31f
• Fix ignored song select test
  Dean Herbert · 2019-10-08 16:37:47 +09:00
  f284d096b7
• Don't resume playback when user has paused and track hasn't changed
  Dean Herbert · 2019-10-08 15:04:38 +09:00
  4e026b163c
• Fix naming of file
  Dean Herbert · 2019-10-08 14:37:56 +09:00
  3e904b4838
• Better signify under construction screens in editor
  Dean Herbert · 2019-10-08 14:32:48 +09:00
  63bf8ff832
• Avoid excess background updates in playlist overlay (#6424)

  Avoid excess background updates in playlist overlay

  Dean Herbert · 2019-10-08 14:11:02 +09:00
  7e4f0c01b8