7420 Commits

Author	SHA1	Message	Date
Dan Balasescu	bed46b1f7e	Split local variable assignment from construction of children	2018-04-04 15:13:42 +09:00
Dan Balasescu	9df525a38d	Remove extra whitespace ... In general we don't really do this elsewhere in the codebase.	2018-04-04 15:11:16 +09:00
Dan Balasescu	b5d7a5df00	Merge branch 'master' into colours-for-judgements	2018-04-04 15:02:03 +09:00
Dean Herbert	ddba7254ca	Merge remote-tracking branch 'upstream/master' into linq	2018-04-03 13:05:08 +09:00
Dean Herbert	77189073b2	Merge branch 'master' into scalablecontainer-size-fix	2018-04-03 11:29:36 +09:00
smoogipoo	fd9480cfb6	Handle timingpoint FormatException	2018-04-02 20:08:40 +09:00
smoogipoo	d24d81d8a9	De-pluralize some methods	2018-04-02 20:07:18 +09:00
Dan Balasescu	83dcff2907	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:54:06 +09:00
Dan Balasescu	32832304a7	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:53:41 +09:00
Dan Balasescu	323534c721	Merge branch 'master' into fix-file-extension-matching	2018-04-02 13:27:14 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
smoogipoo	551ba6ac4b	Fix ScalableContainer irrepairably altering content size	2018-04-02 13:06:06 +09:00
Ali Rizvi	7fed8d64de	Implement Judgement Colours	2018-03-31 04:59:08 +09:00
Dean Herbert	cf3cafd9a9	Merge branch 'master' into beatmap-set-status	2018-03-30 20:55:36 +09:00
Dean Herbert	c39f056b3b	Fix skin path being ignored in extension agnostic lookups ... Closes #2295.	2018-03-30 18:06:18 +09:00
Dan Balasescu	824201336a	Merge branch 'master' into hr-on-mania-is-unranked	2018-03-30 16:35:00 +09:00
Joseph Madamba	0887dafa2c	Revert changes on hard rock mod	2018-03-29 20:36:52 -07:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	94b1d3e4af	Make VisualTests/nUnit work again	2018-03-28 12:33:01 +09:00
DrabWeb	84bb96740f	Fix merge error.	2018-03-27 18:27:30 -03:00
DrabWeb	19bc6b9168	Merge https://github.com/ppy/osu into beatmap-set-status	2018-03-27 18:13:58 -03:00
DrabWeb	506e27a30e	Cleanup.	2018-03-27 17:59:58 -03:00
Dean Herbert	1a8aa87469	Make everything better	2018-03-27 18:56:54 +09:00
Dean Herbert	988141408f	Update copyright year	2018-03-27 15:26:15 +09:00
Dean Herbert	b290d2d039	Move NUnit includes to individual projects	2018-03-27 15:07:09 +09:00
DrabWeb	eb374c5774	Add beatmap set online status and display it in direct panels and the beatmap set overlay.	2018-03-26 21:04:45 -03:00
smoogipoo	dd5bbbbd9f	Define testable projects	2018-03-26 19:11:23 +09:00
smoogipoo	5159127bce	Fix SQLite failing to initialize on test projects	2018-03-26 18:07:09 +09:00
smoogipoo	35ef9d99c6	Only compile with net461 in visual studio	2018-03-26 15:44:55 +09:00
smoogipoo	96901b6498	Add msbuild/dotnet build + launch targets	2018-03-26 10:52:54 +09:00
FreezyLemon	46d859a660	exit player earlier if a dummy map is loaded	2018-03-25 13:25:48 +02:00
smoogipoo	4dc317d4df	Fix msbuild warnings	2018-03-25 03:38:52 +09:00
smoogipoo	097ab66182	Fix resharper error	2018-03-25 01:54:25 +09:00
smoogipoo	d28de89e50	Add net461 target to test projects for nunit discovery ... Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).	2018-03-25 01:35:50 +09:00
Dean Herbert	0e669c9a3f	Fix many warnings	2018-03-24 18:23:22 +09:00
smoogipoo	ffa712dccb	Fix post-merge issues	2018-03-24 15:19:45 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	76886c8e3f	Merge branch 'master' into performance-logging-toggle	2018-03-24 13:32:49 +09:00
Dean Herbert	1996698817	Fix @1x skin elements not being used	2018-03-24 11:40:45 +09:00
Dean Herbert	923f96d940	Merge branch 'master' into performance-logging-toggle	2018-03-24 11:36:20 +09:00
Dean Herbert	3844e95656	Fix one more instance of the same thing happening	2018-03-24 05:55:56 +09:00
Dean Herbert	256baf6d60	Move binding to LoadComplete ... Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.	2018-03-24 05:40:51 +09:00
Dean Herbert	b593c47809	Add setting to toggle performance logging	2018-03-24 05:07:48 +09:00
Dean Herbert	e47aa0edc0	Merge branch 'master' into fix-background-fade	2018-03-24 03:40:13 +09:00
Dean Herbert	0976e83b33	Merge branch 'master' into fix-api-abort	2018-03-24 03:13:28 +09:00
Dan Balasescu	1576b31a48	Merge branch 'master' into add-perfect-mod-icon	2018-03-23 21:32:15 +09:00
Dan Balasescu	676feb3658	Merge branch 'master' into fix-mod-button-sounds	2018-03-23 21:03:42 +09:00
smoogipoo	f0c0a51108	Convert APIAccess to use cancellation tokens	2018-03-23 20:57:04 +09:00
Dan Balasescu	9ab3610b95	Merge branch 'master' into fix-player-disposal	2018-03-23 20:45:42 +09:00