Commit Graph

96 Commits

Author SHA1 Message Date
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +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
a9657d2142 Change beatmap import to use OpenTK's FileDrop event 2017-10-22 00:55:32 +10:30
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
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
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
e7e822ecd5 Fix StableStorage having "Songs" in the path twice 2017-08-01 16:37:43 +09:00
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
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
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
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
96189fa749 Fix crash on startup for release builds 2017-07-08 16:16:49 +09:00
5602f04611 CI fix 2017-06-27 04:23:58 +03:00
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03:00
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
ba10c3a8db Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
2017-03-14 11:46:34 +09:00
e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08:00
c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
da751804b6 Reduce error count. 2017-03-09 14:24:16 +09:00
dc5ac6e88f Add missing access modifiers. 2017-03-09 13:55:29 +09:00
4430255ec4 Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
0ee38571a6 Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
ff51af94ec Fail on drag drop operations with mixed files. 2017-03-06 15:03:58 +09:00
95e2e2b027 Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
b294386077 Remove misleading beatmap import method. 2017-03-04 16:47:37 +09:00
5ff4028c29 Make beatmap importing async. 2017-02-24 18:12:50 +09:00
c5552dfb27 Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
da2bfe6d3c Framework updates. 2017-02-23 16:42:12 +09:00
bf33cc6f53 Make disclaimer actually be a thing. 2017-02-18 14:16:46 +09:00
fe3a6248ec Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
e6ef9f67aa GameMode -> Screen. 2017-02-17 19:23:58 +09:00
6aa0e7729c Add icon and window title. 2017-02-12 15:03:36 +09:00
045edb6ab7 Add very simple in-game update checker/display. 2017-02-12 14:54:56 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
299c4923c3 Implement Beatmap Import via drag&drop 2017-02-05 13:32:08 +01:00