1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 00:43:21 +08:00
Commit Graph

2424 Commits

Author SHA1 Message Date
Dean Herbert
0f8551e9ea Merge branch 'editor-ternary-states' into new-combo-toggle 2020-09-25 15:36:33 +09:00
Dean Herbert
bca774a0d4 Allow BlueprintContainer to specify toggles 2020-09-25 14:09:31 +09:00
Dean Herbert
d9e8ac6842 Add support for slider end snapping 2020-09-24 16:24:35 +09:00
Dean Herbert
44be0ab762 Add basic osu! object to object snapping 2020-09-24 16:24:35 +09:00
Dean Herbert
ba160aab76 Fix large construction/disposal overhead on beatmaps with hitobjects at same point in time 2020-09-23 15:41:43 +09:00
Dan Balasescu
625c146460
Merge pull request #10199 from peppy/fix-editor-binding-crash
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-23 12:38:18 +09:00
Dan Balasescu
53788968c8
Merge pull request #10205 from peppy/fix-composer-distance-snap-selection
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-23 11:55:42 +09:00
Dean Herbert
b1f7cfbd5b Reduce children levels in RingPiece 2020-09-22 17:34:21 +09:00
Dean Herbert
8e43266460 Fix compose mode not showing distance snap grid when entering with a selection 2020-09-22 16:02:07 +09:00
Dean Herbert
842f8bea55 Fix bindings not correctly being cleaned up in OsuHitObjectComposer 2020-09-21 18:15:33 +09:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter 2020-09-21 17:53:00 +09:00
Dean Herbert
141fbbf5bb
Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
smoogipoo
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
smoogipoo
009e1b4445 Make Spinner use cancellation token 2020-09-17 17:05:24 +09:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter 2020-09-15 17:20:31 +09:00
Dean Herbert
a8b405791a Fix non-convert slider and spinner serialization 2020-09-14 17:32:32 +09:00
Dean Herbert
23b51e8f7f
Merge pull request #10106 from smoogipoo/score-recalc 2020-09-10 19:05:42 +09:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
Dean Herbert
df1537f2a0 Update framework 2020-09-10 18:10:39 +09:00
Dan Balasescu
6f6adb61d7
Merge pull request #10099 from peppy/add-editor-tool-icons
Add icons for editor toolbox tools
2020-09-09 22:22:58 +09:00
Dean Herbert
fb2aced3ac Add toggle for distance snap 2020-09-09 19:15:35 +09:00
Dean Herbert
c9f5005efd Add icons for editor toolbox tools 2020-09-09 18:40:01 +09:00
smoogipoo
117c7ec6b2 Merge branch 'master' into score-recalc 2020-09-09 14:38:36 +09:00
Dean Herbert
4680728b9c Merge branch 'master' into update-dcc-exclusions 2020-09-07 18:01:44 +09:00
Dan Balasescu
025ead195c
Merge branch 'master' into fix-sliderborder-more-thicker 2020-09-07 15:40:34 +09:00
smoogipoo
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
Salman Ahmed
569a56eccb Revert "Move adjustment to LegacySkinConfiguration as a default value"
This reverts commit 18927304f1.
2020-09-04 13:33:23 +03:00
Dean Herbert
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00
Salman Ahmed
18927304f1 Move adjustment to LegacySkinConfiguration as a default value 2020-09-03 16:29:38 +03:00
Dean Herbert
72cb65c22f Update and add missing beatmap statistic icons to info wedge 2020-09-03 17:52:22 +09:00
Salman Ahmed
5180d71fd9 Attach an inline comment explaining how the value was reached 2020-09-03 06:09:52 +03:00
Salman Ahmed
e7eaaf8b02 Bring legacy slider border width closer to osu!stable 2020-09-03 04:46:26 +03:00
Salman Ahmed
99a68e880a Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:46:38 +03:00
Salman Ahmed
a0a4501008 Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:17:25 +03:00
Dean Herbert
3d0121ceb1
Merge pull request #10022 from PajLe/auto-on-low-duration-spinners 2020-09-01 12:19:44 +09:00
Bartłomiej Dach
69ec2a76ef Replace reaction time check with spins required check 2020-08-31 17:20:45 +02:00
PajLe
0655fc1473
changed comparing Duration to autoplay's reactionTime instead of 0
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-31 16:50:31 +02:00
Pavle Aleksov
fde4b03dab added spinner duration check - skip HitObjectReplay if duration is 0 2020-08-31 16:21:00 +02:00
smoogipoo
acbeb5406f Add/improve xmldoc 2020-08-31 13:33:41 +09:00
Bartłomiej Dach
3ab32a5d35 Change structure of old style spinner to be closer to stable 2020-08-29 23:29:29 +02:00
Dean Herbert
cd0a73883d
Merge pull request #9945 from smoogipoo/skin-colour-fix-2
Exactly reproduce osu!stable skin colour alphas
2020-08-29 20:06:26 +09:00
smoogipoo
1c1afa1c96 Move MaxCombo to base DifficultyAttributes 2020-08-28 19:16:20 +09:00
Bartłomiej Dach
43d6d2b2e8 Add back unstable rate display 2020-08-27 20:46:49 +02:00
Bartłomiej Dach
f152e1b924 Revert IStatisticRow changes 2020-08-27 20:13:44 +02:00
Bartłomiej Dach
05e725d59f Add unstable rate statistic to rulesets in which it makes sense 2020-08-26 22:06:29 +02:00
Bartłomiej Dach
bbb3d7522e Scope up return type to IStatisticRow 2020-08-26 19:24:12 +02:00
smoogipoo
ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
Salman Ahmed
cf6b34db1e Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-08-22 13:07:28 +03:00
smoogipoo
08078b9513 Rename method to remove "InitialColour" namings 2020-08-22 00:56:29 +09:00
smoogipoo
16a2ab9dea Update osu with legacy colour setters 2020-08-22 00:20:33 +09:00