1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 18:27:26 +08:00
Commit Graph

18494 Commits

Author SHA1 Message Date
Dean Herbert
72ada020a2 Don't attempt to use virtual track for intro sequence clock 2020-06-08 13:42:16 +09:00
Dan Balasescu
2ad5b2065f
Merge branch 'master' into better-reimport-support 2020-06-05 20:59:55 +09:00
Dean Herbert
5d1770dec8
Merge pull request #9212 from smoogipoo/fix-scorepanel-input
Fix score panel not receiving input in some places
2020-06-05 00:26:02 +09:00
Dean Herbert
bd2e4c50dd
Merge pull request #9211 from smoogipoo/change-date-format
Change format of date on score panel
2020-06-04 23:31:28 +09:00
smoogipoo
9c1542f897 Fix crash when pressing clear button twice 2020-06-04 22:17:00 +09:00
smoogipoo
afcefe01bf Fix score panel not receiving input in some places 2020-06-04 21:48:55 +09:00
smoogipoo
5d7bb8cb4e Change format of date on score panel 2020-06-04 21:33:38 +09:00
Dean Herbert
5ed3cd205f Simplify reuse check using FileInfo IDs 2020-06-03 23:35:56 +09:00
Dean Herbert
f6d9f0597b Add implicit join logic for multiplayer rooms 2020-06-03 21:28:29 +09:00
Dean Herbert
012933545e Add test coverage 2020-06-03 18:33:41 +09:00
Dean Herbert
c155ab8339 Check filenames and timestamps before reusing an already imported model 2020-06-03 18:03:10 +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
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
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
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
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
b58c22c36e Merge branch 'master' into taiko-editor 2020-06-02 17:22:40 +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
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
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
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
e8a25fea1a
Merge branch 'master' into results-screen-horizontal-scroll 2020-06-01 17:34:20 +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
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
Dean Herbert
1a427bf709
Merge pull request #9115 from peppy/i-has-curve-with-repeats
Split out IHasPath from IHasCurve to better define hitobjects
2020-06-01 15:37:38 +09:00
smoogipoo
cac6e93575 Restore original IHasCurve implementation 2020-06-01 15:11:58 +09:00
smoogipoo
53b58910c3 Invert interface definition 2020-06-01 14:27:39 +09:00
Dan Balasescu
fa830893d9
Merge branch 'master' into editor-documentation-hitobjectcomposer 2020-06-01 13:45:09 +09:00
Salman Ahmed
2c6887e610
Remove unnecessary use of and remove StartupStorage 2020-05-31 19:49:03 +03:00
Dean Herbert
a11910e675 Merge branch 'i-has-curve-with-repeats' into taiko-editor 2020-05-31 22:43:38 +09:00
Dean Herbert
d5c31f390b Merge branch 'move-setter-to-duration' into taiko-editor 2020-05-31 22:42:53 +09:00
Dean Herbert
189ad61daa Merge branch 'master' into taiko-editor 2020-05-31 22:42:34 +09:00
Dean Herbert
e688033967 Fix incorrect xmldoc 2020-05-31 22:39:03 +09:00
Dean Herbert
19be111da0
Move incorrect placed full stop
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-31 22:33:10 +09:00
Dean Herbert
81b8898272 Fix incorrect type cast in encoder 2020-05-31 22:30:55 +09:00
Dean Herbert
0ef971be28 Merge branch 'master' into i-has-curve-with-repeats 2020-05-31 22:30:18 +09:00