Salman Ahmed
|
84b40ea2c6
|
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset
# Conflicts:
# osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
# osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
# osu.Game/Tests/Visual/ModTestScene.cs
# osu.Game/Tests/Visual/OsuTestScene.cs
|
2020-06-03 22:00:02 +03:00 |
|
Dan Balasescu
|
c4698e61ec
|
Merge pull request #9195 from peppy/fix-multi-chat-history
Fix chat history not being loaded for multiplayer matches
|
2020-06-03 22:49:27 +09:00 |
|
Dean Herbert
|
f6d9f0597b
|
Add implicit join logic for multiplayer rooms
|
2020-06-03 21:28:29 +09:00 |
|
Dean Herbert
|
3c7e5a5b42
|
Fix ChannelManager not being loaded in tests
|
2020-06-03 18:00:31 +09:00 |
|
Dean Herbert
|
1ba3f0ac14
|
Fix chat history not being loaded for multiplayer matches
|
2020-06-03 17:31:55 +09:00 |
|
Dan Balasescu
|
73467410ab
|
Merge pull request #9192 from peppy/fix-redundant-override
Fix redundant override showing up in build warnings
|
2020-06-03 16:15:33 +09:00 |
|
Dean Herbert
|
86926050e9
|
Merge pull request #9190 from swoolcock/fix-results-crash
Fix results screen crashing for beatmaps with no online ID
|
2020-06-03 16:00:47 +09:00 |
|
Dean Herbert
|
1992a3db54
|
Fix redundant override showing up in build warnings
|
2020-06-03 15:50:00 +09:00 |
|
Dan Balasescu
|
8131137fea
|
Merge branch 'master' into fix-results-crash
|
2020-06-03 15:19:30 +09:00 |
|
Dean Herbert
|
5740fc2bd0
|
Merge pull request #9168 from Game4all/fix-ruleset-no-autoplay
Fix crash after using Ctrl+Enter when current ruleset doesn't have an autoplay mod
|
2020-06-03 12:50:57 +09:00 |
|
Shane Woolcock
|
b174daa94a
|
Remove unused using
|
2020-06-03 11:58:56 +09:30 |
|
Shane Woolcock
|
0d5a2cf96d
|
Add unit tests
|
2020-06-03 11:36:59 +09:30 |
|
Shane Woolcock
|
96e3c6e8e8
|
Move check to SoloResultsScreen
|
2020-06-03 11:36:47 +09:30 |
|
Shane Woolcock
|
90213d079d
|
Include submission status in check
|
2020-06-03 10:48:27 +09:30 |
|
Shane Woolcock
|
f4f84ede6a
|
Fix results screen crashing for beatmaps with no online ID
|
2020-06-03 10:43:16 +09:30 |
|
Dean Herbert
|
0d30987d82
|
Merge pull request #9182 from smoogipoo/fix-cursor-trail
Fix cursor trail not displaying
|
2020-06-03 09:42:59 +09:00 |
|
smoogipoo
|
dc41e74e19
|
Fix cursor trail not displaying
|
2020-06-02 23:54:23 +09:00 |
|
Lucas A
|
275d95082a
|
Fix crash in testing environment.
|
2020-06-02 16:01:01 +02:00 |
|
Dean Herbert
|
a3e31adbf9
|
Merge pull request #9146 from peppy/taiko-editor
Implement osu!taiko editor
|
2020-06-02 21:49:20 +09:00 |
|
Dean Herbert
|
f965101d91
|
Merge pull request #9174 from peppy/update-framework
Update framework
|
2020-06-02 21:48:54 +09:00 |
|
Dean Herbert
|
61f906d9c4
|
Fix span piece being incorrect in some drag scenarios
|
2020-06-02 21:02:09 +09:00 |
|
Dan Balasescu
|
427dbf7f58
|
Merge branch 'master' into update-framework
|
2020-06-02 20:54:50 +09:00 |
|
Lucas A
|
f63c66396f
|
Apply review suggestions.
|
2020-06-02 13:32:52 +02:00 |
|
Dean Herbert
|
ed5f41ec23
|
Merge pull request #9092 from omkelderman/arbitrary-tourney-size
Add custom resolution set option to tournament client
|
2020-06-02 20:19:49 +09:00 |
|
Dean Herbert
|
c8b53b6e45
|
Merge branch 'master' into arbitrary-tourney-size
|
2020-06-02 19:30:36 +09:00 |
|
Dean Herbert
|
78fddc8957
|
Make button match height
|
2020-06-02 19:29:59 +09:00 |
|
Dean Herbert
|
828180ad9b
|
Add default
|
2020-06-02 19:29:22 +09:00 |
|
Dean Herbert
|
665530f1c3
|
Remove excess newline
|
2020-06-02 17:22:59 +09:00 |
|
Dean Herbert
|
b58c22c36e
|
Merge branch 'master' into taiko-editor
|
2020-06-02 17:22:40 +09:00 |
|
Dean Herbert
|
b100fc7fc7
|
Merge pull request #8632 from frenzibyte/fix-draining-in-between-break-sections
Disallow HP draining in non-play sections
|
2020-06-02 16:53:00 +09:00 |
|
Dean Herbert
|
64550fe87c
|
Merge branch 'master' into fix-draining-in-between-break-sections
|
2020-06-02 16:06:08 +09:00 |
|
Dean Herbert
|
70c84811ed
|
Revert incorrect change
|
2020-06-02 15:50:36 +09:00 |
|
Dean Herbert
|
1b94048956
|
Merge branch 'replace-use-of-current-directory' into update-framework
|
2020-06-02 14:55:28 +09:00 |
|
Dean Herbert
|
6c8c95677f
|
Fix incorrect usage of Directory.GetFiles
|
2020-06-02 14:55:10 +09:00 |
|
Dean Herbert
|
800c46f752
|
Fix test function override
|
2020-06-02 14:39:15 +09:00 |
|
Dean Herbert
|
c59d750420
|
Merge branch 'replace-use-of-current-directory' into update-framework
|
2020-06-02 14:31:09 +09:00 |
|
Dean Herbert
|
90f9905ed0
|
Update resourcse
|
2020-06-02 14:29:17 +09:00 |
|
Dean Herbert
|
46a209540e
|
Update framework
|
2020-06-02 14:28:48 +09:00 |
|
Lucas A
|
e9b09373e7
|
Fix crashing if selected ruleset doesn't have an autoplay mod.
|
2020-06-01 17:41:04 +02:00 |
|
Dean Herbert
|
00024f56fa
|
Merge pull request #9165 from ppy/dependabot/nuget/DiffPlex-1.6.3
Bump DiffPlex from 1.6.2 to 1.6.3
|
2020-06-01 18:50:20 +09:00 |
|
dependabot-preview[bot]
|
fbd9ad411f
|
Bump DiffPlex from 1.6.2 to 1.6.3
Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/mmanela/diffplex/releases)
- [Commits](https://github.com/mmanela/diffplex/commits)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-06-01 09:05:46 +00:00 |
|
Dan Balasescu
|
efbc02b521
|
Merge pull request #9161 from peppy/results-screen-horizontal-scroll
Allow horizontal scroll on results screen when not hovering expanded panel
|
2020-06-01 18:00:51 +09:00 |
|
Salman Ahmed
|
7a9ed78527
|
Remove missed leftover usages
|
2020-06-01 11:57:32 +03:00 |
|
Dan Balasescu
|
e8a25fea1a
|
Merge branch 'master' into results-screen-horizontal-scroll
|
2020-06-01 17:34:20 +09:00 |
|
Dan Balasescu
|
7437f81339
|
Merge branch 'master' into taiko-editor
|
2020-06-01 16:52:51 +09:00 |
|
Dan Balasescu
|
a8b137bb71
|
Merge pull request #9123 from peppy/move-setter-to-duration
Move setter from EndTime to Duration
|
2020-06-01 16:52:38 +09:00 |
|
Dan Balasescu
|
6b14f30028
|
Merge pull request #9143 from peppy/editor-create-composer-fix
Pass hitobjects as a parameter to CreateBlueprintContainer
|
2020-06-01 16:18:47 +09:00 |
|
Dan Balasescu
|
64d1b4b11b
|
Merge branch 'master' into move-setter-to-duration
|
2020-06-01 15:55:48 +09:00 |
|
Dean Herbert
|
780611a954
|
Merge branch 'master' into taiko-editor
|
2020-06-01 15:39:02 +09:00 |
|
Dean Herbert
|
b9464a2aa8
|
Merge branch 'master' into editor-create-composer-fix
|
2020-06-01 15:38:15 +09:00 |
|