1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 23:47:32 +08:00
osu-lazer/osu.Game.Modes.Catch
Dean Herbert 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
..
Objects Fix most warnings. 2017-03-07 13:05:57 +09:00
Properties Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
UI Use generics everywhere. 2017-03-06 13:59:11 +09:00
CatchDifficultyCalculator.cs Fix and refactor star difficulty calculation boilerplate 2017-02-24 19:36:17 +01:00
CatchMod.cs CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
CatchRuleset.cs Only show replay cursor when replay input is present. 2017-03-06 15:24:00 +09:00
OpenTK.dll.config Add/update license headers. 2017-02-14 18:17:35 +09:00
osu.Game.Modes.Catch.csproj Working on better way to handle mods 2017-03-01 20:57:33 -04:00
packages.config Update nuget packages. 2017-02-27 20:38:30 +09:00