1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:47:24 +08:00
Commit Graph

34118 Commits

Author SHA1 Message Date
smoogipoo
508ae91a97 Revert unnecessary change 2020-11-11 12:54:36 +09:00
smoogipoo
626231d906 Completely remove check as it can occur for hits too 2020-11-11 12:53:32 +09:00
smoogipoo
1173ef0890 Fix mania notelock crashing with overlapping hitwindows 2020-11-11 12:37:00 +09:00
Dean Herbert
9caa56c64f Display skin changes via on-screen display overlay 2020-11-11 12:19:01 +09:00
Dean Herbert
6674628bc7 Only include user skins in random choices 2020-11-11 12:03:38 +09:00
Dean Herbert
6b548ef5e4 Split out SkinInfo ID constants and fix random logic 2020-11-11 11:54:40 +09:00
Dean Herbert
6593aac3f2
Merge pull request #7762 from EVAST9919/history-graph 2020-11-11 11:35:34 +09:00
Dean Herbert
a5e13e4d2c Merge branch 'master' into shuffle-skin 2020-11-11 11:34:48 +09:00
Dan Balasescu
451f0a29c6
Merge pull request #10784 from peppy/fix-best-performance-weighting
Fix user profile best performance weighting being out of order
2020-11-11 11:21:43 +09:00
Dean Herbert
a82291f31f
Merge pull request #10776 from smoogipoo/fix-possible-nullref
Fix possible nullref with non-attached hitobjects
2020-11-11 11:14:57 +09:00
Dean Herbert
89c4e3d3b2
Merge branch 'master' into history-graph 2020-11-11 11:01:48 +09:00
Dean Herbert
8706b51b77
Merge pull request #10717 from smoogipoo/dho-apply 2020-11-11 10:54:24 +09:00
Dean Herbert
53c968e137 Fix user profile best performance weighting being out of order 2020-11-11 10:19:59 +09:00
Dean Herbert
390f7644d4
Merge pull request #10782 from bdach/bandaid-editor-timing-point-crash
Temporarily fix crash on deleting control point groups
2020-11-11 09:22:40 +09:00
Andrei Zavatski
6c428d8b11 Merge master with conflicts resolved 2020-11-11 01:37:01 +03:00
Bartłomiej Dach
546249b071 Temporarily fix crash on deleting control point groups 2020-11-10 21:32:47 +01:00
smoogipoo
81844878b0 Fix possible nullref with non-attached hitobjects 2020-11-11 00:29:34 +09:00
smoogipoo
b725c9cce9 Fix possible nullrefs 2020-11-11 00:24:28 +09:00
smoogipoo
e525784cb2 Clear lifetimeEntry after use 2020-11-11 00:24:14 +09:00
smoogipoo
99e5450af3 Cache DrawableRuleset 2020-11-11 00:22:36 +09:00
smoogipoo
66213f2ed0 Add pooling support to DrawableRuleset + Playfield 2020-11-10 23:56:32 +09:00
Bartłomiej Dach
be4735cd2b Explicitly set lifetime to ensure empty drawables are cleaned up 2020-11-10 14:57:51 +01:00
smoogipoo
31e4d71852 Rewrite HitObjectContainer with pooling support 2020-11-10 22:49:02 +09:00
smoogipoo
5354ef1699 Merge branch 'dho-apply' into hitobject-pooling-base 2020-11-10 22:30:08 +09:00
Bartłomiej Dach
0387d994bd Do not lookup default kiai explosion if skin has own 2020-11-10 14:18:43 +01:00
Bartłomiej Dach
35763a74fd Add test scene 2020-11-10 14:08:13 +01:00
Bartłomiej Dach
ed01d37966 Reintroduce KiaiHitExplosion as skinnable 2020-11-10 14:08:10 +01:00
smoogipoo
4ea823e4dc Fix test failures 2020-11-10 22:02:33 +09:00
Bartłomiej Dach
8788ef74aa
Merge pull request #10770 from cadon0/fix-storyboard-sprite-paths
Fix crashes if animation sprite path does not match a file
2020-11-10 13:32:19 +01:00
Bartłomiej Dach
f245696947 Move {-> Default}KiaiHitExplosion 2020-11-10 13:24:32 +01:00
Bartłomiej Dach
20f9759a2e
Merge branch 'master' into fix-storyboard-sprite-paths 2020-11-10 12:57:10 +01:00
Bartłomiej Dach
9b3f7e8d5c
Merge pull request #10760 from peppy/fix-profile-graph-crash
Fix crash and edge cases of user profile graph implementation
2020-11-10 12:56:48 +01:00
Dean Herbert
e1dcac4d8b Update framework 2020-11-10 20:29:29 +09:00
Bartłomiej Dach
61093030ee Remove redundant class name qualifier 2020-11-10 12:20:49 +01:00
Bartłomiej Dach
ce837eaba0 Rename variables 2020-11-10 12:20:26 +01:00
Bartłomiej Dach
dd873dbd85
Merge branch 'master' into fix-profile-graph-crash 2020-11-10 12:17:12 +01:00
smoogipoo
6f3f6dc28b Add hitobject lifetime support 2020-11-10 20:16:52 +09:00
cadon0
539806e9d6 Rewrite - Add empty drawable whenever sprite not found 2020-11-10 23:52:37 +13:00
cadon0
6446074976 Fix paths for storyboard animation sprites 2020-11-10 23:52:37 +13:00
smoogipoo
45e9f16f6b Add initial DrawableRuleset interface 2020-11-10 19:27:08 +09:00
smoogipoo
757a4b5c31 Add hitobject lifetime model 2020-11-10 19:26:01 +09:00
smoogipoo
88112801eb Remove result storage from hitobject 2020-11-10 18:56:16 +09:00
Dan Balasescu
ef1036cef1
Merge pull request #10767 from peppy/fix-editor-crash-on-two-mouse-button-click
Fix BlueprintContainer triggering assert when left and right mouse button are pressed together
2020-11-10 18:41:58 +09:00
Dan Balasescu
d873229120
Merge pull request #10769 from peppy/fix-mod-select-keys-handle-control
Stop mod select overlay hotkeys handling input when control is pressed
2020-11-10 18:37:14 +09:00
smoogipoo
f5076fe3b8 Revert unnecessary change 2020-11-10 18:15:11 +09:00
Dan Balasescu
4e3f6f19f4
Merge pull request #10768 from bdach/force-import-standardised
Always store standardised score when populating ScoreInfo
2020-11-10 18:12:35 +09:00
Dean Herbert
833c0b223e Clamp index to valid bounds 2020-11-10 18:08:12 +09:00
Dean Herbert
2e3dc6fc46 Merge branch 'master' into fix-profile-graph-crash 2020-11-10 18:06:51 +09:00
Dean Herbert
28daff1716 Stop mod select overlay hotkeys handling input when control is pressed
Closes https://github.com/ppy/osu/issues/10766 in about the best way we
can for now.
2020-11-10 17:57:59 +09:00
Dan Balasescu
601cc477e5
Merge branch 'master' into fix-editor-crash-on-two-mouse-button-click 2020-11-10 17:42:25 +09:00