7363 Commits

This Branch

This Branch

All Branches

• Merge branch 'ranks-section' of github.com:Jorolf/osu into ranks-section
  Jorolf · 2017-09-21 22:15:51 +02:00
  b65f4cc397
• remove some redundant stuff
  Jorolf · 2017-09-21 22:15:42 +02:00
  14b8e9fd77
• Merge branch 'master' into ranks-section
  jorolf · 2017-09-21 22:11:22 +02:00
  e4ee0a2b91
• make pagination work and remove duplication in RanksSection
  Jorolf · 2017-09-21 22:07:23 +02:00
  72141935e8
• Merge pull request #1297 from peppy/deploy-multiple-targets

  Allow deploy script to deploy multiple project targets

  Dan Balasescu · 2017-09-20 12:57:24 +09:00
  278e51eebc
• Merge branch 'master' of git://github.com/ppy/osu into ranks-section
  Jorolf · 2017-09-19 21:26:05 +02:00
  5b90f45691
• Allow deploy script to deploy multiple project targets
  Dean Herbert · 2017-09-19 23:44:46 +09:00
  2923af1946
• Merge pull request #1296 from peppy/fix-release-paths

  Fix ruleset target path for release builds

  Dan Balasescu · 2017-09-19 22:57:28 +09:00
  v2017.919.0 183f192dd5
• Fix ruleset target path for release builds
  Dean Herbert · 2017-09-19 22:50:36 +09:00
  e0911f014e
• Merge pull request #1277 from peppy/ctb-improvements

  osu!catch improvements

  Dan Balasescu · 2017-09-19 21:50:18 +09:00
  2e799aaf67
• Add licence header
  Dean Herbert · 2017-09-19 21:41:51 +09:00
  611f4df484
• Give WorkingBeatmap's Metadata a non-null default
  Dean Herbert · 2017-09-19 21:41:18 +09:00
  3000323727
• Add a catch specific player test
  Dean Herbert · 2017-09-19 21:40:57 +09:00
  f96875a470
• Add interfaces to CatchBaseHit
  Dean Herbert · 2017-09-19 21:40:38 +09:00
  0aa152974a
• Fix incorrect coordinate mapping on fruit explosion
  Dean Herbert · 2017-09-19 21:39:53 +09:00
  4b68950428
• Use MaxValue instead of PositiveInfinity
  Dean Herbert · 2017-09-19 21:39:17 +09:00
  c88b0784da
• Merge remote-tracking branch 'upstream/master' into ctb-improvements
  Dean Herbert · 2017-09-19 20:54:39 +09:00
  d192c2d83b
• Merge pull request #1293 from peppy/merge-projects

  Merge desktop projects and optimise build

  Dan Balasescu · 2017-09-19 20:51:13 +09:00
  13a364c2f6
• Update framework
  Dean Herbert · 2017-09-19 20:43:29 +09:00
  05303d37d3
• Merge remote-tracking branch 'upstream/master' into merge-projects
  Dean Herbert · 2017-09-19 20:43:20 +09:00
  4b0eee2bcc
• Run headless tests with a unique name based on the executing assembly
  Dean Herbert · 2017-09-19 20:04:37 +09:00
  ef210018d9
• Don't die on a null connection during disposal

  May be caused by a startup error. This shouldn't result in an additional exception here.

  Dean Herbert · 2017-09-19 20:04:13 +09:00
  390c212dcb
• Merge pull request #1294 from peppy/import-missing-files

  Allow files missing on disk to be restored on beatmap import

  Dan Balasescu · 2017-09-19 19:37:45 +09:00
  9576f71b10
• Output ruleset assemblies to the game folder rather than adding special logic
  Dean Herbert · 2017-09-19 19:27:14 +09:00
  99b512cce5
• Allow files missing on disk to be restored on beatmap import

  Previously, in the rare case the database became out of sync with the disk store, it was impossible to feasibly repair a beatmap. Now reimporting checks each file exists on disk and adds it back if it doesn't.

  Dean Herbert · 2017-09-19 18:35:52 +09:00
  c41ca10715
• Fix TestCasePlaySongSelect incorrectly using live app data
  Dean Herbert · 2017-09-19 17:22:45 +09:00
  51cdff1d9a
• Fix type resolution in RulesetStore
  Dean Herbert · 2017-09-19 17:22:24 +09:00
  f2a9e95d56
• Update framework
  Dean Herbert · 2017-09-19 17:18:34 +09:00
  c0c910d4d4
• Read ruleset assemblies from project folders
  Dean Herbert · 2017-09-19 16:07:00 +09:00
  296ebbfc54
• Use new static IsDebug method
  Dean Herbert · 2017-09-19 16:07:00 +09:00
  096f53d769
• Define trace for VisualTests
  Dean Herbert · 2017-09-19 16:07:00 +09:00
  511874389a
• Optimise project references
  Dean Herbert · 2017-09-19 16:07:00 +09:00
  1f20c5eb69
• Avoid unnecessary dll copies
  Dean Herbert · 2017-09-19 16:06:59 +09:00
  8fa76557db
• Update vscode launch configuration
  Dean Herbert · 2017-09-19 16:06:59 +09:00
  9a0f22b810
• Remove old files
  Dean Herbert · 2017-09-19 16:06:59 +09:00
  393aa12eec
• Update relative paths
  Dean Herbert · 2017-09-19 16:06:58 +09:00
  6db705a3a8
• And then everything became one
  Dean Herbert · 2017-09-19 16:06:58 +09:00
  6d3d485565
• Merge pull request #1288 from peppy/remove-include

  Remove unnecessary Microsoft.Net.Http include

  Dean Herbert · 2017-09-18 18:35:52 +09:00
  4a0370a68a
• Merge branch 'master' into remove-include
  Dean Herbert · 2017-09-18 18:25:47 +09:00
  34ca7aec6d
• Merge pull request #1289 from Damnae/legacyfilesystem_fix

  Fix LegacyFilesystemReader Filenames property.

  Dean Herbert · 2017-09-18 18:25:36 +09:00
  507261fb55
• Fix LegacyFilesystemReader Filenames property.
  Damnae · 2017-09-18 10:14:29 +02:00
  5a76ed4000
• Merge branch 'master' into remove-include
  Dan Balasescu · 2017-09-18 15:12:07 +09:00
  375fda4f8d
• Merge pull request #1285 from peppy/dont-unlimit-visualtests-fps

  Don't unlimit FPS for visual tests

  Dan Balasescu · 2017-09-18 15:11:51 +09:00
  407d02ba87
• Remove unnecessary Microsoft.Net.Http include
  Dean Herbert · 2017-09-18 14:10:59 +09:00
  d62ad89150
• Merge branch 'master' into ctb-improvements
  Dean Herbert · 2017-09-18 12:57:53 +09:00
  83579138d2
• Add the most basic score calculation for catch
  Dean Herbert · 2017-09-18 12:48:45 +09:00
  60b38b2776
• Add licence header
  Dean Herbert · 2017-09-18 12:48:33 +09:00
  d3c58c848d
• Put caught fruit in their own container to reduce casting
  Dean Herbert · 2017-09-18 12:33:01 +09:00
  e52a4fe72c
• Don't unlimit FPS for visual tests
  Dean Herbert · 2017-09-18 11:13:14 +09:00
  15d3a998fa
• Merge pull request #1280 from ColdVolcano/file-count-fix

  Account for all files instead of just the main directory ones

  Dean Herbert · 2017-09-18 11:02:31 +09:00
  d51ff7590d