mirror of
https://github.com/ppy/osu
synced 2025-02-07 13:51:59 +00:00
Merge branch 'master' into solo-score-submission
This commit is contained in:
commit
ff139c2056
14
.github/ISSUE_TEMPLATE/01-bug-issues.md
vendored
14
.github/ISSUE_TEMPLATE/01-bug-issues.md
vendored
@ -1,7 +1,18 @@
|
|||||||
---
|
---
|
||||||
name: Bug Report
|
name: Bug Report
|
||||||
about: Issues regarding encountered bugs.
|
about: Report a bug or crash to desktop
|
||||||
---
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
IMPORTANT: Your issue may already be reported.
|
||||||
|
|
||||||
|
Please check:
|
||||||
|
- Pinned issues, at the top of https://github.com/ppy/osu/issues
|
||||||
|
- Current priority 0 issues at https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Apriority%3A0
|
||||||
|
- Search for your issue. If you find that it already exists, please respond with a reaction or add any further information that may be helpful.
|
||||||
|
-->
|
||||||
|
|
||||||
|
|
||||||
**Describe the bug:**
|
**Describe the bug:**
|
||||||
|
|
||||||
**Screenshots or videos showing encountered issue:**
|
**Screenshots or videos showing encountered issue:**
|
||||||
@ -9,6 +20,7 @@ about: Issues regarding encountered bugs.
|
|||||||
**osu!lazer version:**
|
**osu!lazer version:**
|
||||||
|
|
||||||
**Logs:**
|
**Logs:**
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
*please attach logs here, which are located at:*
|
*please attach logs here, which are located at:*
|
||||||
- `%AppData%/osu/logs` *(on Windows),*
|
- `%AppData%/osu/logs` *(on Windows),*
|
||||||
|
20
.github/ISSUE_TEMPLATE/02-crash-issues.md
vendored
20
.github/ISSUE_TEMPLATE/02-crash-issues.md
vendored
@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
name: Crash Report
|
|
||||||
about: Issues regarding crashes or permanent freezes.
|
|
||||||
---
|
|
||||||
**Describe the crash:**
|
|
||||||
|
|
||||||
**Screenshots or videos showing encountered issue:**
|
|
||||||
|
|
||||||
**osu!lazer version:**
|
|
||||||
|
|
||||||
**Logs:**
|
|
||||||
<!--
|
|
||||||
*please attach logs here, which are located at:*
|
|
||||||
- `%AppData%/osu/logs` *(on Windows),*
|
|
||||||
- `~/.local/share/osu/logs` *(on Linux & macOS).*
|
|
||||||
- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
|
|
||||||
- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
|
|
||||||
-->
|
|
||||||
|
|
||||||
**Computer Specifications:**
|
|
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: Feature Request
|
name: Feature Request
|
||||||
about: Features you would like to see in the game!
|
about: Propose a feature you would like to see in the game!
|
||||||
---
|
---
|
||||||
**Describe the new feature:**
|
**Describe the new feature:**
|
||||||
|
|
@ -2,18 +2,21 @@
|
|||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
using System.Linq;
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Configuration;
|
using osu.Framework.Configuration;
|
||||||
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Colour;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Graphics.Colour;
|
using osu.Framework.Input.Handlers.Mouse;
|
||||||
using osu.Game.Graphics.Cursor;
|
using osu.Framework.Platform;
|
||||||
using osu.Game.Tournament.Models;
|
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Graphics.Cursor;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Tournament.Models;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
|
|
||||||
@ -36,7 +39,7 @@ namespace osu.Game.Tournament
|
|||||||
private LoadingSpinner loadingSpinner;
|
private LoadingSpinner loadingSpinner;
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(FrameworkConfigManager frameworkConfig)
|
private void load(FrameworkConfigManager frameworkConfig, GameHost host)
|
||||||
{
|
{
|
||||||
windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
|
windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
|
||||||
windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
|
windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
|
||||||
@ -48,6 +51,13 @@ namespace osu.Game.Tournament
|
|||||||
Margin = new MarginPadding(40),
|
Margin = new MarginPadding(40),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// in order to have the OS mouse cursor visible, relative mode needs to be disabled.
|
||||||
|
// can potentially be removed when https://github.com/ppy/osu-framework/issues/4309 is resolved.
|
||||||
|
var mouseHandler = host.AvailableInputHandlers.OfType<MouseHandler>().FirstOrDefault();
|
||||||
|
|
||||||
|
if (mouseHandler != null)
|
||||||
|
mouseHandler.UseRelativeMode.Value = false;
|
||||||
|
|
||||||
loadingSpinner.Show();
|
loadingSpinner.Show();
|
||||||
|
|
||||||
BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]
|
BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]
|
||||||
|
@ -531,6 +531,13 @@ namespace osu.Game
|
|||||||
SentryLogger.Dispose();
|
SentryLogger.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
|
||||||
|
=> new Dictionary<FrameworkSetting, object>
|
||||||
|
{
|
||||||
|
// General expectation that osu! starts in fullscreen by default (also gives the most predictable performance)
|
||||||
|
{ FrameworkSetting.WindowMode, WindowMode.Fullscreen }
|
||||||
|
};
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadComplete();
|
||||||
|
Loading…
Reference in New Issue
Block a user