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

11 Commits

Author SHA1 Message Date
Dean Herbert
cf63ee4948 Update licence headers 2019-03-04 13:24:19 +09:00
Dean Herbert
389632d932 Fix bindable changes 2019-03-02 13:40:43 +09:00
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
a7c82c9741 Split out chat component into reusable piece 2018-12-20 16:50:38 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
925532508c Change precedence of chat colouring 2018-11-18 12:39:17 +09:00
Dean Herbert
4b047ad9cc Centralise chat display 2018-11-17 21:27:02 +09:00
Dean Herbert
26286177d3 Colour chat names 2018-11-17 15:35:14 +09:00
Dean Herbert
c1e3c4d435 Make chat tests work again, clear old messages 2018-11-17 10:40:44 +09:00
Dean Herbert
e3e92f4302 Add chat IPC and gameplay screen integration 2018-11-16 19:43:54 +09:00
Dean Herbert
1ab4713ef6 Add tournament chat display 2018-11-16 15:30:19 +09:00