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

Merge pull request #912 from johnneijzen/master

Browse Source 
Clean up
This commit is contained in:
Dean Herbert 2017-06-08 14:26:03 +09:00 committed by GitHub
commit 8f909354bf
10 changed files with 14 additions and 28 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 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
return curveData.RepeatSamples[index];
}
/// <summary>
/// Constructs and adds a note to a pattern.
/// </summary>
@ -480,7 +479,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
Tail = { Samples = sampleInfoListAt(endTime) }
};
newObject = holdNote;
}

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

@ -13,7 +13,6 @@ namespace osu.Game.Configuration
protected override void InitialiseDefaults()
{
// UI/selection defaults
Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
@ -25,7 +24,6 @@ namespace osu.Game.Configuration
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 @@ namespace osu.Game.Configuration
};
// 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 @@ namespace osu.Game.Configuration
Set(OsuSetting.MouseDisableWheel, false);
// Graphics
Set(OsuSetting.ShowFpsDisplay, false);
Set(OsuSetting.MenuParallax, true);
@ -65,7 +60,6 @@ namespace osu.Game.Configuration
Set(OsuSetting.SnakingOutSliders, true);
// Gameplay
Set(OsuSetting.DimLevel, 0.3, 0, 1);
Set(OsuSetting.ShowInterface, true);
@ -75,7 +69,6 @@ namespace osu.Game.Configuration
Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2);
// Update
Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
}

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

@ -367,7 +367,6 @@ namespace osu.Game.Overlays
}
else
{
careChannels.Add(channel);
channelTabs.AddItem(channel);
}

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

@ -283,9 +283,9 @@ namespace osu.Game.Screens.Menu
public ButtonState State
{
get{ return state; }
set
{
if (state == value)
return;

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

@ -51,10 +51,7 @@ namespace osu.Game.Screens.Menu
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 @@ namespace osu.Game.Screens.Menu
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 @@ namespace osu.Game.Screens.Play
{
if (!pauseContainer.IsPaused)
decoupledClock.Start();
});
pauseContainer.Alpha = 0;

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

@ -47,6 +47,7 @@ namespace osu.Game.Screens.Select
public BeatmapInfo Beatmap
{
get { return beatmap; }
set
{
if (beatmap == value) return;

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

@ -83,6 +83,7 @@ namespace osu.Game.Screens.Tournament
private ScrollState scrollState
{
get { return _scrollState; }
set
{
if (_scrollState == value)
@ -329,6 +330,7 @@ namespace osu.Game.Screens.Tournament
public bool Selected
{
get { return selected; }
set
{
selected = value;