Commit Graph

342 Commits

Author SHA1 Message Date
fa7fd6efe3 Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
b225ae82be GetInputHandler -> CreateInputHandler. 2017-03-24 13:59:05 +09:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
4fa6db6cfa Hide options when entering the game 2017-03-21 18:20:15 +03:00
77067b7e64 Re-style. 2017-03-18 02:04:23 +09:00
f9f31ca092 Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08: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
9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
6e9c4a4251 Merge branch 'master' into options-footer 2017-03-06 20:01:51 +01:00
c24a4f57d9 Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +09:00
5ec2db6558 Fix crash on opening options before intro has played. 2017-03-06 17:32:10 +09:00
0ee38571a6 Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
a5d044067c Cancel previous load attempts before starting a new score load. 2017-03-04 21:35:12 +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
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
e06b3ecf2d Input fix 2017-02-27 18:18:12 +03:00
9444ffd849 Removed redundant qualifiers 2017-02-27 17:37:38 +03:00
27d31d1d30 Merge remote-tracking branch 'upstream/master' into better-container 2017-02-26 11:23:06 +09:00
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
5ff4028c29 Make beatmap importing async. 2017-02-24 18:12:50 +09:00
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01: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
366e95dd4f Remove outdated comment. 2017-02-17 17:33:41 +09:00
9e8b4d43dd Improve exit procedure. 2017-02-17 17:25:28 +09:00
753232533a Display Important/Error logging in notifications for now. 2017-02-15 12:37:57 +09:00
870aa2750f Don't attempt to import command line arguments as beatmaps. 2017-02-12 14:53:33 +09:00
8ec927899f Implement notifications. 2017-02-10 16:30:23 +09:00
2e119cd74f Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
3cee23fc00 Toggle toolbar with Ctrl-T. 2017-02-08 20:30:45 +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
64f4098791 Move MusicController beneath Toolbar. 2017-01-31 17:05:54 +09:00
74366c620b Move login screen to toolbar and update design (still not fully implemented).
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
#	osu.Game/Overlays/Toolbar/Toolbar.cs
2017-01-30 22:55:35 +09:00
cbd6fe3f36 Move definition of MusicController's position out of itself. 2017-01-30 22:54:33 +09:00
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
ae464fcace Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
4d27101aca Add ability to adjust game clock's speed (pgup/pgdn).
A bit hacky, probably need to expose rate better.
2016-12-05 19:33:38 +09:00
9bf36418a0 Make toolbar buttons more independent logic-wise.
Also adds visual toggle state for toggleable buttons.
2016-12-02 18:43:01 +09:00
167b559a95 Move toolbar to own namespace. 2016-12-01 14:22:29 +09:00
c6b7e90739 Merge branch 'refs/heads/master' into online-improvements 2016-12-01 12:51:45 +09:00
18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00