1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
osu-lazer/osu.Game/Screens/Menu
Dean Herbert 16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
..
Button.cs Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
ButtonSystem.cs Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
FlowContainerWithOrigin.cs Add missing licence headers. 2016-12-06 19:07:15 +09:00
Intro.cs Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
MainMenu.cs Move the actual outro sequence into Intro rather than MainMenu. 2016-12-05 19:34:52 +09:00
MenuVisualisation.cs Add missing licence headers. 2016-12-06 19:07:15 +09:00
OsuLogo.cs Make triangles opaque. 2017-01-30 16:53:12 +09:00