9932 Commits

This Branch

This Branch

All Branches

• Move SummaryTimeline into /Edit/Components/SummaryTimeline
  smoogipooo · 2017-09-20 16:59:03 +09:00
  f9568619e7
• CI fixes
  smoogipooo · 2017-09-20 16:53:01 +09:00
  3da3ef1a50
• Mini -> Summary
  smoogipooo · 2017-09-20 16:48:30 +09:00
  5978668d2b
• Generate a set beatmap instead of using the available beatmaps
  smoogipooo · 2017-09-20 16:40:37 +09:00
  967bfa404e
• Merge branch 'master' into editor-timing-timeline

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-09-20 16:19:08 +09:00
  6a9572db6c
• Cleanup + commenting
  smoogipooo · 2017-09-20 15:55:23 +09:00
  01d84893a0
• EditorTimingTimeline -> EditorMiniTimeline
  smoogipooo · 2017-09-20 15:50:32 +09:00
  fd278256ad
• Actually load a beatmap for TestCaseEditorTimingTimeline
  smoogipooo · 2017-09-20 15:40:42 +09:00
  252121968d
• Make EditorTimingTimeline support beatmap changes
  smoogipooo · 2017-09-20 15:40:27 +09:00
  01c3818ea0
• Ensure only one dialog is being displayed by the SongSelect footer at a time

  Fixes #1208

  Dean Herbert · 2017-09-20 14:32:15 +09:00
  120446e4a7
• 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
• Merge branch 'master' into direct-previews
  jorolf · 2017-09-19 19:25:41 +02:00
  ce4a44000f
• Merge branch 'master' into storyboard_integration
  Damnae · 2017-09-19 17:36:29 +02:00
  fcaabf7fdf
• Allow deploy script to deploy multiple project targets
  Dean Herbert · 2017-09-19 23:44:46 +09:00
  2923af1946
• Move testcase to the correct project
  EVAST9919 · 2017-09-19 17:37:34 +03:00
  4cf88c72bf
• Remove useless file
  EVAST9919 · 2017-09-19 17:28:10 +03:00
  85b990c088
• Fix includes
  EVAST9919 · 2017-09-19 17:26:17 +03:00
  c59d398aa5
• Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
  EVAST9919 · 2017-09-19 17:23:10 +03:00
  1b0ab414fa
• Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline

  Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.

  smoogipooo · 2017-09-19 23:09:08 +09:00
  67d3861226
• Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix
  EVAST9919 · 2017-09-19 17:08:32 +03:00
  1de8bca7f6
• 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
• Update framework
  Dean Herbert · 2017-09-19 16:07:01 +09:00
  10efdffe49
• 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