h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Code Issues Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
DrabWeb 2017-03-13 09:44:22 -03:00
parent dbc8d513f9
commit 442a2c97db
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
View File

@ -19,7 +19,6 @@ namespace osu.Desktop.VisualTests
{
class TestCaseLeaderboard : TestCase
{
public override string Name => @"Leaderboard";
public override string Description => @"From song select";
private Leaderboard leaderboard;

1
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -14,6 +14,7 @@ using osu.Game.Modes;
using osu.Framework.Graphics.Textures;
using osu.Framework.Allocation;
using System.Linq;
using osu.Framework.Extensions.Color4Extensions;
namespace osu.Game.Screens.Select.Leaderboards
{

4
osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
View File

@ -270,9 +270,9 @@ namespace osu.Game.Screens.Tournament
private void addFlags()
{
foreach (Team t in availableTeams)
foreach (Region r in availableTeams)
{
Add(new ScrollingTeam(t)
Add(new ScrollingTeam(r)
{
X = leftPos + DrawWidth
});

6
osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
View File

@ -53,11 +53,7 @@ namespace osu.Game.Screens.Tournament.Teams
string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
<<<<<<< HEAD
teams.Add(new Region()
=======
teams.Add(new Team
>>>>>>> 6f20473e65960e059727dee5dc075fc356d07c1b
teams.Add(new Region
{
FlagName = flagName,
FullName = teamName,

3
osu.Game/osu.Game.csproj
View File

@ -326,15 +326,12 @@
<Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
<Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
<Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
<<<<<<< HEAD
<Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
<Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
<Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
<Compile Include="Users\Region.cs" />
<Compile Include="Users\Badge.cs" />
=======
<Compile Include="IO\ArchiveReader.cs" />
>>>>>>> 6f20473e65960e059727dee5dc075fc356d07c1b
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">