Commit Graph

605 Commits

Author SHA1 Message Date
02cab41d34 Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
5cbcf7a20a Fix error-level inspections. 2017-03-07 14:31:54 +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
1751532a01 Fix a few regressions. 2017-03-07 13:30:36 +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
57cbecba83 Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554). 2017-03-06 22:08:02 +09:00
88f3dc0e02 Fix a few naming issues. 2017-03-06 18:49:23 +09:00
9908c1905d Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
e356758a7d Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
76ef8c1a6c Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
faf07ab51a Use generics everywhere. 2017-03-06 13:59:11 +09:00
81cc27e104 Fix typo. 2017-03-06 10:06:25 +09:00
7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
5719c6656a Update to work with latest framework 2017-03-04 22:38:01 -04:00
9cde20ffc7 Merge https://github.com/ppy/osu into leaderboards 2017-03-04 22:33:05 -04:00
b02e413e56 Removed LeaderboardFade fully 2017-03-04 22:30:48 -04:00
269c139d2a Flags(redoing later), glowing text, proper Score and User usage 2017-03-04 22:29:52 -04:00
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
7eebee36ab Merge branch 'master' into moarOptions 2017-03-04 16:11:27 +01:00
a3f1cb2232 Merge branch 'master' into update-flow 2017-03-04 15:35:53 +01:00
5c5066e1ae renamed local groups 2017-03-04 15:30:14 +01:00
e12d89529c Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
112545f135 Fix unnecessarily throwing exception if there's no last drawings results file. 2017-03-04 23:24:32 +09:00
00fdffe9c8 Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
389635c7ed Avoid panel state changes when performing a sort. 2017-03-04 22:05:16 +09:00
8f3621ca24 Make selectGroup a private method. 2017-03-04 22:05:02 +09:00
7a6a614358 Don't show pause menu when watching replays. 2017-03-04 21:35:26 +09:00
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
d1bad34434 Enter animation, remove testing mod icons 2017-03-04 05:01:55 -04:00
a2b79de672 Add comments to CarouselContainer 2017-03-04 09:34:39 +01:00
aaa1f766af Fix beatmap removal 2017-03-04 09:34:28 +01:00
9bddd1ed4b Fix broken CarouselContainer animations
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
2017-03-04 09:33:24 +01:00
d6f53c8b77 Moved test data to visual test 2017-03-04 04:05:31 -04:00
a97a7f1024 No more custom lifetimelist in CarouselContainer 2017-03-04 08:54:14 +01:00
a112b354f0 Basic implementation of score UI 2017-03-04 03:37:34 -04:00
adb6f01e39 Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00
9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
b9e4c920c5 SelectRandom doesnt select hidden groups now 2017-03-03 21:11:38 +01:00
6f3b59268a Merge pull request #385 from DrabWeb/mod-overlay
Mod select
2017-03-03 21:09:08 +09:00
dc6a728cce Merge branch 'master' into tournament_drawings 2017-03-03 20:48:07 +09:00
38a9e820e6 GroupsContainer -> GroupContainer. 2017-03-03 20:46:07 +09:00
bc01935a89 Move around some namespaces. 2017-03-03 20:42:22 +09:00
2ac248c7d0 Use OsuSpriteText. 2017-03-03 20:29:39 +09:00
1ea1118db6 Simplify file reading. 2017-03-03 20:24:34 +09:00
4a109fcc55 Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided. 2017-03-03 20:21:11 +09:00
ca73b77a9a Tidying code. 2017-03-03 20:08:32 +09:00