Commit Graph

368 Commits

Author SHA1 Message Date
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
d294fcfb0b Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?) 2018-01-22 18:42:03 +01:00
423559ec6c Update license year. 2018-01-22 18:22:38 +01:00
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
3bfa6bd9fd Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
a30270658d Merge remote-tracking branch 'origin/master' into netstandard 2017-12-01 18:50:28 +09:00
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
0ec10ba32d CI fixes 2017-11-30 00:11:00 +09:00
6003282e66 Give osu!lazer an application icon again
Fixes https://github.com/ppy/osu/issues/1548.
2017-11-22 22:07:55 +09:00
d364603e45 Make registry checking work again 2017-11-22 20:02:31 +09:00
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
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
62dcc316e2 Remove unnecessary using 2017-11-21 15:02:16 +09:00
8e63a7dd8d Handle more exceptions when checking for updates
Should resolve #849.
2017-11-21 14:42:49 +09:00
e98d9e8a8c Explicitly define constant 2017-11-20 19:44:06 +09:00
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
e608d2841b Prefer net461 2017-11-20 16:10:34 +09:00
067c018422 Cleanups 2017-11-19 17:31:35 +09:00
5fd16c6268 Make osu.Desktop.Deploy work 2017-11-19 16:30:41 +09:00
db4c912e1e Fix up assembly name 2017-11-19 14:46:51 +09:00
440c1a9f83 Make osu.Desktop and osu.Game.Tests compile under net461+netstandard 2017-11-19 14:30:56 +09:00
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09:00
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
3d6bb3befe Add startup argument to disable the version overlay 2017-11-11 22:56:02 +09:00
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
65b23f38f1 fixup! Allow version manager to load completely async 2017-10-24 10:08:42 +09:00
ae0029082a Allow version manager to load completely async 2017-10-24 10:08:42 +09:00
f66747b63d Merge branch 'master' into fix-missing-sqlite 2017-10-24 08:14:55 +09:00
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
b1d5fc523f Add sqlite raw packages to osu.Desktop to ensure sqlite is copied locally 2017-10-23 00:36:50 +09:00
a9657d2142 Change beatmap import to use OpenTK's FileDrop event 2017-10-22 00:55:32 +10:30
7ce6167220 Merge branch 'master' into EfCore 2017-10-19 21:20:22 +09:00
365e2343a1 Remove AllRuleset references 2017-10-19 21:09:29 +09:00
a724a20b02 Remove duplicate reference to opentk package 2017-10-19 20:07:25 +09:00
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
a5ccf12e4a Fix ValueTuple mess 2017-10-16 14:04:04 +09:00
5f083f10a7 Add System.ValueTuple NuGet package 2017-10-14 16:19:03 +03:00
179542daf1 Standardise AssemblyInfos 2017-10-14 15:02:20 +09:00
c5046f6b3c Add back osu.Desktop project
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00