1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 14:22:55 +08:00
Commit Graph

29611 Commits

Author SHA1 Message Date
Jack Boswell
c331575cd0
Merge branch 'master' into rebind-song-select 2020-06-07 20:31:26 +12:00
Jack Boswell (boswelja)
8b7718116d Add missing blank lines 2020-06-07 16:06:18 +12:00
Jack Boswell (boswelja)
7c04e9aca4 Move new GlobalAction keybinding entries to the end of the class.
The new keybindings shouldn't mess with existing bindings anymore
2020-06-07 15:37:19 +12:00
Jack Boswell (boswelja)
0e155c8eb9 Don't switch FooterButtonRandon Action on pressed.
Instead, create a new Action that invokes either NextRandom or PreviousRandom, depending on rewindSearch
2020-06-07 15:34:19 +12: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
Jack Boswell
978380a7fb
Merge branch 'master' into rebind-song-select 2020-06-05 22:35:44 +12: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
Jack Boswell (boswelja)
a40475e6aa Remove triggerNextRandom from SongSelect 2020-06-04 21:09:47 +12:00
Jack Boswell (boswelja)
cb6e473910 Remove triggerPreviousRandom from SongSelect 2020-06-04 21:08:07 +12:00
Jack Boswell (boswelja)
cab132673a Break FooterButtonRandom creation into multiple lines 2020-06-04 21:03:10 +12:00
Jack Boswell (boswelja)
8533d7573d Rename FooterButtonRandom actions to better describe what they are used for 2020-06-04 21:00:29 +12:00
Jack Boswell (boswelja)
62984cb7f5 Remove unused Hotkey assignment 2020-06-04 20:58:53 +12:00
Jack Boswell (boswelja)
df148cf9d1 Rename secondaryAction to rewindSearch 2020-06-04 20:58:19 +12:00
Jack Boswell (boswelja)
bd3e40a8cf Move default return out of switch/case 2020-06-04 20:57:24 +12:00
Jack Boswell
1cf4e7f654
Merge branch 'master' into rebind-song-select 2020-06-04 18:17:38 +12:00
Jack Boswell (boswelja)
a78a8c0d0d Add missing blank lines 2020-06-04 16:59:04 +12:00
Jack Boswell (boswelja)
7141bed78d Remove redundant directive from FooterButton 2020-06-04 16:40:16 +12:00
Jack Boswell (boswelja)
eb242085c6 Remove redundant interface from FooterButtonMods 2020-06-04 16:24:32 +12:00
Jack Boswell (boswelja)
aeb736e9d2 Fix CodeFactor code style issues 2020-06-04 16:13:50 +12:00
Jack Boswell (boswelja)
aa08847bc9 Set FooterButtonRandom actions properly when creating the button 2020-06-04 16:08:16 +12:00
Jack Boswell (boswelja)
568503ef99 Update FooterButtonRandom to comply with the changes in FooterButton
FooterButtonRandom now has 2 Action variables, one for both primary and secondary
2020-06-04 16:07:50 +12:00
Jack Boswell (boswelja)
05e4499bc1 Update FooterButtonOptions to comply with the changes in FooterButton 2020-06-04 15:25:18 +12:00
Jack Boswell (boswelja)
18db31b504 Update FooterButtonMods to comply with the changes in FooterButton 2020-06-04 15:25:05 +12:00
Jack Boswell (boswelja)
782fddb6f1 Modify FooterButton to implement IKeyBindingHandler for responding to hotkeys 2020-06-04 15:21:13 +12: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
Jack Boswell (boswelja)
55953b9e85 Add a keybinding for selecting the previous random beatmap
Also gave the new actions more meaningful names
2020-06-03 18:13:18 +12:00
Jack Boswell (boswelja)
030b55ae85 Add a section to global keybind settings for song select 2020-06-03 17:55:15 +12: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