1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:12:57 +08:00
Commit Graph

21790 Commits

Author SHA1 Message Date
Dean Herbert
36d3736e1d Fix hitcircle font prefix not being read for legacy skins 2019-09-10 18:06:24 +09:00
Dan Balasescu
523e395d2e
Merge pull request #5999 from iiSaLMaN/show-beatmap-not-selected-in-leaderboards
Add "please select a beatmap!" leaderboard placeholder state
2019-09-10 18:02:12 +09:00
Dan Balasescu
4910c23482
Merge branch 'master' into show-beatmap-not-selected-in-leaderboards 2019-09-10 17:43:42 +09:00
Dan Balasescu
01e810528c
Merge pull request #6050 from iiSaLMaN/use-test-working-beatmap-in-details-area-tests
Use TestWorkingBeatmap in BeatmapDetailsArea tests
2019-09-10 17:43:35 +09:00
Dan Balasescu
b4f5f902eb
Merge branch 'master' into use-test-working-beatmap-in-details-area-tests 2019-09-10 17:24:25 +09:00
Dan Balasescu
2b7d5a23d3
Merge pull request #6023 from peppy/add-chat-truncation
Truncate long usernames in chat
2019-09-10 17:24:20 +09:00
Dan Balasescu
ea2793637d
Merge branch 'master' into add-chat-truncation 2019-09-10 17:11:49 +09:00
smoogipoo
717a287d69 Use real ellipsis character 2019-09-10 17:11:26 +09:00
smoogipoo
01fd08cba9 Fix broken positioning of effected usernames 2019-09-10 17:11:16 +09:00
Dan Balasescu
2bc64cd6e1
Merge pull request #6053 from peppy/auto-gen-headless
Mark AutoGeneration tests as headless
2019-09-10 12:44:00 +09:00
Dean Herbert
f505a3ff1d Mark AutoGeneration tests as headless 2019-09-10 11:44:11 +09:00
Dean Herbert
fc7e8dcbfb
Open login overlay if user isn't signed in after intro sequence (#6038)
Open login overlay if user isn't signed in after intro sequence

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-10 09:27:13 +09:00
iiSaLMaN
b77550625c Check if DummyWorkingBeatmap is selected instead 2019-09-09 20:04:04 +03:00
iiSaLMaN
22fabef344 Use TestWorkingBeatmap in BeatmapDetailsArea tests 2019-09-09 19:52:31 +03:00
Dean Herbert
98e384129c Remove redundant initialisation 2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820 Add back local bool (required due to action limitations) 2019-09-10 01:18:02 +09:00
Dean Herbert
dce675d6a8
Merge branch 'master' into login-on-startup 2019-09-10 01:13:29 +09:00
Dean Herbert
f398f134e1 Remove unnecessary bool storage
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826 Show instead of toggle 2019-09-10 01:06:37 +09:00
Dean Herbert
e20b44c3f2 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.909.0' into add-chat-truncation 2019-09-09 21:01:06 +09:00
Dean Herbert
011ff563f9 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.909.0' into add-chat-truncation 2019-09-09 21:00:27 +09:00
Dean Herbert
b374697596 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework-2019.909.0' into add-chat-truncation 2019-09-09 21:00:17 +09:00
dependabot-preview[bot]
3b4750ab9e
Bump ppy.osu.Framework.Android from 2019.905.0 to 2019.909.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.905.0 to 2019.909.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.905.0...2019.909.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 11:37:09 +00:00
dependabot-preview[bot]
7a7c3d21a1
Bump ppy.osu.Framework from 2019.905.0 to 2019.909.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.905.0 to 2019.909.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.905.0...2019.909.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 11:36:58 +00:00
dependabot-preview[bot]
0790e9e377
Bump ppy.osu.Framework.iOS from 2019.905.0 to 2019.909.0
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.905.0 to 2019.909.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.905.0...2019.909.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 11:35:26 +00:00
Dean Herbert
455a421caa Merge remote-tracking branch 'upstream/master' into add-chat-truncation 2019-09-09 17:56:24 +09:00
Dean Herbert
2d636ce147 Update framework 2019-09-09 17:54:53 +09:00
Dean Herbert
570e211db0
Improve gameplay cursor test scene + refactor (#6045)
Improve gameplay cursor test scene + refactor

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-09 17:53:59 +09:00
Dean Herbert
98590e536e
Merge branch 'master' into cursor-test-improvement 2019-09-09 17:26:56 +09:00
Dean Herbert
401c4e7aa7
Make SkinnabbleTestScene use the stored classic skin (#6044)
Make SkinnabbleTestScene use the stored classic skin
2019-09-09 17:25:47 +09:00
smoogipoo
81bb8d9bc4 Make SkinnabbleTestScene use stored classic skin 2019-09-09 17:05:27 +09:00
smoogipoo
5b692915be Add required type 2019-09-09 17:03:14 +09:00
Dean Herbert
358b46beea
Merge pull request #6031 from iiSaLMaN/set-health-default-value-to-1
Fix results screen pushed at the beginning of a gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-09 15:04:08 +09:00
LeNitrous
ff49c4ae98 remove redundancies 2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa move logic to logo action 2019-09-09 13:30:48 +08:00
Dean Herbert
07fce8397b Move reset call to ctor 2019-09-09 14:24:17 +09:00
smoogipoo
74440dcfdc Make the cursors click every so often 2019-09-09 13:01:40 +09:00
smoogipoo
af09ed1b7f Make cursor test scene more automated 2019-09-09 12:48:38 +09:00
smoogipoo
7adfae3784 Reorder CursorTrail members 2019-09-09 12:35:15 +09:00
LeNitrous
04a4f9c9a3 use IsLoggedIn and remove useless clause 2019-09-09 11:26:51 +08:00
Dean Herbert
d0e8b1efce Merge remote-tracking branch 'upstream/master' into add-chat-truncation 2019-09-09 12:09:14 +09:00
Dean Herbert
eeebd517f3 Use MaxWidth specification 2019-09-09 12:08:59 +09:00
Dean Herbert
f0b1995c2a
Add android configuration defaults to props (#6033)
Add android configuration defaults to props
2019-09-09 11:17:21 +09:00
LeNitrous
be4f0cc2dd remove null conditional 2019-09-09 06:14:49 +08:00
miterosan
8862cdab9c Also set the default for Platform 2019-09-08 15:33:51 +02:00
miterosan
d790656b7e Revert shortening the condition 2019-09-08 15:33:16 +02:00
LeNitrous
a67a2899a9 move api state check to it's own clause 2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3 open login on enter main menu 2019-09-08 13:36:58 +08:00
miterosan
6581e51d6a Add a default for the configuration into the android props.
This allows building even if no configuration is specified.
2019-09-07 18:03:33 +02:00
iiSaLMaN
be803fa921 Reset score processor before starting the simulation 2019-09-07 18:15:49 +03:00