1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:42:54 +08:00
Commit Graph

33847 Commits

Author SHA1 Message Date
Bartłomiej Dach
e078b78dcc Ensure callbacks don't fire when restoring default beatmap 2020-11-07 20:59:57 +01:00
Dean Herbert
16f55de495
Merge pull request #10724 from nbvdkamp/fix-slider-quickdelete-crash
Fix nullref when quickdeleting slider that hasn't been selected yet
2020-11-07 19:31:32 +09:00
kamp
42c543472d Remove unnecessary null coalesce 2020-11-07 01:56:41 +01:00
kamp
b47a2a03d5 Fix nullref when quickdeleting slider that hasn't been selected yet 2020-11-07 01:53:14 +01:00
Dean Herbert
84e090583d
Merge pull request #10712 from peppy/move-cache-logic-to-base-impl
Move cache and lookup logic to base MemoryCachingComponent class
2020-11-07 00:06:43 +09:00
Dean Herbert
c878bf2876
Merge pull request #10679 from peppy/editor-slider-control-point-quick-delete
Add the ability to delete slider control points using shift+right click
2020-11-07 00:05:58 +09:00
Dan Balasescu
f230250faf
Merge branch 'master' into editor-slider-control-point-quick-delete 2020-11-06 21:47:37 +09:00
Dan Balasescu
0df1625b0e
Merge pull request #10714 from peppy/dont-disable-pause-button
Never disable pause button on now playing overlay
2020-11-06 21:44:22 +09:00
Dan Balasescu
36d2169038
Merge branch 'master' into move-cache-logic-to-base-impl 2020-11-06 21:37:16 +09:00
Dan Balasescu
cf9acca78a
Merge pull request #10676 from peppy/fix-hitcircle-glow-on-skin-change
Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece
2020-11-06 21:09:22 +09:00
Dean Herbert
1ca8b03aa5 Never disable pause button on now playing overlay 2020-11-06 17:26:23 +09:00
Dean Herbert
c1c3d37720 Remove non-null assert 2020-11-06 17:24:28 +09:00
Dean Herbert
d66ac33032
Merge pull request #10701 from peppy/add-spinner-clear 2020-11-06 17:04:53 +09:00
Dean Herbert
f51cb0dd14 Add ruleset fallback logic into cache lookup class 2020-11-06 16:58:53 +09:00
Dean Herbert
d3a303e251 Use CheckExists function 2020-11-06 16:57:09 +09:00
Dean Herbert
9bb32f0914 Merge branch 'master' into move-cache-logic-to-base-impl 2020-11-06 16:56:35 +09:00
Dean Herbert
e0ef777e87
Merge branch 'master' into fix-hitcircle-glow-on-skin-change 2020-11-06 16:47:56 +09:00
Dan Balasescu
5d7fa42d90
Merge branch 'master' into add-spinner-clear 2020-11-06 16:14:15 +09:00
Dan Balasescu
ca94d93d29
Merge pull request #10700 from peppy/add-spinner-spin
Add support for spinner "spin" text in legacy skins
2020-11-06 16:13:44 +09:00
Dan Balasescu
44c6457c85
Merge branch 'master' into add-spinner-spin 2020-11-06 15:40:40 +09:00
Dan Balasescu
50c4e4ec38
Merge pull request #10697 from peppy/add-spinner-glow
Add support for spinner "glow" in legacy skins
2020-11-06 15:38:24 +09:00
Dean Herbert
c5b172d0dd Remove synchronous lookup path from BeatmapDifficultyCache 2020-11-06 14:53:15 +09:00
Dan Balasescu
41dc3a7abd
Merge branch 'master' into add-spinner-glow 2020-11-06 14:37:54 +09:00
Dan Balasescu
972fc54c2d
Merge pull request #10710 from peppy/user-id-as-int
Use int instead of long for user_id fields for now
2020-11-06 14:35:14 +09:00
Dean Herbert
1dcbf15d81
Merge branch 'master' into move-cache-logic-to-base-impl 2020-11-06 14:35:06 +09:00
Dan Balasescu
9ec5f9bff8
Merge pull request #10711 from peppy/rename-cache-classes
Rename cache classes in line with their function (and share a base implementation)
2020-11-06 14:34:47 +09:00
Dan Balasescu
d0be5e8983
Merge pull request #10685 from peppy/drawable-hit-object-hit-state-fix
Add new method handling hit state specifically
2020-11-06 14:33:47 +09:00
Dean Herbert
b69ada64e8 Update BeatmapDifficultyCache to use base implementation logic 2020-11-06 14:31:21 +09:00
Dean Herbert
a2606d31c7 Move lookup/storage/compute logic to base class (and consume in ScorePerformanceCache) 2020-11-06 13:51:41 +09:00
Dean Herbert
517a656899 Move StarDifficulty to own file 2020-11-06 13:51:25 +09:00
Dean Herbert
74ca2faa31 Remove unused using 2020-11-06 13:48:06 +09:00
Dean Herbert
07166ec819 Fix a couple of remaining unnecessary casts 2020-11-06 13:29:47 +09:00
Dean Herbert
0103b12575 Add basic base class to begin to standardise function across caching components 2020-11-06 13:26:39 +09:00
Dan Balasescu
71a1165209
Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-06 13:19:25 +09:00
Dean Herbert
14bb079feb Rename ScorePerformanceManager to ScorePerformanceCache 2020-11-06 13:15:33 +09:00
Dean Herbert
5113d4af8f Rename BeatmapDifficultyManager to BeatmapDifficultyCache 2020-11-06 13:14:29 +09:00
Dean Herbert
1e1569eb53 Use int instead of long for user_id fields for now 2020-11-06 12:59:46 +09:00
Dean Herbert
3e652fdf9c
Merge pull request #10702 from peppy/update-framework
Update framework
2020-11-05 23:24:26 +09:00
Dean Herbert
d774afd224 Update framework 2020-11-05 22:29:44 +09:00
Dean Herbert
309b1d6334
Merge pull request #10695 from peppy/fix-skinnable-test-scene
Fix SkinnableTestScene's autosize propagation
2020-11-05 20:48:36 +09:00
Dean Herbert
d7a912a0d2 Match stable's transform 1:1 2020-11-05 19:44:34 +09:00
Dean Herbert
71253cb5e9 Add support for spinner "clear" text in legacy skins 2020-11-05 19:35:32 +09:00
Dean Herbert
5e387e92cd Add positional offset to avoid the SPM counter 2020-11-05 19:16:47 +09:00
Dean Herbert
901102918e Centralise scale and apply to SPIN text 2020-11-05 19:05:59 +09:00
Dean Herbert
a0b3379909 Fix judgement offsets being zero when windows are empty 2020-11-05 18:58:37 +09:00
Dean Herbert
3ec813da03 Add "spin" sprite 2020-11-05 18:48:47 +09:00
Dean Herbert
2bbdbfda5c
Merge pull request #10696 from smoogipoo/visibility-adjustment-mod 2020-11-05 18:18:57 +09:00
Dean Herbert
5ec6011340 Apply new style spinner scale to only local sprites 2020-11-05 18:14:49 +09:00
Dean Herbert
11c18952e3 Allow children to be added in base class 2020-11-05 18:12:06 +09:00
Dean Herbert
64e3325b41 Abstract out common part of legacy spinner implementations
Some elements going forward will be shared, so it makes sense to have a
common base class to add these shared elements.
2020-11-05 18:00:27 +09:00