sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Get the game running, though not perfectly

Browse Source
This commit is contained in:
Drew DeVault
2016-11-08 18:46:08 -05:00
parent ee24cd310c
commit fe9034323b
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -26,12 +26,6 @@ namespace osu.Desktop.VisualTests.Tests
protected override IFrameBasedClock Clock => localClock; protected override IFrameBasedClock Clock => localClock;
[Initializer]
private void Load()
{
// TODO: Do we even need this here?
}
public override void Reset() public override void Reset()
{ {
base.Reset(); base.Reset();

2
osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps.Formats
foreach (HitObject h in b.HitObjects) foreach (HitObject h in b.HitObjects)
{ {
if (h.NewCombo) i = (i + 1) % colours.Count; if (h.NewCombo || i == -1) i = (i + 1) % colours.Count;
h.Colour = colours[i]; h.Colour = colours[i];
} }
} }

2
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -45,4 +45,4 @@ namespace osu.Game.Graphics.Containers
content.Scale = new Vector2(1 + ParallaxAmount); content.Scale = new Vector2(1 + ParallaxAmount);
} }
} }
} }

30
osu.Game/OsuGameBase.cs
View File

@ -37,18 +37,6 @@ namespace osu.Game
public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>(); public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
public OsuGameBase()
{
AddInternal(ratioContainer = new RatioAdjust());
Children = new Drawable[]
{
Cursor = new OsuCursorContainer { Depth = float.MaxValue }
};
Beatmap.ValueChanged += Beatmap_ValueChanged;
}
private void Beatmap_ValueChanged(object sender, EventArgs e) private void Beatmap_ValueChanged(object sender, EventArgs e)
{ {
} }
@ -57,8 +45,20 @@ namespace osu.Game
private void Load() private void Load()
{ {
Dependencies.Cache(this); Dependencies.Cache(this);
Dependencies.Cache<OsuConfigManager>(); Dependencies.Cache<OsuConfigManager>(new OsuConfigManager(Host.Storage));
Dependencies.Cache(new BeatmapDatabase(Host.Storage, Host)); Dependencies.Cache(new BeatmapDatabase(Host.Storage, Host));
AddInternal(ratioContainer = new RatioAdjust());
Children = new Drawable[]
{
Options = new OptionsOverlay(),
Cursor = new OsuCursorContainer { Depth = float.MaxValue }
};
Dependencies.Cache(Options);
Beatmap.ValueChanged += Beatmap_ValueChanged;
OszArchiveReader.Register(); OszArchiveReader.Register();
@ -80,12 +80,12 @@ namespace osu.Game
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Black")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Black"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic"));
API = new APIAccess() Dependencies.Cache(API = new APIAccess
{ {
Username = Config.Get<string>(OsuConfig.Username), Username = Config.Get<string>(OsuConfig.Username),
Password = Config.Get<string>(OsuConfig.Password), Password = Config.Get<string>(OsuConfig.Password),
Token = Config.Get<string>(OsuConfig.Token) Token = Config.Get<string>(OsuConfig.Token)
}; });
} }
public override void SetHost(BasicGameHost host) public override void SetHost(BasicGameHost host)