1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

7438 Commits

Author SHA1 Message Date
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
gabixdev
8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
DrabWeb
01e70f9bef Change type check to safe cast. 2017-09-21 14:53:42 -03:00
DrabWeb
46af17f00c Fix preview button potential null ref. 2017-09-21 14:46:51 -03:00
DrabWeb
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
smoogipooo
e65a17ad96 Remove redundant usings 2017-09-20 18:40:41 +09:00
smoogipooo
7168e8fd99 Improve layout of bottom bar in the Editor 2017-09-20 18:16:03 +09:00
smoogipooo
58b09a161f CI fixes 2017-09-20 17:16:12 +09:00
smoogipooo
7588f1b6ca Add SummaryTimeline to Editor 2017-09-20 17:09:38 +09:00
smoogipooo
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
smoogipooo
3da3ef1a50 CI fixes 2017-09-20 16:53:01 +09:00
smoogipooo
5978668d2b Mini -> Summary 2017-09-20 16:48:30 +09:00
smoogipooo
967bfa404e Generate a set beatmap instead of using the available beatmaps 2017-09-20 16:40:37 +09:00
smoogipooo
6a9572db6c Merge branch 'master' into editor-timing-timeline
# Conflicts:
#	osu-framework
2017-09-20 16:19:08 +09:00
smoogipooo
01d84893a0 Cleanup + commenting 2017-09-20 15:55:23 +09:00
smoogipooo
fd278256ad EditorTimingTimeline -> EditorMiniTimeline 2017-09-20 15:50:32 +09:00
smoogipooo
252121968d Actually load a beatmap for TestCaseEditorTimingTimeline 2017-09-20 15:40:42 +09:00
smoogipooo
01c3818ea0 Make EditorTimingTimeline support beatmap changes 2017-09-20 15:40:27 +09:00
Dean Herbert
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
Dan Balasescu
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
Dean Herbert
2923af1946 Allow deploy script to deploy multiple project targets 2017-09-19 23:44:46 +09:00
smoogipooo
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
EVAST9919
1de8bca7f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix 2017-09-19 17:08:32 +03:00
Dan Balasescu
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
Dean Herbert
e0911f014e Fix ruleset target path for release builds 2017-09-19 22:50:36 +09:00
Dan Balasescu
2e799aaf67 Merge pull request #1277 from peppy/ctb-improvements
osu!catch improvements
2017-09-19 21:50:18 +09:00
Dean Herbert
611f4df484 Add licence header 2017-09-19 21:41:51 +09:00
Dean Herbert
3000323727 Give WorkingBeatmap's Metadata a non-null default 2017-09-19 21:41:18 +09:00
Dean Herbert
f96875a470 Add a catch specific player test 2017-09-19 21:40:57 +09:00
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