1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 11:12:57 +08:00
Commit Graph

6 Commits

Author SHA1 Message Date
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
46e163ec5e Add score display 2018-11-15 21:28:42 +09:00
Dean Herbert
b5c2d94cc4 Avoid rendering more than one video at once 2018-11-11 01:39:02 +09:00
Dean Herbert
86423dce5f Animate song bar based on game mode 2018-11-11 01:30:21 +09:00
Dean Herbert
3eabac0e3d Move all IPC handling to its own class 2018-11-08 01:23:00 +09:00
Dean Herbert
ca9df94ea2 Add skeleton for gameplay screen 2018-11-06 19:27:10 +09:00