1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 08:42:55 +08:00
Commit Graph

7520 Commits

Author SHA1 Message Date
Dean Herbert
0aa152974a Add interfaces to CatchBaseHit 2017-09-19 21:40:38 +09:00
Dean Herbert
4b68950428 Fix incorrect coordinate mapping on fruit explosion 2017-09-19 21:39:53 +09:00
Dean Herbert
c88b0784da Use MaxValue instead of PositiveInfinity 2017-09-19 21:39:17 +09:00
Dean Herbert
d192c2d83b Merge remote-tracking branch 'upstream/master' into ctb-improvements 2017-09-19 20:54:39 +09:00
Dan Balasescu
13a364c2f6 Merge pull request #1293 from peppy/merge-projects
Merge desktop projects and optimise build
2017-09-19 20:51:13 +09:00
Dean Herbert
05303d37d3 Update framework 2017-09-19 20:43:29 +09:00
Dean Herbert
4b0eee2bcc Merge remote-tracking branch 'upstream/master' into merge-projects 2017-09-19 20:43:20 +09:00
Dean Herbert
ef210018d9 Run headless tests with a unique name based on the executing assembly 2017-09-19 20:04:37 +09:00
Dean Herbert
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
Dan Balasescu
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
Dean Herbert
99b512cce5 Output ruleset assemblies to the game folder rather than adding special logic 2017-09-19 19:27:14 +09:00
Dean Herbert
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
Dean Herbert
51cdff1d9a Fix TestCasePlaySongSelect incorrectly using live app data 2017-09-19 17:22:45 +09:00
Dean Herbert
f2a9e95d56 Fix type resolution in RulesetStore 2017-09-19 17:22:24 +09:00
Dean Herbert
c0c910d4d4 Update framework 2017-09-19 17:18:34 +09:00
Dean Herbert
10efdffe49 Update framework 2017-09-19 16:07:01 +09:00
Dean Herbert
296ebbfc54 Read ruleset assemblies from project folders 2017-09-19 16:07:00 +09:00
Dean Herbert
096f53d769 Use new static IsDebug method 2017-09-19 16:07:00 +09:00
Dean Herbert
511874389a Define trace for VisualTests 2017-09-19 16:07:00 +09:00
Dean Herbert
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
Dean Herbert
8fa76557db Avoid unnecessary dll copies 2017-09-19 16:06:59 +09:00
Dean Herbert
9a0f22b810 Update vscode launch configuration 2017-09-19 16:06:59 +09:00
Dean Herbert
393aa12eec Remove old files 2017-09-19 16:06:59 +09:00
Dean Herbert
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
4a0370a68a Merge pull request #1288 from peppy/remove-include
Remove unnecessary Microsoft.Net.Http include
2017-09-18 18:35:52 +09:00
Dean Herbert
34ca7aec6d Merge branch 'master' into remove-include 2017-09-18 18:25:47 +09:00
Dean Herbert
507261fb55 Merge pull request #1289 from Damnae/legacyfilesystem_fix
Fix LegacyFilesystemReader Filenames property.
2017-09-18 18:25:36 +09:00
Damnae
5a76ed4000 Fix LegacyFilesystemReader Filenames property. 2017-09-18 10:14:29 +02:00
Dan Balasescu
375fda4f8d Merge branch 'master' into remove-include 2017-09-18 15:12:07 +09:00
Dan Balasescu
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
Dean Herbert
d62ad89150 Remove unnecessary Microsoft.Net.Http include 2017-09-18 14:10:59 +09:00
Dean Herbert
83579138d2 Merge branch 'master' into ctb-improvements 2017-09-18 12:57:53 +09:00
Dean Herbert
60b38b2776 Add the most basic score calculation for catch 2017-09-18 12:48:45 +09:00
Dean Herbert
d3c58c848d Add licence header 2017-09-18 12:48:33 +09:00
Dean Herbert
e52a4fe72c Put caught fruit in their own container to reduce casting 2017-09-18 12:33:01 +09:00
Dean Herbert
15d3a998fa Don't unlimit FPS for visual tests 2017-09-18 11:13:14 +09:00
Dean Herbert
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
Dean Herbert
067dac495f Merge branch 'master' into file-count-fix 2017-09-18 10:43:49 +09:00
gabixdev
387705b2b6 revert csproj 2017-09-17 19:43:53 +02:00
gabixdev
3c00a7cc51 Reformat again... 2017-09-17 01:44:49 +02:00
ColdVolcano
8944d0f705 make it only look for files instead of directories 2017-09-16 18:44:32 -05:00
gabixdev
a33dfbba25 Code reformat 2017-09-17 01:40:38 +02:00
gabixdev
48008cd7e6 ... 2017-09-17 01:34:56 +02:00
gabixdev
a8ada75633 CODE STYLE XD 2017-09-17 01:28:02 +02:00
gabixdev
846838c621 Move to MenuCursor 2017-09-17 01:14:33 +02:00
gabixdev
bfe1febef2 Fix field access + remove unneeded this 2017-09-17 01:00:44 +02:00
gabixdev
e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +02:00
Dean Herbert
7f18990582 Merge pull request #1281 from UselessToucan/DisposeIDisposableBeforeMethodReturns
Dispose IDisposable object before method returns
2017-09-16 21:49:21 +09:00
TocoToucan
51a5e963bb Dispose IDisposable object before method returns 2017-09-16 15:10:24 +03:00