1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 02:47:26 +08:00
Commit Graph

104 Commits

Author SHA1 Message Date
Swords
d85f17159f Formatting 2021-05-15 11:25:56 +10:00
Swords
304caf8bdf Adding Requested changed 2021-05-15 11:24:08 +10:00
Swords
843da30f9d Reformatting 2021-05-15 01:52:16 +10:00
Swords
6a52622b3f Merge branch 'single-bind-reset-button' of https://github.com/holaswords/osu into single-bind-reset-button 2021-05-15 01:31:40 +10:00
Swords
1603b92211 Reformatting 2021-05-15 01:30:54 +10:00
Swords
85174793b1
Merge branch 'master' into single-bind-reset-button 2021-05-15 01:07:32 +10:00
Swords
753bdf2083 Fixed formatting 2021-05-15 01:04:15 +10:00
Swords
0725088fde Well it works, just pretty ugly looking. 2021-05-15 01:01:17 +10:00
Dean Herbert
1bb3c609ae Centralise implementation of cancel button logic 2021-05-11 18:39:14 +09:00
Ibby
075350e125 Adding a reset button to individual keybinds 2021-05-09 15:51:17 +10:00
Dean Herbert
afc745f999 Merge branch 'master' into rebind-song-select 2021-04-07 17:13:25 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
Dean Herbert
3062fe4411 Add editor key bindings to switch between screens 2020-09-22 15:55:25 +09:00
smoogipoo
435c9de8b9 Re-privatise buttons 2020-08-03 15:25:23 +09:00
Joehu
7aafc018ad Prevent updating bind target when hovering cancel and clear buttons instead 2020-08-02 12:52:12 -07:00
Joehu
ba77fa2945 Add test for clear button 2020-08-02 12:41:35 -07:00
Joehu
b96e32b0bb Add xmldoc for updateBindTarget 2020-08-02 12:26:09 -07:00
Joehu
a8991bb8bf Fix keybind clear button always clearing first keybind regardless of target 2020-07-20 20:13:09 -07:00
Jack Boswell
978380a7fb
Merge branch 'master' into rebind-song-select 2020-06-05 22:35:44 +12:00
smoogipoo
9c1542f897 Fix crash when pressing clear button twice 2020-06-04 22:17:00 +09:00
Jack Boswell (boswelja)
030b55ae85 Add a section to global keybind settings for song select 2020-06-03 17:55:15 +12:00
smoogipoo
738c6da594 Implement midi keybindings 2020-05-10 13:39:20 +09:00
Lucas A
801968ed51 Remove un-needed RelativeSizeAxes specifications. 2020-04-26 21:17:40 +02:00
Lucas A
a756486a4d Make settings section icons actual drawables. 2020-04-25 20:35:46 +02:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
Dean Herbert
8c29093d1c Merge remote-tracking branch 'smoogipoo/void-joystick-release-returns' into update-framework 2020-01-22 22:58:00 +09:00
Dean Herbert
8a7f7c5e46 Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework 2020-01-22 22:57:56 +09:00
smoogipoo
b62e3addf3 Apply input method signature refactorings 2020-01-20 20:30:25 +09:00
smoogipoo
40f502c6d1 Apply input method signature refactorings 2020-01-20 19:35:37 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
Dean Herbert
666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
Dean Herbert
a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
EVAST9919
d6d5bb5ecf remove useless nullcheck 2019-02-03 17:20:35 +03:00
EVAST9919
eeecbfcbe0 Fix warnings 2019-02-03 17:09:04 +03:00
EVAST9919
4b17ca0857 Fix wrong icons 2019-02-03 14:50:03 +03:00