Craftplacer
|
e95ffcb528
|
Merge remote-tracking branch 'upstream/master' into update-button
|
2020-06-07 22:51:03 +02:00 |
|
Craftplacer
|
4e56981554
|
Merge remote-tracking branch 'upstream/master' into update-button
# Conflicts:
# osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
|
2020-06-07 22:43:53 +02:00 |
|
Dean Herbert
|
36d318d4dc
|
Merge pull request #9188 from bdach/contributing-guidelines
Add contributing guidelines
|
2020-06-07 21:48:04 +09:00 |
|
Dean Herbert
|
c3036c1d45
|
Merge pull request #9197 from peppy/better-reimport-support
Check all files match before using an existing archive model
|
2020-06-05 22:02:36 +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 |
|
Dean Herbert
|
2ec7059ac4
|
Merge pull request #9213 from smoogipoo/fix-keybinding-crash
Fix crash when double-clicking clear binding button
|
2020-06-04 23:31:02 +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 |
|
Bartłomiej Dach
|
af3daaaeaf
|
Add reference to contributing guidelines in README
|
2020-06-03 23:44:02 +02:00 |
|
Bartłomiej Dach
|
ddf5282d0e
|
Move items from README.md to contributing guidelines
|
2020-06-03 23:44:02 +02:00 |
|
Bartłomiej Dach
|
c2fd2b8616
|
Add notes about draft PRs & pushing
|
2020-06-03 23:43:32 +02:00 |
|
Bartłomiej Dach
|
8529486a5c
|
Merge branch 'master' into contributing-guidelines
|
2020-06-03 23:09:35 +02:00 |
|
Dean Herbert
|
66ec2afe5c
|
Remove broken import test
|
2020-06-03 23:38:40 +09:00 |
|
Dean Herbert
|
5ed3cd205f
|
Simplify reuse check using FileInfo IDs
|
2020-06-03 23:35:56 +09: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
|
25160dc220
|
Fix test name
|
2020-06-03 19:15:52 +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
|
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 |
|
Bartłomiej Dach
|
74875f9b62
|
Apply review suggestions & other cleanups
|
2020-06-03 06:47:10 +02: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 |
|
Bartłomiej Dach
|
40e64eed47
|
Add contributing guidelines
|
2020-06-02 23:15:14 +02: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 |
|