1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 03:42:53 +08:00
Commit Graph

23593 Commits

Author SHA1 Message Date
Dean Herbert
03592fa696 Merge branch 'master' into realm-migration-operation-blocking 2021-03-19 21:33:26 +09:00
Dan Balasescu
0736679016
Merge pull request #12072 from peppy/include-default-skin-in-random-rotation
Include the bundled skins when selecting a random skin
2021-03-19 19:08:42 +09:00
Dean Herbert
32c571fc94 Adjust keyboard step to be something sensible 2021-03-19 17:13:30 +09:00
Dean Herbert
0195d654ca Increase the precision of speed multiplier to match osu-stable 2021-03-19 17:09:49 +09:00
Dean Herbert
711d895a04
Merge pull request #8238 from voidedWarranties/editor-song-end 2021-03-19 16:32:23 +09:00
Dean Herbert
9491e6394a Include the bundled skins when selecting a random skin 2021-03-19 15:46:43 +09:00
voidedWarranties
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
Dan Balasescu
d9ec3c327e
Merge branch 'master' into input-handler-configuration 2021-03-18 22:17:48 +09:00
Dean Herbert
a8cc3a3b44 Implement enable state changes locally for InputHandlers which should be toggleable 2021-03-18 21:17:04 +09:00
Dean Herbert
c694deb7d6 Revert changes to SettingsSourceAttribute class 2021-03-18 21:16:50 +09:00
smoogipoo
917717686a Expand explanatory comment 2021-03-18 19:26:29 +09:00
smoogipoo
b68dc686ee Fix converted mania scores not accounting for GREATs 2021-03-18 19:19:53 +09:00
Dan Balasescu
53ae24db9b
Merge pull request #12058 from peppy/fix-whitespace-in-ini
Fix skin parser not stripping whitespace before parsing
2021-03-18 18:46:28 +09:00
Dean Herbert
5b0d75ee56 Only trim trailing spaces to avoid breakage in storyboard parsing 2021-03-18 16:30:30 +09:00
Dean Herbert
bb3c3f302a Fix skin parser not stripping whitespace before parsing 2021-03-18 15:36:11 +09:00
Dan Balasescu
b3e96c8385
Merge pull request #12043 from bdach/fix-reverse-crash
Fix selection box operation hotkeys not registering in change handler
2021-03-18 13:30:33 +09:00
voidedWarranties
df6570ebf5 Improve logic and add previously failing test
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-17 15:48:55 -07:00
Bartłomiej Dach
f95ce90c95 Adjust kudosu count formatting 2021-03-17 23:32:08 +01:00
Joehu
08ffe425f9 Update kudosu description color in line with web 2021-03-17 14:46:23 -07:00
Bartłomiej Dach
2e63c2ce20 Fix selection box operation hotkeys not registering in change handler
Could lead to crashes after reversing a note cluster and playing it
back.

The root cause of the crash was that the hotkey operations were not ran
inside of an editor change handler operation. This, in turn, caused the
autoplay replay to not be regenerated after flipping an object cluster,
therefore finally manifesting as a hard crash due to negative time
offsets appearing in judgement results, which interfered with the
default implementation of note lock.

Note that this incidentally also fixes the fact that selection box
hotkey operations (reverse and flip) did not handle undo/redo.
2021-03-17 22:17:42 +01:00
Joehu
599c55fca5 Update total kudosu earned description text in line with web 2021-03-17 13:22:00 -07:00
Joehu
6cea74f0fa Remove available kudosu section from user profile overlay in line with web 2021-03-17 13:21:41 -07:00
Bartłomiej Dach
a691291ae8 Merge branch 'master' into editor-song-end 2021-03-17 18:18:19 +01:00
Dan Balasescu
5a7e416495
Merge pull request #12027 from peppy/new-beatmap-empty-fields
Don't fill beatmap metadata with template values on creating a new beatmap
2021-03-17 19:36:21 +09:00
Dean Herbert
e0c0107461 Merge branch 'update-config-usages' into input-handler-configuration 2021-03-17 18:08:13 +09:00
Dean Herbert
fccd495f27 Remove obsoleted setting for now 2021-03-17 18:07:51 +09:00
Dean Herbert
577d40d8d1 Update framework 2021-03-17 18:05:18 +09:00
Dean Herbert
249ab8ab3d Merge branch 'master' into input-handler-configuration 2021-03-17 18:05:14 +09:00
Dean Herbert
a1a0074c32 Revert "Local framework"
This reverts commit b9b095ee75.
2021-03-17 18:05:11 +09:00
Dean Herbert
d0e61e5b4d Put back the label 2021-03-17 17:14:04 +09:00
Dean Herbert
3b6a1180b6 Remove non-accessed field 2021-03-17 17:02:11 +09:00
Dean Herbert
5adc675862 Focus artist textbox on entering song setup if fields are empty 2021-03-17 16:57:14 +09:00
Dean Herbert
26d6f96c4e Fix LabelledTextBox not correctly forwarding focus to its underlying TextBox component 2021-03-17 16:56:58 +09:00
Dean Herbert
eda891223c Start the editor with empty artist/creator/difficulty name fields 2021-03-17 16:47:12 +09:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dean Herbert
c7740d1181 Fix opening the editor occasionally causing a hard crash due to incorrect threading logic
Setting one of the global screen `Bindable`s (in this case, `Beatmap`)
is not valid from anywhere but the update thread. This changes the order
in which things happen during the editor startup process to ensure
correctness.

Closes #11968.
2021-03-17 15:52:25 +09:00
smoogipoo
b495504cae Merge branch 'master' into fix-mouse-disable-default-indicator 2021-03-16 10:58:56 +09:00
smoogipoo
da3dc61aae Remove newline 2021-03-16 10:58:42 +09:00
Joehu
393f1fbd3f Remove skype 2021-03-15 10:07:50 -07:00
Dean Herbert
f3faad74d5
Merge pull request #12003 from UselessToucan/ef_core_5 2021-03-15 15:05:32 +09:00
Joehu
3dd72d6f7d Fix disable mouse buttons setting not showing default indicator when using keybind 2021-03-14 22:47:05 -07:00
Dean Herbert
1e519f0d31 Fix seemingly innocent logic change causing breakage in score imports 2021-03-15 14:20:59 +09:00
Dean Herbert
6d4c1ba2ae Fix a couple of new inspections introduced in Rider EAPs 2021-03-15 13:35:08 +09:00
Dean Herbert
fce21f23d6 Add comments marking workarounds required for EFcore 5 2021-03-15 13:29:26 +09:00
Dean Herbert
2904f479c6 Share file lookup workaround in ArchiveModelManager with workaround extensions class 2021-03-15 13:26:14 +09:00
Dean Herbert
79d3379f55 Reformat application of configuration 2021-03-15 13:20:22 +09:00
Dean Herbert
8a35533889 Add fall-through case to catch a potential requery for unsupported model type 2021-03-15 13:11:58 +09:00
Dean Herbert
2bdffd1004 Move skin requery logic into extension methods 2021-03-15 13:11:58 +09:00
Dean Herbert
900da7b891 Rename and refactor extenion methods to be easier to read 2021-03-15 13:11:58 +09:00
Roman Kapustin
28ef64b62a Explicitly specify SingleQuery behavior 2021-03-14 21:43:27 +03:00