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
|
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
|
4b74105ad9
|
Fix code sanity issues
|
2018-11-16 20:34:51 +09:00 |
|
Dean Herbert
|
2683b161d5
|
Fix missing logo
|
2018-11-11 09:16:46 +09:00 |
|
Dean Herbert
|
ca9df94ea2
|
Add skeleton for gameplay screen
|
2018-11-06 19:27:10 +09:00 |
|
Dean Herbert
|
afb3b38098
|
Fix regression in testing logic
|
2018-11-06 18:32:59 +09:00 |
|
Dean Herbert
|
6f25548737
|
Remove now unnecessary null setters
|
2018-11-06 14:49:20 +09:00 |
|
Dean Herbert
|
c7e5ae0573
|
Read from stable
|
2018-11-05 23:15:13 +09:00 |
|
Dean Herbert
|
7e092c6084
|
Read videos from storage
|
2018-11-04 21:15:06 +09:00 |
|
Dean Herbert
|
54a02ee2d7
|
Add showcase screen
|
2018-11-04 07:12:07 +09:00 |
|