419 Commits

Author	SHA1	Message	Date
Dean Herbert	09056fd0d8	Merge branch 'master' into resources-via-nuget	2019-01-31 18:40:45 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
Dean Herbert	398171afd8	Standardise remaining cases	2019-01-24 18:24:30 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	bfb18b4ffb	Update framework and other nuget packages	2019-01-16 10:14:37 +09:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Dean Herbert	4a4bc8955d	Fix crash on startup when specifying --no-version-overlay	2018-12-27 20:08:16 +09:00
Dean Herbert	c6d017b503	And some more	2018-12-27 19:23:58 +09:00
Dean Herbert	bdadd1bba2	Add actual changes	2018-12-27 19:22:24 +09:00
Dean Herbert	bb4b54799f	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-12-20 15:57:20 +09:00
Dean Herbert	4e9f727759	Merge branch 'master' into netcoreapp22	2018-12-14 11:33:41 +09:00
Dean Herbert	2a2561e5c8	Update framework and otehr nuget packages	2018-12-07 19:39:54 +09:00
Dean Herbert	67a759122a	Fix update code crashing when no internet connection is available	2018-12-06 14:59:17 +09:00
Dean Herbert	dbc33c45a6	Update nuget packages	2018-12-06 00:14:21 +09:00
Dean Herbert	68745b221e	Update projects to target .NET core 2.2	2018-12-05 19:46:07 +09:00
Dean Herbert	f91d2e2e07	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dan Balasescu	777b33b30e	Trim newline	2018-11-20 13:36:50 +09:00
Dean Herbert	375543c644	Add squirrel update log output ... Also updates squirrel to latest version.	2018-11-20 13:29:24 +09:00
Dean Herbert	9c5eddea54	Allow running tournament tools from main executable	2018-11-06 14:49:09 +09:00
Dean Herbert	ae94aab677	Update framework	2018-10-18 21:04:29 +09:00
Dean Herbert	9aeba149f6	Update squirrel for more diagnostics	2018-10-17 19:39:32 +09:00
Dean Herbert	182aa63cc8	Update nuget dependencies	2018-10-12 17:08:59 +09:00
ekrctb	68980fc477	Adjust usage of Handle(Non)PositionalInput to follow framework update	2018-10-02 14:45:33 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Dean Herbert	6a1e2c6fa5	Update efcore packages	2018-09-15 18:49:01 +09:00
Dean Herbert	f280e910bb	Bump squirrel version	2018-09-14 04:26:30 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
Dean Herbert	3276f0f54d	Update ef/sqlite version	2018-08-30 14:58:00 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
smoogipoo	da13266ae9	Fix missed string interpolation	2018-08-21 09:17:44 +09:00
Dean Herbert	583e026906	Don’t suppress unhandled exceptions in debug builds	2018-08-17 13:28:35 +09:00
Dean Herbert	83dc01d07c	Fix multiple sentry reports arriving for similar exceptions	2018-08-17 12:05:21 +09:00
Dean Herbert	562a31713e	Fix regression in handling logic	2018-08-16 16:44:04 +09:00
Dean Herbert	9fc0a75b71	Merge branch 'master' into sentry-logging	2018-08-16 13:33:24 +09:00
Dean Herbert	8ee38460d3	Bump squirrel version with bugfix	2018-08-07 02:01:31 +09:00
Dean Herbert	5d573ae176	Update squirrel	2018-08-07 01:00:06 +09:00
Dean Herbert	2ea90ef98a	Add sentry logging	2018-08-03 19:25:55 +09:00
Dean Herbert	6ce32bd431	Update remaining nuget deps	2018-08-01 19:17:16 +09:00
Dean Herbert	4224d35a75	Use forked squirrel ... Allows for updating SharpCompress, too.	2018-08-01 16:56:36 +09:00
Dean Herbert	139f6d8c4f	Fix incorrect nuspec title	2018-08-01 12:30:09 +09:00
Dean Herbert	854beaab5f	Remove only remaining .NET desktop code	2018-08-01 02:58:49 +09:00
Dean Herbert	4f1736ceb2	Make squirrel work again	2018-08-01 02:58:39 +09:00
Dean Herbert	fb09385f51	Remove net471 targeting	2018-07-18 11:01:08 +09:00
Dean Herbert	5615a32953	Fix mac installer extension being incorrect	2018-07-11 14:53:40 +09:00
Dean Herbert	2150cb1028	Update framework and other packages	2018-07-10 20:31:04 +09:00
Dan Balasescu	282a99fb88	Merge branch 'master' into fix-spelling	2018-07-10 16:32:14 +09:00
Dean Herbert	7120408a63	Add fallback "updater", which prompts the user to update	2018-07-06 16:46:22 +09:00
Dean Herbert	b8d314a809	Tidy up updater namespace	2018-07-06 16:39:27 +09:00
Dean Herbert	1d6609d9f3	Add common custom words to dotsettings dictionary ... Also fixes some typos and reduces spelling suggestions to hints.	2018-07-05 15:54:41 +09:00
Dean Herbert	563cb46b4a	Update framework and other nuget dependencies	2018-06-26 12:10:56 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
Dean Herbert	6aa0ca5cc9	Add (one-way) migration for existing users	2018-06-21 14:22:25 +09:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Dean Herbert	fd4f61fc88	Update framework and other packages	2018-06-08 21:51:43 +09:00
rootyElf	95bc312799	Update EntityFramework libraries	2018-06-07 15:48:06 +01:00
jai_	fdf2120852	Update notfication now points to new changelog page	2018-06-06 18:08:43 +01:00
Dean Herbert	2ec1fcd245	Fix incorrect using	2018-06-06 21:29:45 +09:00
Dean Herbert	115595251d	Remove unnecessary reference in osu.Desktop	2018-06-05 15:02:34 +09:00
Dean Herbert	601ef3b6f7	Consume osu.Framework via nuget	2018-06-05 14:14:56 +09:00
Dean Herbert	6781807e23	Remove unnecessary EF tools references	2018-06-03 00:28:10 +09:00
Dean Herbert	d287e32faf	Update project build configurations to target netcoreapp2.1	2018-06-02 22:20:17 +09:00
Dan Balasescu	1147ef61ed	Merge branch 'master' into long-path-fix	2018-05-31 15:32:47 +09:00
Dean Herbert	c18a5b5ac8	Fix importing long filenames from stable	2018-05-29 19:32:56 +09:00
Dean Herbert	749a69567b	Add EF tooling references	2018-05-29 16:26:58 +09:00
Dean Herbert	d4e7f08c20	Bring entity framework up-to-date and re-enable transactions	2018-05-29 16:23:27 +09:00
Dean Herbert	e92166b40f	Update csproj defaults	2018-05-02 16:33:48 +08:00
Dean Herbert	b37acf7510	Update squirrel version for net471 prereq support	2018-05-02 16:23:48 +08:00
Dean Herbert	de424648d2	Update to .NET 4.7.1 ... Resolves #2368.	2018-04-20 14:46:52 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	687c889345	Add back osu.Desktop versions (used in deploy)	2018-03-29 12:47:17 +09:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	81a8385c8c	Remove lingering reference to tests	2018-03-28 15:17:09 +09:00
Dean Herbert	94b1d3e4af	Make VisualTests/nUnit work again	2018-03-28 12:33:01 +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	868a221b6c	Fix VisualTests build configuration	2018-03-26 19:43:35 +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	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	4dc317d4df	Fix msbuild warnings	2018-03-25 03:38:52 +09:00
smoogipoo	0b2c1930bd	Reference osu.Game.Tests in the desktop project	2018-03-25 02:28:10 +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	e67d8e1354	Update nuspec to include humanizer localisations	2018-03-21 22:32:10 +09:00
Dean Herbert	db9b5ebaca	Reduce complexity of code	2018-02-27 22:26:54 +09:00
TocoToucan	89bac13bf2	Fix profiles folder path	2018-02-27 22:06:32 +09:00
TocoToucan	714d7b4477	Do not use Multicore JIT on Mono	2018-02-27 22:06:32 +09:00
TocoToucan	ed99f26699	Use Multicore JIT	2018-02-27 22:06:32 +09:00
Dean Herbert	a0a65abcac	Crentalise all import logic	2018-02-15 14:22:39 +09:00
Dean Herbert	e0d28564d0	Move import logic to shared implementation	2018-02-15 14:22:39 +09:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
Dean Herbert	dfc344b47a	Update OpenTK version	2018-02-06 13:47:54 +09:00
Dean Herbert	6b35ef7063	Update OpenTK version	2018-02-05 16:13:30 +09:00
Felix Ang	d294fcfb0b	Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)	2018-01-22 18:42:03 +01:00
Felix Ang	423559ec6c	Update license year.	2018-01-22 18:22:38 +01:00
Dean Herbert	9b33499fe7	Merge remote-tracking branch 'upstream/master' into RefactorInputQueues	2018-01-16 20:04:34 +09:00
TocoToucan	3c11978cfa	Use local functions	2018-01-15 21:42:17 +03:00
Aergwyn	ae1adfd2f2	remove unnecessary empty lines ... codefactor.io \(o.o)/ also one unnecessary semicolon	2018-01-12 19:30:34 +01:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00
Dean Herbert	2ca10b28c6	Use a non-broken opentk library	2017-12-29 15:42:51 +09:00
Dan Balasescu	3bfa6bd9fd	Merge branch 'master' into better-notification-delays	2017-12-27 23:26:57 +09:00
smoogipoo	5b529511ec	Update OpenTK nuget package ... Fixes the recent AppVeyor errors	2017-12-27 13:18:34 +09:00
Dean Herbert	71a94d6b44	Add a bindable Enabled flag to NotificationManager ... Also better handles delays before notifications are displayed.	2017-12-25 20:53:23 +09:00
smoogipoo	a30270658d	Merge remote-tracking branch 'origin/master' into netstandard	2017-12-01 18:50:28 +09:00
smoogipoo	36be171c29	Fix up/clean up csprojs for C#7 support	2017-11-30 02:06:03 +09:00
smoogipoo	a0c3349935	Add LangVer.props and osu.Game.props for common csproj properties	2017-11-30 00:45:37 +09:00
smoogipoo	0ec10ba32d	CI fixes	2017-11-30 00:11:00 +09:00
smoogipoo	6003282e66	Give osu!lazer an application icon again ... Fixes https://github.com/ppy/osu/issues/1548.	2017-11-22 22:07:55 +09:00
smoogipoo	d364603e45	Make registry checking work again	2017-11-22 20:02:31 +09:00
smoogipoo	b3bf6e7bee	Merge master into netstandard	2017-11-21 16:39:21 +09:00
smoogipoo	a66edea6dc	Move sqlite batteries to osu.Desktop ... Fixes e_sqlite.dll not being copied to output on Windows	2017-11-21 15:33:05 +09:00
Dean Herbert	62dcc316e2	Remove unnecessary using	2017-11-21 15:02:16 +09:00
Dean Herbert	8e63a7dd8d	Handle more exceptions when checking for updates ... Should resolve #849.	2017-11-21 14:42:49 +09:00
smoogipoo	e98d9e8a8c	Explicitly define constant	2017-11-20 19:44:06 +09:00
smoogipoo	aac41d2de6	Disable resharper inspections on case-by-case basis	2017-11-20 18:55:48 +09:00
smoogipoo	e608d2841b	Prefer net461	2017-11-20 16:10:34 +09:00
smoogipoo	067c018422	Cleanups	2017-11-19 17:31:35 +09:00
smoogipoo	5fd16c6268	Make osu.Desktop.Deploy work	2017-11-19 16:30:41 +09:00
smoogipoo	db4c912e1e	Fix up assembly name	2017-11-19 14:46:51 +09:00
smoogipoo	440c1a9f83	Make osu.Desktop and osu.Game.Tests compile under net461+netstandard	2017-11-19 14:30:56 +09:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
smoogipoo	f461f03b08	Make osu! compile with framework changes	2017-11-16 14:51:31 +09:00
smoogipoo	9344502b71	More warning fixes	2017-11-14 18:05:07 +09:00
smoogipoo	3d6bb3befe	Add startup argument to disable the version overlay	2017-11-11 22:56:02 +09:00
Dean Herbert	c765785d00	Mark several long-running tasks as long-running	2017-10-25 11:42:55 +09:00
Dean Herbert	65b23f38f1	fixup! Allow version manager to load completely async	2017-10-24 10:08:42 +09:00
Dean Herbert	ae0029082a	Allow version manager to load completely async	2017-10-24 10:08:42 +09:00
Dean Herbert	f66747b63d	Merge branch 'master' into fix-missing-sqlite	2017-10-24 08:14:55 +09:00
Dean Herbert	dc9c474033	Move all TestCases to Testing project ... This allows tests to successfully retrieve rulesets, as they are referenced.	2017-10-23 19:32:02 +09:00
Dean Herbert	b1d5fc523f	Add sqlite raw packages to osu.Desktop to ensure sqlite is copied locally	2017-10-23 00:36:50 +09:00
Shane Woolcock	a9657d2142	Change beatmap import to use OpenTK's FileDrop event	2017-10-22 00:55:32 +10:30
Dean Herbert	7ce6167220	Merge branch 'master' into EfCore	2017-10-19 21:20:22 +09:00
Dean Herbert	365e2343a1	Remove AllRuleset references	2017-10-19 21:09:29 +09:00
Dean Herbert	a724a20b02	Remove duplicate reference to opentk package	2017-10-19 20:07:25 +09:00
Dean Herbert	eff1c20e38	CI fixing	2017-10-16 22:00:54 +09:00
Dean Herbert	a5ccf12e4a	Fix ValueTuple mess	2017-10-16 14:04:04 +09:00
TocoToucan	5f083f10a7	Add System.ValueTuple NuGet package	2017-10-14 16:19:03 +03:00
Dean Herbert	179542daf1	Standardise AssemblyInfos	2017-10-14 15:02:20 +09:00