12113 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
TocoToucan	458594d24d	Qualifier 'this.' is redundant	2018-03-27 18:03:57 +03:00
Dean Herbert	306ff09792	Merge pull request #2305 from smoogipoo/update-netstandard ... Switch to .NET Standard 2.0	2018-03-27 22:55:38 +09:00
Dean Herbert	d47d7a3dd4	Update submodules	2018-03-27 22:47:01 +09:00
Dean Herbert	efac68a8f5	Update deploy script	2018-03-27 22:36:43 +09:00
Dean Herbert	d76bc1a8ad	Revert "Move NoWarns" ... This reverts commit 75a413a40e.	2018-03-27 21:13:06 +09:00
Dean Herbert	524044d487	Add licence header to SquirrelUpdateManager	2018-03-27 19:19:28 +09:00
Dean Herbert	75a413a40e	Move NoWarns	2018-03-27 19:19:09 +09:00
Dean Herbert	04a7754049	Make squirrel local so ifdef is nicer	2018-03-27 18:57:20 +09: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
Dean Herbert	9674e8d197	Add back mania to VisualTests configuration	2018-03-27 15:05:41 +09:00
smoogipoo	28c737ad72	Update opentk + framework	2018-03-27 14:36:54 +09:00
smoogipoo	e09d9294c1	Update OpenTK	2018-03-27 09:28:02 +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
Dean Herbert	868a221b6c	Fix VisualTests build configuration	2018-03-26 19:43:35 +09:00
smoogipoo	dd5bbbbd9f	Define testable projects	2018-03-26 19:11:23 +09:00
smoogipoo	bdaba97d62	Merge remote-tracking branch 'smoogipoo/update-netstandard' into update-netstandard	2018-03-26 19:00:04 +09:00
Dean Herbert	0b38c8ec4f	Fix some VS specific issues	2018-03-26 18:58:19 +09:00
smoogipoo	b9f456402a	Re-implement OsuGameDesktop icon	2018-03-26 18:55:55 +09:00
smoogipoo	c6b9c4b588	Fix startup failures	2018-03-26 18:40:59 +09:00
smoogipoo	5159127bce	Fix SQLite failing to initialize on test projects	2018-03-26 18:07:09 +09:00
smoogipoo	d2c5fa72dc	Make appveyor only compile net461	2018-03-26 16:03:25 +09:00
smoogipoo	e5df2946aa	Bump OpenTK version + update submodules	2018-03-26 15:49:16 +09:00
smoogipoo	35ef9d99c6	Only compile with net461 in visual studio	2018-03-26 15:44:55 +09:00
smoogipoo	76588a1029	Target WinExe to remove console window	2018-03-26 15:12:17 +09:00
smoogipoo	3f9b14704e	Fix extra semicolon	2018-03-26 13:30:58 +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	c21e820a45	One more level of nesting (we can do this better in the future)	2018-03-25 02:43:45 +09:00
smoogipoo	0b2c1930bd	Reference osu.Game.Tests in the desktop project	2018-03-25 02:28:10 +09:00
smoogipoo	31920f1866	Fix ruleset resources not getting included in build	2018-03-25 02:12:01 +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
John Neijzen	7b39447213	Update OsuAutoGenerator.cs	2018-03-24 18:34:56 +08:00
John Neijzen	bee9af8500	Update OsuAutoGenerator.cs	2018-03-24 18:30:36 +08:00
John Neijzen	9d96aeb347	Update OsuAutoGenerator.cs	2018-03-24 17:53:50 +08:00
TocoToucan	e91d24f31a	Use ScreenshotCaptureMenuCursor in ScreenshotManager	2018-03-24 12:53:01 +03:00
John Neijzen	12f785bf40	Change duplicate condition to HitResult.Good instead of HitResult.Meh	2018-03-24 17:48:43 +08:00
Dean Herbert	0e669c9a3f	Fix many warnings	2018-03-24 18:23:22 +09:00
John Neijzen	97be022e22	Remove duplicate condition	2018-03-24 16:55:39 +08:00
Dean Herbert	9d9b9d50bc	User nuget OpenTK package	2018-03-24 17:49:23 +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
Dan Balasescu	c9276ce2b8	Merge pull request #2298 from peppy/performance-logging-toggle ... Add setting to toggle performance logging	2018-03-24 14:14:15 +09:00
Dean Herbert	76886c8e3f	Merge branch 'master' into performance-logging-toggle	2018-03-24 13:32:49 +09:00