11918 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into switchable-tabs
  Dean Herbert · 2018-04-25 15:41:52 +09:00
  0c22e2d998
• Merge pull request #2446 from peppy/more-test-fixes

  Fix some occasionally failing tests

  Dean Herbert · 2018-04-25 15:34:05 +09:00
  5b8793c390
• Update framework
  Dean Herbert · 2018-04-25 14:57:08 +09:00
  7388984d5f
• Update framework and ensure the add channel button is not switchable
  Shane Woolcock · 2018-04-24 20:46:44 +09:30
  84bda7d23f
• Fix clashing variable name
  Dean Herbert · 2018-04-24 02:07:16 +09:00
  57219ae9c6
• Fix potentially missing group headers in beatmap carousel
  Dean Herbert · 2018-04-24 01:52:25 +09:00
  3886e75959
• Fix wedge load test again

  Initial load was not being waited on for long enough.

  Dean Herbert · 2018-04-24 00:51:33 +09:00
  f4c2d6b1a3
• Merge pull request #2426 from peppy/net471

  Update to .NET 4.7.1

  Dean Herbert · 2018-04-23 22:35:15 +09:00
  v2018.423.0 a6da1b49e7
• Remove annotation
  Dean Herbert · 2018-04-23 22:22:31 +09:00
  93b77d9cfe
• Merge remote-tracking branch 'upstream/master' into net471
  Dean Herbert · 2018-04-23 22:00:11 +09:00
  843385af0d
• Merge pull request #2334 from peppy/async-screens

  Make screens always load async (fixes stutter when entering editor)

  Dean Herbert · 2018-04-23 21:58:04 +09:00
  a9ddb46ade
• Fix UserProfile test failing when not logged in
  Dean Herbert · 2018-04-23 21:41:51 +09:00
  9551b6914b
• Merge branch 'master' into async-screens
  Dean Herbert · 2018-04-23 20:50:43 +09:00
  1de9a63ac6
• Fix remaining broken test
  Dean Herbert · 2018-04-23 20:50:16 +09:00
  7d09a39262
• Merge pull request #2427 from peppy/fix-badge-container

  Fix BadgeContainer being unable to handle null badges

  Dean Herbert · 2018-04-23 19:38:17 +09:00
  2952ba2433
• Merge branch 'master' into fix-badge-container
  Dean Herbert · 2018-04-23 19:13:34 +09:00
  eb7fe0b9e2
• Fix instability in carousel item sorting
  Dean Herbert · 2018-04-23 19:01:01 +09:00
  2d1cef79d6
• Update framework
  Dean Herbert · 2018-04-23 18:32:32 +09:00
  8b1b605c09
• Merge remote-tracking branch 'upstream/master' into async-screens
  Dean Herbert · 2018-04-23 18:29:37 +09:00
  ff3d3379f0
• Merge pull request #2444 from peppy/misc-fixes

  Fix new detections in rider 2018.1

  Dean Herbert · 2018-04-23 18:10:09 +09:00
  2bd2facc90
• Use exceptions
  Dean Herbert · 2018-04-23 17:57:47 +09:00
  194992936d
• Merge branch 'master' into misc-fixes
  Dean Herbert · 2018-04-23 17:46:58 +09:00
  0709a0926b
• Merge pull request #2438 from peppy/fix-intro-race-condition

  Fix intro setting beatmap in background thread causing race conditions

  Dan Balasescu · 2018-04-23 17:44:03 +09:00
  f0071eab4e
• Fix logical regression
  Dean Herbert · 2018-04-23 16:41:15 +09:00
  2d82c0b5cd
• Merge branch 'master' into fix-intro-race-condition
  Dean Herbert · 2018-04-23 15:17:44 +09:00
  1f73ad0da5
• Add assert to appease rider/r#
  Dean Herbert · 2018-04-23 15:03:41 +09:00
  6e16f2a3c3
• Fix new detections in rider 2018.1
  Dean Herbert · 2018-04-23 14:56:45 +09:00
  36a671e306
• Merge pull request #2429 from peppy/fix-skin-parse-errors

  Add error handling on a per-line level in LegacyDecoder

  Dean Herbert · 2018-04-22 10:53:43 +09:00
  v2018.421.0 0e57f685f8
• Update framework
  Dean Herbert · 2018-04-22 10:52:28 +09:00
  547b960c29
• Change load order to ensure runner is loaded before blocking op
  Dean Herbert · 2018-04-22 04:26:27 +09:00
  64ddee5646
• Test CI run with new changes
  Dean Herbert · 2018-04-22 03:51:17 +09:00
  44a9aa529a
• Fix intro setting beatmap in background thread causing race conditions
  Dean Herbert · 2018-04-22 02:46:20 +09:00
  2c9b2aa0e7
• Fix wrong targets on ruleset test configuration
  Dean Herbert · 2018-04-20 21:08:41 +09:00
  7dd07503b2
• Merge remote-tracking branch 'upstream/master' into peppy-net471
  Dean Herbert · 2018-04-20 21:07:11 +09:00
  e076107a19
• Merge branch 'master' into async-screens
  Dean Herbert · 2018-04-20 20:37:08 +09:00
  ae0fb39087
• Merge pull request #2431 from peppy/deploy-improvements

  Deploy improvements

  Dan Balasescu · 2018-04-20 19:57:44 +09:00
  295e1c78ee
• Add support for updating AppVeyor version
  Dean Herbert · 2018-04-20 19:17:11 +09:00
  1cad6f7a8e
• Only build on correct branch
  Dean Herbert · 2018-04-20 19:12:47 +09:00
  19e270062f
• Merge remote-tracking branch 'upstream/master' into peppy-async-screens
  Dean Herbert · 2018-04-20 19:06:47 +09:00
  e9e97f31d6
• Merge pull request #2374 from smoogipoo/remove-approachcircle-hax

  Remove now unnecessary approachcircle proxy disables

  Dean Herbert · 2018-04-20 19:03:11 +09:00
  54ab0010de
• Merge branch 'master' into remove-approachcircle-hax
  Dean Herbert · 2018-04-20 18:36:49 +09:00
  a5b0005976
• Merge pull request #2350 from naoey/show-beatmap-id

  Add beatmap ID lookup to BeatmapSetOverlay

  Dean Herbert · 2018-04-20 18:36:21 +09:00
  6132a5a15e
• Add error handling on a per-line level in LegacyDecoder

  Resolves #2306.

  Dean Herbert · 2018-04-20 18:32:24 +09:00
  b16e25c3e9
• Merge branch 'master' into remove-approachcircle-hax
  Dan Balasescu · 2018-04-20 18:20:51 +09:00
  cb8067539a
• Update framework + fix CI errors
  smoogipoo · 2018-04-20 18:19:17 +09:00
  0dce7a5b61
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-20 18:07:52 +09:00
  29a28387d8
• Merge pull request #2409 from smoogipoo/fix-overlapping-speedchanges

  Fix hitobject lengths not being calculated for overlapping speed changes

  Dean Herbert · 2018-04-20 18:07:02 +09:00
  45eaa53d01
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-20 18:05:24 +09:00
  27437cfbaf
• Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax

  # Conflicts:
  #	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
  #	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

  smoogipoo · 2018-04-20 18:04:43 +09:00
  c9e4a07e12
• Add PlayerLoader TestCase and fix dummy beatmap load procedure
  Dean Herbert · 2018-04-20 17:30:27 +09:00
  8bf25542cb