29 Commits

Author	SHA1	Message	Date
Dean Herbert	4cd6955a96	Fix GameplayScreen test not working	2019-06-14 20:32:23 +09:00
Dean Herbert	7b56180b8b	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-15 12:08:23 +09:00
Dean Herbert	cf63ee4948	Update licence headers	2019-03-04 13:24:19 +09:00
Dean Herbert	73d266fe10	Fix win screen being incorrectly displayed after switching matches	2019-03-02 16:32:11 +09:00
Dean Herbert	389632d932	Fix bindable changes	2019-03-02 13:40:43 +09:00
Dean Herbert	6ea1ed8d04	Fix unnecessary texture atlas generation	2019-02-17 19:48:54 +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	fdba2bffb9	Ensure last state is set correctly	2018-11-22 17:33:48 +09:00
Dean Herbert	4e8c7a4dc0	Adjust gameplay area to match better ... Also reduces size of score display to avoid hiding combos.	2018-11-22 15:42:10 +09:00
Dean Herbert	f91d2e2e07	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
Dean Herbert	5621101d40	Adjust gameplay screen size	2018-11-18 12:39:25 +09:00
Dean Herbert	e6529eac3e	Add automation of map pool and win screen workflows	2018-11-18 08:30:17 +09:00
Dean Herbert	4b047ad9cc	Centralise chat display	2018-11-17 21:27:02 +09:00
Dean Herbert	9f519d7002	Actually add match score display to gameplay screen	2018-11-17 15:59:55 +09:00
Dean Herbert	49e155c2c0	Fix chat not appearing at ranking	2018-11-17 15:31:03 +09:00
Dean Herbert	e3e92f4302	Add chat IPC and gameplay screen integration	2018-11-16 19:43:54 +09:00
Dean Herbert	c9e2ee8f56	Fix masking of song bar	2018-11-16 18:14:42 +09:00
Dean Herbert	46e163ec5e	Add score display	2018-11-15 21:28:42 +09:00
Dean Herbert	949cf98d1a	Adjust gameplay position ever so slightly	2018-11-11 09:23:54 +09:00
Dean Herbert	e3576572a3	Fix warmup state, automate more	2018-11-11 09:22:57 +09:00
Dean Herbert	21bbb68636	Handle delayed contract	2018-11-11 01:50:09 +09:00
Dean Herbert	86423dce5f	Animate song bar based on game mode	2018-11-11 01:30:21 +09:00
Dean Herbert	629657044d	Add automatic scoring	2018-11-11 00:45:48 +09:00
Dean Herbert	713038bff8	Share header area between screens	2018-11-10 17:26:21 +09:00
Dean Herbert	1756ef95cb	Add ability to adjust scores from gameplay screen	2018-11-10 07:31:06 +09:00
Dean Herbert	66dc7d6b02	Fix debug tools not working	2018-11-09 16:26:09 +09:00
Dean Herbert	0be2f5ac94	Add non-working warmup toggle button	2018-11-09 16:10:58 +09:00
Dean Herbert	160984719d	Add team and star displays	2018-11-08 20:38:14 +09:00
Dean Herbert	ca9df94ea2	Add skeleton for gameplay screen	2018-11-06 19:27:10 +09:00