1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 20:45:46 +08:00
osu-lazer/osu.Game/Graphics
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
..
Backgrounds Make triangles opaque. 2017-01-30 16:53:12 +09:00
Components Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00
Containers Add missing licence headers. 2016-12-06 19:07:15 +09:00
Cursor Cursor scale 2017-02-02 14:44:56 +03:00
Processing Use DrawSize instead of Size whereever Size was previously read due to framework changes. 2016-10-18 18:53:31 +02:00
Sprites Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
UserInterface Merge remote-tracking branch 'upstream/master' into options-refactor 2017-02-03 13:16:07 +09:00
OsuColour.cs Merge branch 'master' into add-flash-effects 2017-01-30 21:47:05 +09:00
TextAwesome.cs Update FontAwesome definitions. 2016-11-07 17:59:00 +09:00