1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 13:47:38 +08:00
Commit Graph

37674 Commits

Author SHA1 Message Date
Dean Herbert
a9c4fa442a Avoid potential crash if an overlay is toggled before it has been loaded 2021-03-19 16:49:09 +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
Dean Herbert
bf4317d3f0 Ensure looping is disabled on old samples when switching skins 2021-03-19 15:34:21 +09:00
Dean Herbert
0e821e857e Remove unnecessary duplicated skin changed handling
For some reason we were handling this both in `DrawableSkinnableSound`
and `PoolableSkinnableSample` in very similar ways. Only one seems
required.
2021-03-19 15:23:32 +09:00
Dean Herbert
5f31304d05 Give each type of slider path type a unique colour to help visually distinguish them 2021-03-19 14:00:26 +09:00
voidedWarranties
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
Bartłomiej Dach
b419d2c2e2 Fix invalid xmldoc indent 2021-03-18 19:52:38 +01:00
Bartłomiej Dach
aec859b4d1 Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-18 19:51:46 +01:00
Dan Balasescu
68b67e6e98
Merge pull request #12006 from peppy/input-handler-configuration
Consume framework updates to input handling
2021-03-18 22:58:51 +09: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
Dean Herbert
d09ad85c71
Merge pull request #12060 from smoogipoo/fix-converted-mania-score-accuracy 2021-03-18 21:09:29 +09:00
Dean Herbert
e94644d7ee
Merge pull request #12012 from bdach/taiko-explosion-pooling 2021-03-18 21:09:09 +09:00
Dan Balasescu
f01ece8c8d
Merge branch 'master' into taiko-explosion-pooling 2021-03-18 19:43:42 +09:00
smoogipoo
0c3c8141da Remove Expires and RemoveWhenNotAlive override 2021-03-18 19:39:42 +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
Dan Balasescu
0c272ce432
Merge pull request #12044 from Joehuu/update-profile-kudosu-section
Update kudosu section on user profile overlay in line with web
2021-03-18 13:28:45 +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
21e18c9f6e Fix test hangs in browser due to changing tracks via music controller 2021-03-17 18:46:22 +01:00
Bartłomiej Dach
3b55eeb416 Fix test failure by setting beatmap
Post-merge, it was failing because somewhere along the way
`EditorClockTestScene` started expecting inheritors to set the beatmap
themselves explicitly in BDL.
2021-03-17 18:39:48 +01:00
Bartłomiej Dach
f1e66cc420 Adjust test namespace 2021-03-17 18:37:11 +01:00
Bartłomiej Dach
a691291ae8 Merge branch 'master' into editor-song-end 2021-03-17 18:18:19 +01:00
Bartłomiej Dach
3bfde7341f Revert "Remove unnecessary overrides"
This reverts commit f4e508b570.
2021-03-17 17:14:53 +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
Nathan Alo
51e0304c54 properly format strings per ruleset 2021-03-17 18:31:09 +08:00
smoogipoo
e59b8b4ce6 Fix test checking nullable string 2021-03-17 19:07:29 +09:00
Nathan Alo
133ff085a5 refactor code 2021-03-17 18:06:40 +08:00
smoogipoo
f7ec79c5f4 Fix incorrect generic type 2021-03-17 19:02:25 +09:00
Nathan Alo
8046b5a818 set text to platform clipboard on copy 2021-03-17 17:35:49 +08:00
Dean Herbert
4bf57ad860 Remove remaining reference to obsolete value 2021-03-17 18:24:24 +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
79041c1c4b Remove osuTK reference 2021-03-17 18:07:42 +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
822d469b2c
Merge pull request #12024 from peppy/fix-editor-startup-threading-crash 2021-03-17 18:02:48 +09:00
Dean Herbert
d0e61e5b4d Put back the label 2021-03-17 17:14:04 +09:00