Commit Graph

7358 Commits

Author SHA1 Message Date
2c99fa29f0 Merge branch 'master' into net46 2017-09-25 12:43:35 +08:00
3001d6826b Merge pull request #1275 from EVAST9919/icons_jumping_fix
Fix icons in main button system jumps on one side for a long time
2017-09-25 12:19:20 +08:00
0aebfdd578 Merge branch 'master' into icons_jumping_fix 2017-09-25 12:07:25 +08:00
860b389e9a Merge pull request #1305 from WebFreak001/master
URL encode beatmap filename
2017-09-25 10:02:56 +09:00
a5622bb293 Merge branch 'master' into master 2017-09-25 09:58:29 +09:00
2b11ecec13 Remove usings to extensions. 2017-09-24 06:03:52 +08:00
87c8278139 Use Array.Empty. 2017-09-24 03:45:46 +08:00
c5aebf6401 Use TimeSpan to represent time. 2017-09-24 03:23:31 +08:00
d277952e0f Use DateTimeOffset.ToUnixTime 2017-09-24 00:42:46 +08:00
b59379252b Merge pull request #1307 from huoyaoyuan/song-select-fix
Fix overlay toggling in song select.
2017-09-23 20:01:10 +08:00
442259d9e0 Fix overlay toggling in song select. 2017-09-23 19:47:23 +08:00
e04526222c URL encode beatmap filename 2017-09-22 22:47:26 +02:00
8853cab911 Merge pull request #1298 from peppy/song-select-toggle-overlays
Ensure only one dialog is being displayed by the SongSelect footer at a time
2017-09-22 22:57:53 +09:00
9e02570802 Merge branch 'master' into song-select-toggle-overlays 2017-09-22 22:41:52 +09:00
d82b7575e1 Merge pull request #1283 from gabixdev/master
Add option to disable cursor rotation.
2017-09-22 15:43:09 +08:00
98c22e8111 Merge branch 'master' into master 2017-09-22 15:19:23 +08:00
8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
120446e4a7 Ensure only one dialog is being displayed by the SongSelect footer at a time
Fixes #1208
2017-09-20 14:32:15 +09:00
278e51eebc Merge pull request #1297 from peppy/deploy-multiple-targets
Allow deploy script to deploy multiple project targets
2017-09-20 12:57:24 +09:00
2923af1946 Allow deploy script to deploy multiple project targets 2017-09-19 23:44:46 +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
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