1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Commit Graph

1823 Commits

Author SHA1 Message Date
Bartłomiej Dach
827a089810
Merge branch 'master' into change-taiko-ez 2020-11-22 13:29:02 +01:00
Bartłomiej Dach
24d7fa03d8
Merge branch 'master' into legacy-jugement-match-stable-transforms 2020-11-18 20:33:58 +01:00
Bartłomiej Dach
5156de3a10
Merge branch 'master' into fix-judgement-transform-logic 2020-11-18 19:20:11 +01:00
Dean Herbert
20bb64c627 Fix mania misses not correctly animating (temporary solution) 2020-11-18 19:34:00 +09:00
Dean Herbert
94886a09b2 Remove fades from DrawableJudgement itself 2020-11-18 19:03:34 +09:00
Dean Herbert
49b8331ccd
Merge pull request #10877 from smoogipoo/fix-mania-judgement-displays
Fix hold note judgements displaying incorrectly
2020-11-18 19:00:14 +09:00
Dean Herbert
8247e6ce91 Move result type to ctor 2020-11-17 15:43:54 +09:00
Dean Herbert
f465dd5a5e Move all extended animation logic out of DrawableJudgement 2020-11-17 14:59:34 +09:00
Dan Balasescu
cb3280af7c
Merge branch 'master' into hold-note-fade 2020-11-17 13:49:28 +09:00
smoogipoo
77942af3a6 Fix hold note judgements displaying incorrectly 2020-11-17 13:37:58 +09:00
Bartłomiej Dach
21f29e28e2 Add clarification comment 2020-11-16 20:36:56 +01:00
Bartłomiej Dach
e88920442c Use HitStateUpdateTime instead 2020-11-16 20:01:10 +01:00
Bartłomiej Dach
8da40ce2dc Reduce duplication by extracting ModEasyWithExtraLives 2020-11-16 19:54:00 +01:00
Bartłomiej Dach
128adce017 Merge branch 'master' into change-taiko-ez 2020-11-16 19:37:47 +01:00
PercyDan54
99ee5e3ad7
Correct inheritance 2020-11-16 18:28:50 +08:00
PercyDan54
d7acfd5413
Remove retires from ModEasy 2020-11-16 18:15:15 +08:00
Dean Herbert
a4c17906b4 Make comment a bit more explicit 2020-11-16 14:52:18 +09:00
Bartłomiej Dach
e5d9cca9de Fix mania-specific missing cases 2020-11-15 15:38:12 +01:00
Bartłomiej Dach
ba30800bf4 Extract constant 2020-11-13 22:21:22 +01:00
Bartłomiej Dach
a199a957cc Use stored hold note break time to fade upon it 2020-11-13 22:16:38 +01:00
Bartłomiej Dach
b62bf5798d Store time of hold note break 2020-11-13 21:14:34 +01:00
Bartłomiej Dach
4777b1be81 Fix fade not applying to tails sometimes 2020-11-13 20:52:15 +01:00
Bartłomiej Dach
55a91dbbe0 Add fading on hit state change 2020-11-13 20:52:15 +01:00
Bartłomiej Dach
7a89e58483 Disable pressed/released action logic when rewinding 2020-11-13 20:49:06 +01:00
smoogipoo
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
smoogipoo
60f95e897d Revert unnecessary change 2020-11-12 18:29:22 +09:00
smoogipoo
ad38867b1d Completely remove check as it can occur for hits too 2020-11-12 18:29:22 +09:00
smoogipoo
44aed19e4e Fix mania notelock crashing with overlapping hitwindows 2020-11-12 18:29:22 +09:00
Dean Herbert
a3dc1d5730 Update existing implementations 2020-11-04 17:14:23 +09:00
Dean Herbert
fed4accfea Update tests to refect new mappings 2020-10-30 12:12:30 +09:00
Dean Herbert
ef2e2894a2
Merge branch 'master' into fix-mania-diffcalc 2020-10-14 23:49:14 +09:00
smoogipoo
26dffbfd3b Replicate hit window calculation 2020-10-14 20:40:39 +09:00
smoogipoo
1a2dc83740 Make field readonly 2020-10-14 20:40:17 +09:00
smoogipoo
da8565c0fa Add 10K mod to incompatibility list 2020-10-14 18:28:19 +09:00
smoogipoo
3e6ed6c9ff Add support for dual stages (keycoop) and score multiplier 2020-10-14 17:53:28 +09:00
Dan Balasescu
4eccb03d71
Add copyright notice
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-10-14 17:08:14 +09:00
Dean Herbert
207c409792
Merge branch 'master' into fix-mania-diffcalc 2020-10-14 15:26:32 +09:00
Dean Herbert
010f86ff34
Merge pull request #10452 from smoogipoo/fix-mania-conversion
Make mania beatmap conversions match stable
2020-10-13 01:17:42 +09:00
smoogipoo
ac4290dfb6 Add comment about stable calculation 2020-10-12 15:27:33 +09:00
Bartłomiej Dach
146b15371d
Merge branch 'master' into fix-slider-sample-parsing 2020-10-10 14:02:33 +02:00
smoogipoo
65d8530a11 Fix tests 2020-10-09 22:47:32 +09:00
smoogipoo
306d876d22 Replicate stable's unstable sort 2020-10-09 21:50:20 +09:00
smoogipoo
5017c92fe8 Combine mania skills 2020-10-09 21:47:34 +09:00
smoogipoo
08f3481b59 Use integer calculations to replicate stable's slider conversion 2020-10-09 21:22:20 +09:00
smoogipoo
5f19081db6 Fix incorrect probability calculation for hitobject conversion 2020-10-09 21:20:00 +09:00
smoogipoo
9d09503ace Fix spinner conversion not considering stacking + forced initial column 2020-10-09 21:13:04 +09:00
smoogipoo
4d0e4f4ade Fix incorrect initial density 2020-10-09 21:11:18 +09:00
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste 2020-10-09 20:51:09 +09:00
Dean Herbert
3838f405dd Fix missed usages 2020-10-09 18:50:05 +09:00
Dean Herbert
07558b5bc0 Merge branch 'master' into ruleset-result-types 2020-10-09 13:17:05 +09:00
Dean Herbert
f1a3b6d0ba Merge branch 'master' into perf-calculator-remove-working-beatmap 2020-10-07 17:43:17 +09:00
Dean Herbert
6020ec9ca3 Add valid result types for all rulesets 2020-10-07 15:43:52 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments 2020-10-04 21:38:40 +09:00
Lucas A
d7747ebb2d Remove unused WorkingBeatmap argument. 2020-10-03 16:51:22 +02:00
Bartłomiej Dach
309714081f Make new health increase values mania-specific 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Lucas A
abd395a030 Remove unecessary using references. 2020-10-02 19:41:24 +02:00
Lucas A
0163688a17 Remove IBeatmap from PerformanceCalculator. 2020-10-02 19:24:30 +02:00
smoogipoo
e789e06c86 Don't display hold note tick judgements 2020-09-29 16:33:38 +09:00
smoogipoo
bad48d6d44 Merge branch 'master' into scoring-standardisation 2020-09-29 16:33:38 +09:00
smoogipoo
31fae045fa Update judgement processors with new hit results 2020-09-29 16:33:38 +09:00
smoogipoo
b1877b649b Use new hit results in mania 2020-09-29 16:33:38 +09:00
Dean Herbert
6095446f10 Fix autoplay generators failing on empty hitobjects lists 2020-09-28 15:38:54 +09:00
smoogipoo
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
Morilli
9c041dbac2 Fix mania scrollspeed slider precision 2020-09-15 08:24:01 +02:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
Dean Herbert
a65f564e45 Add icons for other ruleset editors 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
smoogipoo
c72a8d4755 Add zero-length slider test 2020-09-07 17:18:40 +09:00
smoogipoo
ecc9c2957f Avoid float precision error in mania conversion 2020-09-07 16:30:05 +09:00
smoogipoo
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
Dean Herbert
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00
Dean Herbert
72cb65c22f Update and add missing beatmap statistic icons to info wedge 2020-09-03 17:52:22 +09:00
Bartłomiej Dach
d419fe4dbf Remove note shaking mention that doesn't apply in mania 2020-08-31 12:03:05 +02:00
smoogipoo
acbeb5406f Add/improve xmldoc 2020-08-31 13:33:41 +09:00
smoogipoo
aa151e4cd7 Merge branch 'master' into mania-notelock 2020-08-31 13:31:41 +09:00
Dan Balasescu
bd2f863b56
Merge branch 'master' into legacy-mirror-mod-replays 2020-08-31 12:41:17 +09: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
Bartłomiej Dach
da82556f6b Add two-way legacy conversions for mirror mod 2020-08-29 11:49:17 +02:00
smoogipoo
85bda29b71 Add mania max combo attribute 2020-08-28 19:16:24 +09:00
Dean Herbert
da34544fdc
Merge branch 'master' into hold-note-lighting 2020-08-28 18:27:29 +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
1a04ec5375 Merge branch 'master' into unstable-rate 2020-08-27 19:56:08 +02:00
smoogipoo
7002193165 Mark nullable members 2020-08-27 23:16:59 +09:00
smoogipoo
29b29cde8e Flip condition to reduce nesting 2020-08-27 23:09:54 +09:00
smoogipoo
7a5292936e Add some xmldocs 2020-08-27 21:15:05 +09:00
Bartłomiej Dach
a1f731d455
Merge branch 'master' into mania-keys-under-notes 2020-08-27 14:06:43 +02:00
smoogipoo
6f93df0b9d Fix ticks causing hold note misses 2020-08-27 21:05:12 +09:00
smoogipoo
deb172bb6c Implement basic mania hit order policy 2020-08-27 20:24:21 +09: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
157e1d8965 Add fades 2020-08-26 20:46:12 +09:00
smoogipoo
6fe1279e9d Re-use existing inset container 2020-08-26 20:23:01 +09:00
smoogipoo
1db836e9e0 Merge branch 'master' into hold-note-lighting 2020-08-26 20:22:07 +09:00
smoogipoo
9372c6eef6 Implement hold note lighting 2020-08-26 20:21:56 +09:00
smoogipoo
d057f5f4bc Implement mania "KeysUnderNotes" skin config 2020-08-26 15:37:16 +09:00
smoogipoo
0800e43796 Remove padding from columns 2020-08-25 19:57:49 +09:00
smoogipoo
c09cef4fca Apply post-merge fixes to LegacyStageBackground 2020-08-25 19:40:17 +09:00
smoogipoo
8dde512657 Merge branch 'master' into skin-colour-fix-2 2020-08-25 19:39:01 +09:00
smoogipoo
ff72ccabd8 Rename method 2020-08-25 18:44:32 +09:00
Dean Herbert
940b4acf0d
Merge branch 'master' into fix-hittarget-layering 2020-08-25 15:44:38 +09:00
smoogipoo
ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
smoogipoo
723e5cafb6 Fix column potentially added at wrong indices 2020-08-25 14:49:04 +09:00
smoogipoo
018523a43a Rework to remove cross-class pollutions 2020-08-25 01:21:27 +09:00
smoogipoo
77bf646ea0 Move column lines to background layer 2020-08-24 23:01:06 +09:00
smoogipoo
500cb0ccf5 Fix legacy hit target being layered incorrectly 2020-08-24 22:36:37 +09:00
Dean Herbert
1f717c4b00
Merge branch 'master' into hold-note-freeze 2020-08-23 22:38:48 +09:00
Bartłomiej Dach
891f5cb130 Add padding to mania column borders to match stable 2020-08-21 20:00:20 +02:00
smoogipoo
08078b9513 Rename method to remove "InitialColour" namings 2020-08-22 00:56:29 +09:00
smoogipoo
454564b189 Update mania with legacy colour setters 2020-08-22 00:19:15 +09:00
smoogipoo
b3338347b7 Remove fade on successful hits 2020-08-21 23:56:27 +09:00
smoogipoo
8632c3adf0 Fix hold notes bouncing with SV changes 2020-08-21 23:11:15 +09:00
Dan Balasescu
42ee9b75df
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-21 19:38:59 +09:00
smoogipoo
aead13628b Rework freezing to use masking 2020-08-21 17:52:42 +09:00
smoogipoo
37cf7999b1 Merge branch 'master' into hold-note-freeze 2020-08-21 14:39:25 +09:00
smoogipoo
54a2322090 Use Array.Empty<> 2020-08-20 22:51:52 +09:00
smoogipoo
f1e0946603 Remove release samples in invert mod 2020-08-20 22:38:47 +09:00
Dean Herbert
f6ca31688e Fix incorrect spacing 2020-08-19 21:39:55 +09:00
Dean Herbert
37f40f4a09
Merge branch 'master' into mania-slidertick-lighting 2020-08-19 21:19:25 +09:00
Dean Herbert
74f8e61381
Merge branch 'master' into mania-body-recycling 2020-08-19 20:40:15 +09:00
Dean Herbert
3eac81eb52
Merge pull request #9891 from smoogipoo/mania-mod-invert 2020-08-19 19:12:02 +09:00
Dean Herbert
72f16eb186
Merge pull request #9905 from smoogipoo/fix-holdnote-tick-judgement 2020-08-19 19:07:38 +09:00
Dean Herbert
0184bee44d
Merge branch 'master' into mania-mod-invert 2020-08-19 18:41:32 +09:00
smoogipoo
1d9d885d27 Mask the tail as the body gets shorter 2020-08-19 01:40:26 +09:00
smoogipoo
4d4d9b7356 Add rewinding support 2020-08-19 01:37:31 +09:00
Jihoon Yang
474f245222 Replace nested loop with early return 2020-08-18 08:40:29 -07:00
Jihoon Yang
af8f727721 Disable LegacyHitExplosion for hold notes 2020-08-18 08:28:53 -07:00
smoogipoo
99315a4aa7 Fix incorrect anchors for up-scroll 2020-08-19 00:05:36 +09:00
smoogipoo
988ad378a7 Fix body size + freeze head piece 2020-08-19 00:05:05 +09:00
smoogipoo
da07354f05 Fix some judgements potentially giving wrong score 2020-08-18 19:51:16 +09:00
smoogipoo
385f7cf85d Implement mania hold note body recycling 2020-08-18 17:56:48 +09:00
Jihoon Yang
138dc5929e Changed MIN_TIME_RANGE as well 2020-08-18 01:46:41 -07:00
Jihoon Yang
4ddc04793f Changed MAX_TIME_RANGE instead of the single instance 2020-08-18 01:44:30 -07:00
smoogipoo
d157c42340 Increase density by not skipping objects 2020-08-18 17:40:44 +09:00
Jihoon Yang
628be66653 Updated calculation of mania scroll speed 2020-08-18 01:24:56 -07:00
smoogipoo
e1ed8554a1 Use yinyang icon 2020-08-18 17:23:11 +09:00
smoogipoo
583760100a Implement mania invert mod 2020-08-18 01:40:55 +09:00
smoogipoo
548ccc1a50 Initial implementation of hold note freezing 2020-08-18 00:29:00 +09:00
Dean Herbert
f139423786
Merge branch 'master' into mania-hitexplosion-pooling 2020-07-30 10:40:29 +09:00
smoogipoo
5df406a035 Add pooling for mania judgements 2020-07-29 16:41:10 +09:00
smoogipoo
00821e7b65 Re-implement support for small ticks 2020-07-29 16:14:19 +09:00
smoogipoo
7f2e554ad4 Fix animations not being reset 2020-07-29 15:52:25 +09:00
smoogipoo
0f1f4b2b5c Add pooling for mania hit explosions 2020-07-29 15:36:42 +09:00
smoogipoo
375dad0878 Increase PERFECT from 320 to 350 score 2020-07-28 17:59:52 +09:00
smoogipoo
f7cd6e83aa Adjust mania scoring to be 95% based on accuracy 2020-07-28 17:58:58 +09:00
Dan Balasescu
a640541324
Merge pull request #9612 from peppy/input-handler-updates
Input handler updates in line with framework changes
2020-07-22 20:30:32 +09:00
Dean Herbert
2c62b23d85 Update naming 2020-07-22 19:53:45 +09:00
smoogipoo
f044c06d08 Fix hold notes accepting presses during release lenience 2020-07-20 22:26:58 +09:00
Dean Herbert
648e414c14 Update InputHandlers in line with framework changes 2020-07-19 11:39:11 +09:00
Dean Herbert
56480d1665
Merge pull request #9538 from LastExceed/mania-fadein 2020-07-17 18:22:13 +09:00
smoogipoo
b3769112fb Fix mania hold note bodies behaving badly with edge alphas 2020-07-17 17:08:26 +09:00
smoogipoo
8d9e5db641 Use enum values instead of class override 2020-07-16 21:29:39 +09:00
smoogipoo
03a7b8a6ef Rename 2020-07-16 21:18:24 +09:00
smoogipoo
18d3685023 Pass in content 2020-07-16 21:17:51 +09:00
smoogipoo
967238e269 Add comment explaining scale 2020-07-16 17:47:00 +09:00
smoogipoo
74c7d9e67d Use WithChild 2020-07-16 17:42:37 +09:00
smoogipoo
02031cea01 Add newline 2020-07-16 17:42:37 +09:00
smoogipoo
84e2e5677a Add more info to xmldoc 2020-07-16 17:42:37 +09:00
smoogipoo
d546db0ec9 Fix default coverage 2020-07-16 17:35:00 +09:00
smoogipoo
b7f6ae5db9 Make the cover into a container 2020-07-16 17:26:48 +09:00
smoogipoo
1384e61747 Move cover to a separate file, rename 2020-07-16 17:26:34 +09:00
Dean Herbert
5049977395
Merge pull request #9578 from smoogipoo/accuracy-based-mania 2020-07-16 16:12:48 +09:00
smoogipoo
2b39857b8c Make mania 80% acc 20% combo 2020-07-16 14:10:52 +09:00
smoogipoo
1a6ae3194e Add test 2020-07-15 19:45:48 +09:00
LastExceed
d2e78d080c fix naming convention violation 2020-07-15 11:29:13 +02:00
LastExceed
4a2890c054 implement FI by flipping HD upside down 2020-07-15 11:15:47 +02:00
LastExceed
e12f02a634 simplify reversing using rotation 2020-07-15 11:07:30 +02:00
LastExceed
b43b1673cc fix leftover parameter name 2020-07-15 10:41:34 +02:00
LastExceed
f73fd7ffe9 read scroll direction from IScrollingInfo instead of config 2020-07-14 17:04:09 +02:00
LastExceed
3b7d52da09 rearrange LaneCover members 2020-07-14 16:48:14 +02:00
LastExceed
25fb49d59f bind laneCover direction to scroll direction 2020-07-14 16:44:29 +02:00
LastExceed
921939f97a extract coverage updating logic to separate method 2020-07-14 15:12:00 +02:00
LastExceed
fcda4d9f15 move lanecover implementation to ManiaModHidden 2020-07-14 15:06:15 +02:00
LastExceed
fec2594ac6 reverse LaneCover when playing up-scroll 2020-07-14 11:56:31 +02:00
LastExceed
ca39f2aa24 only insert BufferedContainer when using FI 2020-07-13 13:43:32 +02:00
LastExceed
3178217216 remove unnecessary import 2020-07-13 13:14:47 +02:00
LastExceed
4b3cffb246 expose hitObjectContainer in HitObjectArea 2020-07-13 11:55:13 +02:00
LastExceed
bdf680aecb inline single-use constants 2020-07-12 14:53:40 +02:00
LastExceed
3606febe31 fix case convention violation 2020-07-12 14:23:55 +02:00
LastExceed
1cf8b599a1 implement fadein 2020-07-12 13:57:44 +02:00
LastExceed
06ed5316c4 expose hitObectArea in Column 2020-07-12 13:57:36 +02:00
LastExceed
0e49bf127b wrap HitObjectContainer in BufferedContainer 2020-07-12 13:57:06 +02:00
Dean Herbert
bd5957bc0a Add dynamic compilation exclusion rules for ruleset types 2020-07-10 14:49:44 +09:00
Bartłomiej Dach
b37eb63579 Merge branch 'master' into mania-conversion-precision 2020-06-30 20:16:47 +02:00
Bartłomiej Dach
39cfbb67ad Replace iterated addition with rounding 2020-06-30 20:16:19 +02:00
Dean Herbert
e5a901cec7
Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-28 22:14:22 +09:00
Bartłomiej Dach
1551c42c12 Avoid division when slicing node sample list 2020-06-27 17:03:32 +02:00
Bartłomiej Dach
5e92809401 Add failing test case 2020-06-27 16:46:43 +02:00
Bartłomiej Dach
c47f762f24 Update test scene to allow checking samples 2020-06-27 16:45:39 +02:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Bartłomiej Dach
8233f5fbc4 Check skin option in skin transformers 2020-06-22 20:08:32 +02:00
smoogipoo
4d30761ce3 Fix 1M score being possible with only GREATs in mania 2020-06-22 19:52:23 +09:00
smoogipoo
988baad16f Expand statistics to fill more of the screen 2020-06-22 19:20:43 +09:00
smoogipoo
261adfc4e6 Create a local playable beatmap instead 2020-06-22 18:38:41 +09:00
smoogipoo
33fdd7466c Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-22 15:38:48 +09:00
Bartłomiej Dach
ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00