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

Merge branch 'master' into replay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
This commit is contained in:
Dean Herbert
2017-03-05 17:45:03 +09:00
parent 7a6a614358 a7d7abe70e
commit 4e4408cd20
96 changed files with 217 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs
View File

@ -1,17 +1,13 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Screens.Testing;
using osu.Game.Graphics;
using osu.Game.Overlays;
using osu.Game.Screens.Select.Options;
namespace osu.Desktop.VisualTests
{
class TestCaseBeatmapOptionsOverlay : TestCase
{
public override string Name => @"Beatmap Options";
public override string Description => @"Beatmap options in song select";
public override void Reset()

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

@ -12,7 +12,6 @@ namespace osu.Desktop.VisualTests.Tests
{
private ScheduledDelegate messageRequest;
public override string Name => @"Chat";
public override string Description => @"Testing chat api and overlay";
public override void Reset()

2
osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Screens.Testing;
using osu.Game.Graphics;
using osu.Game.Overlays;
@ -11,7 +10,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseDialogOverlay : TestCase
{
public override string Name => @"Dialog Overlay";
public override string Description => @"Display dialogs";
DialogOverlay overlay;

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

@ -12,7 +12,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseDrawings : TestCase
{
public override string Name => @"Drawings";
public override string Description => "Tournament drawings";
[BackgroundDependencyLoader]

2
osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
View File

@ -20,8 +20,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseGamefield : TestCase
{
public override string Name => @"Gamefield";
public override string Description => @"Showing hitobjects and what not.";
public override void Reset()

2
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
View File

@ -19,8 +19,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseHitObjects : TestCase
{
public override string Name => @"Hit Objects";
private StopwatchClock rateAdjustClock;
private FramedClock framedClock;

12
osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
View File

@ -17,8 +17,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseKeyCounter : TestCase
{
public override string Name => @"KeyCounter";
public override string Description => @"Tests key counter";
public override void Reset()
@ -32,10 +30,10 @@ namespace osu.Desktop.VisualTests.Tests
IsCounting = true,
Children = new KeyCounter[]
{
new KeyCounterKeyboard(@"Z", Key.Z),
new KeyCounterKeyboard(@"X", Key.X),
new KeyCounterMouse(@"M1", MouseButton.Left),
new KeyCounterMouse(@"M2", MouseButton.Right),
new KeyCounterKeyboard(Key.Z),
new KeyCounterKeyboard(Key.X),
new KeyCounterMouse(MouseButton.Left),
new KeyCounterMouse(MouseButton.Right),
},
};
BindableInt bindable = new BindableInt { MinValue = 0, MaxValue = 200, Default = 50 };
@ -43,7 +41,7 @@ namespace osu.Desktop.VisualTests.Tests
AddButton("Add Random", () =>
{
Key key = (Key)((int)Key.A + RNG.Next(26));
kc.Add(new KeyCounterKeyboard(key.ToString(), key));
kc.Add(new KeyCounterKeyboard(key));
});
ButtonsContainer.Add(new SpriteText { Text = "FadeTime" });
ButtonsContainer.Add(new TestSliderBar<int>

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

@ -11,7 +11,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseMenuButtonSystem : TestCase
{
public override string Name => @"ButtonSystem";
public override string Description => @"Main menu button system";
public override void Reset()

5
osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs
View File

@ -5,16 +5,11 @@ using osu.Framework.Graphics;
using osu.Game.Overlays.Mods;
using osu.Framework.Screens.Testing;
using osu.Game.Modes;
using osu.Game.Graphics;
using osu.Framework.Allocation;
using osu.Game.Overlays;
namespace osu.Desktop.VisualTests.Tests
{
class TestCaseModSelectOverlay : TestCase
{
public override string Name => @"Mod Select";
public override string Description => @"Tests the mod select overlay";
private ModSelectOverlay modSelect;

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

@ -11,7 +11,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseMusicController : TestCase
{
public override string Name => @"Music Controller";
public override string Description => @"Tests music controller ui.";
private MusicController mc;

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

@ -14,7 +14,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseNotificationManager : TestCase
{
public override string Name => @"Notification Manager";
public override string Description => @"I handle notifications";
NotificationManager manager;

2
osu.Desktop.VisualTests/Tests/TestCaseOptions.cs
View File

@ -8,8 +8,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseOptions : TestCase
{
public override string Name => @"Options";
public override string Description => @"Tests the options overlay";
private OptionsOverlay options;

2
osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
View File

@ -9,8 +9,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCasePauseOverlay : TestCase
{
public override string Name => @"PauseOverlay";
public override string Description => @"Tests the pause overlay";
private PauseOverlay pauseOverlay;

2
osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using osu.Desktop.VisualTests.Platform;
using osu.Framework.Screens.Testing;
@ -18,7 +17,6 @@ namespace osu.Desktop.VisualTests.Tests
private TestStorage storage;
private PlaySongSelect songSelect;
public override string Name => @"Song Select";
public override string Description => @"with fake data";
public override void Reset()

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

@ -23,7 +23,6 @@ namespace osu.Desktop.VisualTests.Tests
protected Player Player;
private BeatmapDatabase db;
public override string Name => @"Player";
public override string Description => @"Showing everything to play the game.";

2
osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
View File

@ -42,8 +42,6 @@ namespace osu.Desktop.VisualTests.Tests
private Func<Stream> getReplayStream;
private ScoreDatabase scoreDatabase;
public override string Name => @"Replay";
public override string Description => @"Testing replay playback.";
[BackgroundDependencyLoader]

2
osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
View File

@ -20,8 +20,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseScoreCounter : TestCase
{
public override string Name => @"ScoreCounter";
public override string Description => @"Tests multiple counters";
public override void Reset()

2
osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs
View File

@ -14,8 +14,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseTextAwesome : TestCase
{
public override string Name => @"TextAwesome";
public override string Description => @"Tests display of icons";
public override void Reset()

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

@ -9,7 +9,6 @@ namespace osu.Desktop.VisualTests.Tests
{
class TestCaseTwoLayerButton : TestCase
{
public override string Name => @"TwoLayerButton";
public override string Description => @"Back and skip and what not";
public override void Reset()