1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Commit Graph

37963 Commits

Author SHA1 Message Date
Dean Herbert
a8839792fd
Merge branch 'master' into circular-arc-freeze 2021-04-08 14:33:03 +09:00
Naxess
d6490899e2 Simplify slider path bindings
Adds a slight performance overhead, but solves the memory leak and makes the code much easier to follow.
2021-04-08 03:21:56 +02:00
Naxess
d1d56c636a Convert pathTypes to local variable
Not entirely sure what holds the reference to pathTypes now (the binding to`slider.Path.ControlPoints` maybe?), but this does seem to work still.
2021-04-08 01:43:06 +02:00
Naxess
b8ab1c7682 Track path type changes for PointsInSegment 2021-04-07 17:19:12 +02:00
Naxess
9d02930709 Add regression test for type changes 2021-04-07 17:18:55 +02:00
Dean Herbert
bdd58103ac
Merge pull request #12320 from smoogipoo/apply-screen-suspension-changes
Apply changes to AllowScreenSuspension bindable
2021-04-07 23:52:18 +09:00
Dean Herbert
544fff5af6 Undo rider EAP changes for the time being 2021-04-07 23:18:45 +09:00
Dean Herbert
8cc1e8b8b0 Update framework 2021-04-07 23:11:01 +09:00
smoogipoo
1f4c17b8f8 Apply changes to AllowScreenSuspension bindable 2021-04-07 21:20:44 +09:00
Dan Balasescu
6eb809f4c4
Merge pull request #9194 from boswelja/rebind-song-select
Allow rebinding Song Select mods/random/options keys
2021-04-07 20:55:45 +09:00
Dan Balasescu
e667b1fad0
Merge pull request #12316 from peppy/fix-game-mouse-cursor
Fix gameplay mouse cursor being overridden by menu cursor
2021-04-07 20:38:40 +09:00
smoogipoo
7d37c4df8c Fix broken osu tests 2021-04-07 20:17:20 +09:00
Dan Balasescu
5227f2fe0d
Merge branch 'master' into fix-game-mouse-cursor 2021-04-07 20:02:44 +09:00
Dean Herbert
17c9890865
Merge pull request #12315 from smoogipoo/fix-typo
Fix typo in class name
2021-04-07 19:03:10 +09:00
Dean Herbert
e7f47c635f Fix gameplay mouse cursor being overridden by menu cursor
Closes https://github.com/ppy/osu/issues/12313.
2021-04-07 19:00:05 +09:00
Dean Herbert
aa424165b3 Fix broken taiko test 2021-04-07 18:45:57 +09:00
Dean Herbert
0f2c03d54b Add back "rewind" text, showing temporarily after a rewind occurs 2021-04-07 18:29:45 +09:00
Dean Herbert
b4c6894d13 Add test coverage for song select footer area 2021-04-07 18:29:31 +09:00
Dean Herbert
08858e6426 Reorder defaults to give non-global areas priority for global actions 2021-04-07 17:42:49 +09:00
Dean Herbert
afc745f999 Merge branch 'master' into rebind-song-select 2021-04-07 17:13:25 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +09:00
Dean Herbert
10ea575384
Merge pull request #12314 from smoogipoo/fix-slnf
Fix invalid array definition in slnf
2021-04-07 15:55:46 +09:00
smoogipoo
ef658e9597 Fix invalid array definition in slnf 2021-04-07 15:54:16 +09:00
Dan Balasescu
1c7aa71b83
Merge pull request #12310 from FamousPig/perfect-curve-undo
Fix consecutive perfect curve segments not being loaded properly
2021-04-06 22:21:01 +09:00
Leon Gebler
dd902441b0 Add tests for consecutive perfect-curve segments 2021-04-06 13:32:17 +02:00
Leon Gebler
d81f270e21 Always encode perfect curves as explicit segments 2021-04-06 13:29:31 +02:00
Dean Herbert
d4c55070e7
Merge pull request #12283 from bdach/setup-screen-design-refresh
Refresh setup screen appearance to be closer to design
2021-04-06 18:33:34 +09:00
Dan Balasescu
ba3689b5b9
Merge pull request #12269 from PercyDan54/beatmap-details
Use OnlineViewContainer for BeatmapDetails
2021-04-06 17:52:32 +09:00
Dan Balasescu
c5e5f02fbe
Merge pull request #12225 from peppy/fix-overzealousmouse-button-blocking
Ensure GlobalActions are handled before anything else game-wide
2021-04-06 17:36:32 +09:00
Dean Herbert
3113eefcf6 Don't attempt to load content when not online 2021-04-06 17:12:00 +09:00
Dean Herbert
899d708dac Move loading layer up one level to correct padding 2021-04-06 17:09:51 +09:00
Dean Herbert
f08b340e81 Add nullability hinting 2021-04-06 16:49:26 +09:00
Dan Balasescu
2321101518
Merge branch 'master' into fix-overzealousmouse-button-blocking 2021-04-06 16:45:25 +09:00
Dean Herbert
1934e8e1fe Fix loading layer being in the wrong place 2021-04-06 16:30:47 +09:00
Dean Herbert
59e6c46644 Remove unnecessary online state logic 2021-04-06 16:23:27 +09:00
Dean Herbert
dafa8bbe4e Refactor BeatmapDetails to use GridContainer to keep a consistent layout 2021-04-06 16:21:20 +09:00
Dean Herbert
933c4010da Allow creating OnlineViewContainers with no placeholder button 2021-04-06 16:17:20 +09:00
Dan Balasescu
eed56e0e41
Merge pull request #12308 from peppy/editor-timeline-select-intro-blueprints
Fix not being able to select timeline blueprints in intro time
2021-04-06 16:08:39 +09:00
Dean Herbert
9d0839be8f Remove no longer necessary FinishTranforms call 2021-04-06 15:35:07 +09:00
Dean Herbert
316a557a99 Split select area background into own class to reduce hover state complexity 2021-04-06 15:34:34 +09:00
Dean Herbert
35af44ab98
Merge pull request #12309 from smoogipoo/fix-lazer-encoder-fp-error
Fix floating point error in slider path encoding
2021-04-06 15:19:09 +09:00
Dean Herbert
53c1bc666c Make addition of nested GlobalActionContainer in OsuGameTestScene optional 2021-04-06 15:18:00 +09:00
smoogipoo
9c1320e18b Add test 2021-04-06 14:34:26 +09:00
Dean Herbert
7d301a6336 Improve timeline hover display before time zero with a gradient fade 2021-04-06 14:34:16 +09:00
Dean Herbert
35dd1c68aa Fix drag/selection events not propagating correctly to TimelineBlueprintContainer when before time zero 2021-04-06 14:34:16 +09:00
Dean Herbert
8ff13845d1 Add marker showing where 00:00:000 is 2021-04-06 14:24:22 +09:00
smoogipoo
a2544100d4 Fix floating point error in slider path encoding 2021-04-06 14:10:59 +09:00
Dean Herbert
784552022f
Merge pull request #12303 from smoogipoo/fix-last-control-point-segmenting
Make last control point not able to make an implicit segment
2021-04-06 13:35:55 +09:00
Dan Balasescu
c228192949
Merge pull request #11690 from Syriiin/diffcalc/refactor-strain-skill
Refactor to abstract out strain logic into StrainSkill class
2021-04-06 08:56:59 +09:00
Dan Balasescu
9d8a26f373
Merge branch 'master' into diffcalc/refactor-strain-skill 2021-04-06 08:21:38 +09:00