Commit Graph

12713 Commits

Author SHA1 Message Date
67d3861226 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.
2017-09-19 23:09:08 +09:00
1de8bca7f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix 2017-09-19 17:08:32 +03:00
183f192dd5 Merge pull request #1296 from peppy/fix-release-paths
Fix ruleset target path for release builds
2017-09-19 22:57:28 +09:00
e0911f014e Fix ruleset target path for release builds 2017-09-19 22:50:36 +09:00
2e799aaf67 Merge pull request #1277 from peppy/ctb-improvements
osu!catch improvements
2017-09-19 21:50:18 +09:00
611f4df484 Add licence header 2017-09-19 21:41:51 +09:00
3000323727 Give WorkingBeatmap's Metadata a non-null default 2017-09-19 21:41:18 +09:00
f96875a470 Add a catch specific player test 2017-09-19 21:40:57 +09:00
0aa152974a Add interfaces to CatchBaseHit 2017-09-19 21:40:38 +09:00
4b68950428 Fix incorrect coordinate mapping on fruit explosion 2017-09-19 21:39:53 +09:00
c88b0784da Use MaxValue instead of PositiveInfinity 2017-09-19 21:39:17 +09:00
d192c2d83b Merge remote-tracking branch 'upstream/master' into ctb-improvements 2017-09-19 20:54:39 +09:00
13a364c2f6 Merge pull request #1293 from peppy/merge-projects
Merge desktop projects and optimise build
2017-09-19 20:51:13 +09:00
05303d37d3 Update framework 2017-09-19 20:43:29 +09:00
4b0eee2bcc Merge remote-tracking branch 'upstream/master' into merge-projects 2017-09-19 20:43:20 +09:00
ef210018d9 Run headless tests with a unique name based on the executing assembly 2017-09-19 20:04:37 +09:00
390c212dcb 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.
2017-09-19 20:04:13 +09:00
9576f71b10 Merge pull request #1294 from peppy/import-missing-files
Allow files missing on disk to be restored on beatmap import
2017-09-19 19:37:45 +09:00
99b512cce5 Output ruleset assemblies to the game folder rather than adding special logic 2017-09-19 19:27:14 +09:00
c41ca10715 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.
2017-09-19 18:35:52 +09:00
51cdff1d9a Fix TestCasePlaySongSelect incorrectly using live app data 2017-09-19 17:22:45 +09:00
f2a9e95d56 Fix type resolution in RulesetStore 2017-09-19 17:22:24 +09:00
c0c910d4d4 Update framework 2017-09-19 17:18:34 +09:00
10efdffe49 Update framework 2017-09-19 16:07:01 +09:00
296ebbfc54 Read ruleset assemblies from project folders 2017-09-19 16:07:00 +09:00
096f53d769 Use new static IsDebug method 2017-09-19 16:07:00 +09:00
511874389a Define trace for VisualTests 2017-09-19 16:07:00 +09:00
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
8fa76557db Avoid unnecessary dll copies 2017-09-19 16:06:59 +09:00
9a0f22b810 Update vscode launch configuration 2017-09-19 16:06:59 +09:00
393aa12eec Remove old files 2017-09-19 16:06:59 +09:00
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
70a295764c Merge remote-tracking branch 'refs/remotes/ppy/master' 2017-09-18 23:09:41 -04:00
4a0370a68a Merge pull request #1288 from peppy/remove-include
Remove unnecessary Microsoft.Net.Http include
2017-09-18 18:35:52 +09:00
34ca7aec6d Merge branch 'master' into remove-include 2017-09-18 18:25:47 +09:00
507261fb55 Merge pull request #1289 from Damnae/legacyfilesystem_fix
Fix LegacyFilesystemReader Filenames property.
2017-09-18 18:25:36 +09:00
5a76ed4000 Fix LegacyFilesystemReader Filenames property. 2017-09-18 10:14:29 +02:00
375fda4f8d Merge branch 'master' into remove-include 2017-09-18 15:12:07 +09:00
407d02ba87 Merge pull request #1285 from peppy/dont-unlimit-visualtests-fps
Don't unlimit FPS for visual tests
2017-09-18 15:11:51 +09:00
d62ad89150 Remove unnecessary Microsoft.Net.Http include 2017-09-18 14:10:59 +09:00
83579138d2 Merge branch 'master' into ctb-improvements 2017-09-18 12:57:53 +09:00
60b38b2776 Add the most basic score calculation for catch 2017-09-18 12:48:45 +09:00
d3c58c848d Add licence header 2017-09-18 12:48:33 +09:00
e52a4fe72c Put caught fruit in their own container to reduce casting 2017-09-18 12:33:01 +09:00
15d3a998fa Don't unlimit FPS for visual tests 2017-09-18 11:13:14 +09:00
d51ff7590d Merge pull request #1280 from ColdVolcano/file-count-fix
Account for all files instead of just the main directory ones
2017-09-18 11:02:31 +09:00
067dac495f Merge branch 'master' into file-count-fix 2017-09-18 10:43:49 +09:00
3e8ae93b34 appveyor 2017-09-17 22:54:23 +02:00
f8b09df13c Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-17 22:40:14 +02:00