-
Notifications
You must be signed in to change notification settings - Fork 424
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-rearrangeablelist-scrolltotop
- Loading branch information
Showing
39 changed files
with
95 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| osu.Framework.Templates |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <PackageType>Template</PackageType> | ||
| <PackageId>ppy.osu.Framework.Templates</PackageId> | ||
| <Title>osu! framework templates</Title> | ||
| <Authors>ppy Pty Ltd</Authors> | ||
| <PackageLicenseUrl>https://github.com/ppy/osu-framework/blob/master/LICENCE.md</PackageLicenseUrl> | ||
| <PackageProjectUrl>https://github.com/ppy/osu-framework</PackageProjectUrl> | ||
| <RepositoryUrl>https://github.com/ppy/osu-framework</RepositoryUrl> | ||
| <PackageReleaseNotes>Automated release.</PackageReleaseNotes> | ||
| <copyright>Copyright (c) 2020 ppy Pty Ltd</copyright> | ||
| <Description>Templates that can be used as starting points for new games, built with of osu! framework.</Description> | ||
| <PackageTags>dotnet-new;templates;osu;framework</PackageTags> | ||
| <TargetFramework>netstandard2.1</TargetFramework> | ||
| <IncludeContentInPack>true</IncludeContentInPack> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| <ContentTargetFolders>content</ContentTargetFolders> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**" /> | ||
| <Compile Remove="**\*" /> | ||
| </ItemGroup> | ||
| </Project> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions
16
osu.Framework.Templates/templates/template-empty/.template.config/template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "$schema": "http://json.schemastore.org/template", | ||
| "author": "ppy Pty Ltd", | ||
| "classifications": [ | ||
| "Console" | ||
| ], | ||
| "name": "osu!framework empty game template", | ||
| "identity": "ppy.osu.Framework.Template.Empty", | ||
| "shortName": "osu-framework-game", | ||
| "tags": { | ||
| "language": "C#", | ||
| "type": "project" | ||
| }, | ||
| "sourceName": "TemplateGame", | ||
| "preferNameDirectory": true | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
osu.Framework.Tests/Visual/Testing/TestSceneManualInputManagerTestScene.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using NUnit.Framework; | ||
| using osu.Framework.Input; | ||
| using osu.Framework.Testing; | ||
| using osuTK; | ||
| using osuTK.Input; | ||
|
|
||
| namespace osu.Framework.Tests.Visual.Testing | ||
| { | ||
| public class TestSceneManualInputManagerTestScene : ManualInputManagerTestScene | ||
| { | ||
| protected override Vector2 InitialMousePosition => new Vector2(10f); | ||
|
|
||
| [Test] | ||
| public void TestResetInput() | ||
| { | ||
| AddStep("move mouse", () => InputManager.MoveMouseTo(Vector2.Zero)); | ||
| AddStep("press mouse", () => InputManager.PressButton(MouseButton.Left)); | ||
| AddStep("press key", () => InputManager.PressKey(Key.Z)); | ||
| AddStep("press joystick", () => InputManager.PressJoystickButton(JoystickButton.Button1)); | ||
|
|
||
| AddStep("reset input", ResetInput); | ||
|
|
||
| AddAssert("mouse position reset", () => InputManager.CurrentState.Mouse.Position == InitialMousePosition); | ||
| AddAssert("all input states released", () => | ||
| !InputManager.CurrentState.Mouse.Buttons.HasAnyButtonPressed && | ||
| !InputManager.CurrentState.Keyboard.Keys.HasAnyButtonPressed && | ||
| !InputManager.CurrentState.Joystick.Buttons.HasAnyButtonPressed); | ||
| } | ||
|
|
||
| [Test] | ||
| public void TestMousePositionSetToInitial() => AddAssert("mouse position set to initial", () => InputManager.CurrentState.Mouse.Position == InitialMousePosition); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.