RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into osu-difficulty-refactor

This commit is contained in:
Thomas Müller 2017-06-08 10:16:11 +02:00 committed by GitHub
parent 9d915a691d 8f909354bf
commit 0438fd2058
11 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
View File

@ -448,7 +448,6 @@ private SampleInfoList sampleInfoListAt(double time)
return curveData.RepeatSamples[index];
}
/// <summary>
/// Constructs and adds a note to a pattern.
/// </summary>
@ -480,7 +479,6 @@ private void addToPattern(Pattern pattern, int column, double startTime, double
Tail = { Samples = sampleInfoListAt(endTime) }
};
newObject = holdNote;
}

7
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -13,7 +13,6 @@ public class OsuConfigManager : ConfigManager<OsuSetting>
protected override void InitialiseDefaults()
{
// UI/selection defaults
Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
@ -25,7 +24,6 @@ protected override void InitialiseDefaults()
Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1);
// Online settings
Set(OsuSetting.Username, string.Empty);
Set(OsuSetting.Token, string.Empty);
@ -40,14 +38,12 @@ protected override void InitialiseDefaults()
};
// Audio
Set(OsuSetting.MenuVoice, true);
Set(OsuSetting.MenuMusic, true);
Set(OsuSetting.AudioOffset, 0, -500.0, 500.0);
// Input
Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2);
Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2);
Set(OsuSetting.AutoCursorSize, false);
@ -56,7 +52,6 @@ protected override void InitialiseDefaults()
Set(OsuSetting.MouseDisableWheel, false);
// Graphics
Set(OsuSetting.ShowFpsDisplay, false);
Set(OsuSetting.MenuParallax, true);
@ -65,7 +60,6 @@ protected override void InitialiseDefaults()
Set(OsuSetting.SnakingOutSliders, true);
// Gameplay
Set(OsuSetting.DimLevel, 0.3, 0, 1);
Set(OsuSetting.ShowInterface, true);
@ -75,7 +69,6 @@ protected override void InitialiseDefaults()
Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2);
// Update
Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
}

2
osu.Game/OsuGame.cs
View File

@ -150,7 +150,7 @@ protected override void LoadComplete()
RelativeSizeAxes = Axes.Both,
},
volume = new VolumeControl(),
overlayContent = new Container{ RelativeSizeAxes = Axes.Both },
overlayContent = new Container { RelativeSizeAxes = Axes.Both },
new OnScreenDisplay(),
new GlobalHotkeys //exists because UserInputManager is at a level below us.
{

1
osu.Game/Overlays/ChatOverlay.cs
View File

@ -367,7 +367,6 @@ private void addChannel(Channel channel)
}
else
{
careChannels.Add(channel);
channelTabs.AddItem(channel);
}

6
osu.Game/Screens/Menu/Button.cs
View File

@ -66,7 +66,7 @@ public Button(string text, string internalName, FontAwesome symbol, Color4 colou
Scale = new Vector2(0, 1),
Size = boxSize,
Shear = new Vector2(ButtonSystem.WEDGE_WIDTH / boxSize.Y, 0),
Children = new []
Children = new[]
{
new Box
{
@ -282,10 +282,10 @@ protected override void Update()
public ButtonState State
{
get { return state; }
get{ return state; }
set
{
if (state == value)
return;

10
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -51,10 +51,7 @@ public class OsuLogo : BeatSyncedContainer
public bool Triangles
{
set
{
colourAndTriangles.Alpha = value ? 1 : 0;
}
set { colourAndTriangles.Alpha = value ? 1 : 0; }
}
protected override bool InternalContains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
@ -62,10 +59,7 @@ public bool Triangles
public bool Ripple
{
get { return rippleContainer.Alpha > 0; }
set
{
rippleContainer.Alpha = value ? 1 : 0;
}
set { rippleContainer.Alpha = value ? 1 : 0; }
}
public bool Interactive = true;

1
osu.Game/Screens/Play/Player.cs
View File

@ -278,7 +278,6 @@ protected override void OnEntering(Screen last)
{
if (!pauseContainer.IsPaused)
decoupledClock.Start();
});
pauseContainer.Alpha = 0;

2
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -244,7 +244,7 @@ public void Filter(FilterCriteria newCriteria = null, bool debounce = true)
private BeatmapGroup createGroup(BeatmapSetInfo beatmapSet)
{
foreach(var b in beatmapSet.Beatmaps)
foreach (var b in beatmapSet.Beatmaps)
{
if (b.Metadata == null)
b.Metadata = beatmapSet.Metadata;

9
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -47,6 +47,7 @@ public class BeatmapDetails : Container
public BeatmapInfo Beatmap
{
get { return beatmap; }
set
{
if (beatmap == value) return;
@ -165,7 +166,7 @@ public BeatmapDetails()
Direction = FillDirection.Vertical,
LayoutDuration = 200,
LayoutEasing = EasingTypes.OutQuint,
Children = new []
Children = new[]
{
description = new MetadataSegment("Description"),
source = new MetadataSegment("Source"),
@ -199,9 +200,9 @@ public BeatmapDetails()
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0,5),
Spacing = new Vector2(0, 5),
Padding = new MarginPadding(10),
Children = new []
Children = new[]
{
circleSize = new DifficultyRow("Circle Size", 7),
drainRate = new DifficultyRow("HP Drain"),
@ -479,7 +480,7 @@ public MetadataSegment(string headerText)
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Full,
Spacing = new Vector2(5,0),
Spacing = new Vector2(5, 0),
Margin = new MarginPadding { Top = header.TextSize }
}
};

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

@ -83,6 +83,7 @@ public ScrollingTeamContainer()
private ScrollState scrollState
{
get { return _scrollState; }
set
{
if (_scrollState == value)
@ -329,6 +330,7 @@ public class ScrollingTeam : Container
public bool Selected
{
get { return selected; }
set
{
selected = value;

2
osu.Game/osu.Game.csproj
View File

@ -43,7 +43,7 @@
<HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
<HintPath>$(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>