4790 Commits

Author	SHA1	Message	Date
smoogipoo	7fb8008e44	Merge remote-tracking branch 'origin/master' into editor-timing-timeline ... # Conflicts: # osu-framework	2017-09-25 17:20:55 +09:00
Dan Balasescu	c8cad6d9aa	Merge branch 'master' into set-busy-timeout	2017-09-25 17:05:40 +09:00
Dean Herbert	a80f0d4858	Merge branch 'master' into chat-commands	2017-09-25 15:52:35 +08:00
Dean Herbert	2c99fa29f0	Merge branch 'master' into net46	2017-09-25 12:43:35 +08:00
Dean Herbert	0aebfdd578	Merge branch 'master' into icons_jumping_fix	2017-09-25 12:07:25 +08:00
Dean Herbert	33a9bb6997	Merge branch 'master' into set-busy-timeout	2017-09-25 12:05:57 +08:00
Dean Herbert	a1b313620c	Set a busy timeout when creating an SQLIteConnection	2017-09-25 11:51:48 +08:00
Dan Balasescu	a5622bb293	Merge branch 'master' into master	2017-09-25 09:58:29 +09:00
Huo Yaoyuan	2b11ecec13	Remove usings to extensions.	2017-09-24 06:03:52 +08:00
Huo Yaoyuan	87c8278139	Use Array.Empty.	2017-09-24 03:45:46 +08:00
Huo Yaoyuan	c5aebf6401	Use TimeSpan to represent time.	2017-09-24 03:23:31 +08:00
Huo Yaoyuan	d277952e0f	Use DateTimeOffset.ToUnixTime	2017-09-24 00:42:46 +08:00
Huo Yaoyuan	442259d9e0	Fix overlay toggling in song select.	2017-09-23 19:47:23 +08:00
WebFreak001	e04526222c	URL encode beatmap filename	2017-09-22 22:47:26 +02:00
MrTheMake	34fb6ccdf5	Removed generic parameter function	2017-09-22 16:17:03 +02:00
Dan Balasescu	9e02570802	Merge branch 'master' into song-select-toggle-overlays	2017-09-22 22:41:52 +09:00
MrTheMake	02bc429911	CI fix	2017-09-22 15:37:17 +02:00
MrTheMake	0a27916761	Added infoMessage class to the project, use the class for the /help command and handle command parameter better	2017-09-22 15:31:30 +02:00
MrTheMake	18c26a85ba	Added an infoMessage class to represent system messages that aren't errors	2017-09-22 15:30:07 +02:00
MrTheMake	29707788f9	Code formatting	2017-09-22 15:29:04 +02:00
MrTheMake	dc5c046d4b	Fixed wrong action message color	2017-09-22 14:33:20 +02:00
MrTheMake	3e8941f8e1	Fix chat message style for non action messages	2017-09-22 11:35:07 +02:00
MrTheMake	dce577f92a	Updated design	2017-09-22 11:30:01 +02:00
Dean Herbert	98c22e8111	Merge branch 'master' into master	2017-09-22 15:19:23 +08:00
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
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
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
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	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
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