1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:22:59 +08:00
Commit Graph

529 Commits

Author SHA1 Message Date
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary 2020-10-19 18:05:28 +09:00
Dean Herbert
e3b47083fc Add "scoring" as keyword to more easily find score display mode setting 2020-10-19 14:05:41 +09:00
Bartłomiej Dach
c867fb4985
Merge branch 'master' into update-check-improvements 2020-10-08 21:32:26 +02:00
Shane Woolcock
ec12a21088 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
2020-10-07 11:07:00 +10:30
Dean Herbert
b2dad67ade Fix unresolvable dependency in settings test scene 2020-10-06 21:28:59 +09:00
Dean Herbert
e8b34ba4ac
Fix incorrectly committed testing change 2020-10-06 20:57:39 +09:00
Dean Herbert
e64cee10b8 Add obsoleted Bindable property back to SettingsItem for compatibility 2020-10-06 19:07:31 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
22b0105d62 Show a notification if checking for updates via button and there are none available 2020-10-06 13:00:02 +09:00
Shane Woolcock
4b6f893408 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Screens/Play/Player.cs
2020-10-05 10:23:37 +10:30
Dean Herbert
61e62929ee Apply changes in line with framework event logic update 2020-10-01 13:06:01 +09:00
Dean Herbert
937d5870b3 Add a basic file selector with extension filtering support 2020-09-24 20:54:25 +09:00
smoogipoo
1a023d2c88 Fix a few more tests 2020-09-09 16:33:48 +09:00
smoogipoo
4ddf5f054b Rename BeatmapCollectionManager -> CollectionManager 2020-09-09 15:31:08 +09:00
smoogipoo
06328e0000 Add import/deletion progress notifications 2020-09-08 17:59:27 +09:00
smoogipoo
6cc4517600 Merge branch 'master' into collection-database 2020-09-07 20:03:11 +09:00
Yao Chung Hu
96f39dd350 Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary 2020-09-05 01:50:13 -05:00
smoogipoo
345fb9d8e0 Rename classes 2020-09-05 03:55:43 +09:00
Dean Herbert
ab057e6c65 Remove unnecessary string interpolation 2020-09-04 16:28:35 +09:00
Dean Herbert
644f3375ac Also catch exceptions in the construction call 2020-09-04 16:28:19 +09:00
Dean Herbert
a15653c77c Fix potential hard crash if ruleset settings fail to construct 2020-09-04 16:15:57 +09:00
Dean Herbert
f5a73130e1 Fix regression in sidebar button sizing 2020-09-03 16:34:58 +09:00
Dean Herbert
2fac0a180e Adjust toolbar button sizing 2020-09-03 16:34:58 +09:00
smoogipoo
a56f9d6770 Implement collection import 2020-09-03 00:08:33 +09:00
Dean Herbert
d45a1521a1 Update BindableList usages 2020-09-01 11:56:23 +09:00
Shane Woolcock
322d179076 Replace settings item with osu! confine cursor mode 2020-08-16 11:04:28 +09:30
Salman Ahmed
2190e6443a Apply height constraints to all settings dropdown 2020-08-01 10:02:46 +03:00
Dean Herbert
dfcd26be2d
Merge pull request #9439 from Game4all/gameplay-disable-winkey 2020-07-24 19:34:48 +09:00
Andrei Zavatski
81d95f8584 Implement UserBrickPanel component 2020-07-18 20:24:38 +03:00
Yao Chung Hu
d40f209f4b Move Playfield Border to OsuPlayfield Ruleset 2020-07-10 07:36:21 -05:00
Yao Chung Hu
321815f535 Add playfield bounds box with toggle and dim slider 2020-07-09 14:01:28 -05:00
Lucas A
022e4b6335 Apply review suggestions. 2020-07-06 11:15:56 +02:00
Lucas A
641ea5b950 Make the disabling of the win key during gameplay a toggleable setting. 2020-06-30 13:12:33 +02:00
Dean Herbert
97067976f7 Add null check 2020-06-15 22:23:06 +09:00
Dean Herbert
53b7057ee0 Don't show update button when updates are not feasible 2020-06-15 22:19:11 +09:00
Dean Herbert
4f809767a5 Disable button while update check is in progress 2020-06-12 18:36:36 +09:00
Craftplacer
101604e741 Redesign classes and generally improve code 2020-06-08 00:39:33 +02:00
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
f989f1aa00 Change event flow to avoid firing store delete events on update 2020-05-27 16:08:47 +09:00
Dean Herbert
8ab65e4c5d Move implementation into own class 2020-05-24 23:15:24 +09:00
Dean Herbert
c071fe6140 Add the ability to export skins 2020-05-24 13:44:11 +09:00
Dean Herbert
052ad79fc6 Convert dangerous events to IBindables 2020-05-19 16:44:22 +09:00
Dan Balasescu
533010f168
Merge branch 'master' into avoid-host-disable 2020-05-17 15:59:39 +09:00
Dean Herbert
9d3df14179 Remove unused variable 2020-05-16 11:03:27 +09:00
Dean Herbert
c47f02c3b7 Update second instance of disabling bindable 2020-05-16 08:24:02 +09:00
Dean Herbert
aec2520ef4 Avoid disabling a host-level bindable from osu! code 2020-05-15 17:31:06 +09:00
Dean Herbert
155e918ca3 Remove unused parameter 2020-05-14 21:40:28 +09:00
Dean Herbert
42f446faa9 Fix remaining test failure 2020-05-14 21:10:04 +09:00
Dean Herbert
a582611647 Add test coverage 2020-05-14 19:05:35 +09:00