1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 00:52:55 +08:00
Commit Graph

76 Commits

Author SHA1 Message Date
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
41d776b090 Fix stable import failing
Regressed due to null GameHost. Fixes the new reports in #4043.
2019-03-30 23:56:38 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +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
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +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
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
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
4f1736ceb2 Make squirrel work again 2018-08-01 02:58:39 +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
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
c18a5b5ac8 Fix importing long filenames from stable 2018-05-29 19:32:56 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
smoogipoo
b9f456402a Re-implement OsuGameDesktop icon 2018-03-26 18:55:55 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +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
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
d364603e45 Make registry checking work again 2017-11-22 20:02:31 +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
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
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
Shane Woolcock
a9657d2142 Change beatmap import to use OpenTK's FileDrop event 2017-10-22 00:55:32 +10:30
Dean Herbert
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
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
0ea6c65be6 Fix potentially racey behaviour of versionManager initialisation
Changing the state while the container wasn't necessarily completed loading caused inconsistent behaviour.
2017-08-22 19:34:06 +09:00
Dean Herbert
e7e822ecd5 Fix StableStorage having "Songs" in the path twice 2017-08-01 16:37:43 +09:00
Dean Herbert
941f3f0934 Tidy up osu-stable import process
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
Dean Herbert
96189fa749 Fix crash on startup for release builds 2017-07-08 16:16:49 +09:00
Vlad K
5602f04611 CI fix 2017-06-27 04:23:58 +03:00
Vlad K
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00