1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 16:37:26 +08:00
Commit Graph

1183 Commits

Author SHA1 Message Date
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste 2020-10-09 20:51:09 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling 2020-10-09 20:06:06 +09:00
Dean Herbert
3838f405dd Fix missed usages 2020-10-09 18:50:05 +09:00
Dean Herbert
cb96a40dd6 Fix bindable propagation potentially making swells strong 2020-10-09 17:12:10 +09:00
Dean Herbert
144726e3c6 Better guard against taiko swells becoming strong 2020-10-09 17:12:01 +09:00
Dean Herbert
07558b5bc0 Merge branch 'master' into ruleset-result-types 2020-10-09 13:17:05 +09:00
Dean Herbert
c9f069d7ed Fix taiko's HitObjectComposer not allowing movement o
f selected hitobjects
2020-10-08 18:17:57 +09:00
Dean Herbert
afed832b19 Tidy up EditorBeatmap slightly 2020-10-08 18:06:49 +09:00
Dean Herbert
38babf3de5 Update usages of ChangeHandler to EditorBeatmap where relevant 2020-10-08 18:04:07 +09:00
Dean Herbert
d9089ef93c Add missing bonus type for taiko ruleset 2020-10-08 12:52:52 +09:00
Dean Herbert
1566882dc4
Merge pull request #10338 from Game4all/perf-calculator-remove-working-beatmap
Remove WorkingBeatmap from PerformanceCalculator
2020-10-07 20:04:24 +09:00
Dean Herbert
8c528c8910 Fix legacy taiko skins showing double judgements 2020-10-07 18:36:40 +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
2a46f905ff Remove unnecessary IsSeeking checks from taiko drum implementation 2020-10-05 14:27:51 +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
682b5fb056 Adjust health increase for drum roll tick to match new max result 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
7890319802 Merge branch 'master' into adjust-hit-result-types 2020-10-01 16:19:07 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
Dan Balasescu
a6c7bc0cdb
Merge branch 'master' into taiko-explosion-rework 2020-09-30 23:02:46 +09:00
Dean Herbert
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
903bcd747e Revert unintended changes 2020-09-29 16:39:29 +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
c45b5690cf Use new hit results in taiko 2020-09-29 16:33:38 +09:00
Bartłomiej Dach
2fb9a5d734 Remove no longer required field 2020-09-28 17:53:32 +02:00
Bartłomiej Dach
f6f267a43a Switch to strong sprite exactly once 2020-09-28 17:53:12 +02:00
Bartłomiej Dach
0900661b23 Use IsHit for strong hit instead of checking result type 2020-09-28 16:34:04 +02:00
Bartłomiej Dach
40dea0e2db Merge branch 'master' into taiko-explosion-rework 2020-09-28 16:32:15 +02:00
Dan Balasescu
895828c06a
Merge pull request #10274 from peppy/autoplay-fix-empty-generation
Fix autoplay generators failing on empty hitobjects lists
2020-09-28 16:34:10 +09:00
Dean Herbert
6095446f10 Fix autoplay generators failing on empty hitobjects lists 2020-09-28 15:38:54 +09:00
Dean Herbert
1aa8b400d4 Avoid unnecessary object updates from SelectionHandlers 2020-09-28 15:33:49 +09:00
Bartłomiej Dach
4944128631 Ensure both sprites are centered 2020-09-27 18:11:12 +02:00
Bartłomiej Dach
2f7c0b4934 Allow switching between legacy sprites 2020-09-27 16:07:19 +02:00
Bartłomiej Dach
eb62ad4e55 Look up both sprites for legacy explosions 2020-09-27 16:06:59 +02:00
Bartłomiej Dach
d5f1d94b51 Allow specifying two sprites for legacy hit explosions 2020-09-27 15:52:40 +02:00
Bartłomiej Dach
deb207001a Remove schedule causing default skin explosion regression 2020-09-27 15:23:34 +02:00
Bartłomiej Dach
d61a8327da Fix rim flying hits changing colour 2020-09-26 20:59:55 +02:00
smoogipoo
480eeb5fbe Add back caching 2020-09-25 19:37:34 +09:00
smoogipoo
acfa62bb50 Fix potential taiko crash on rewind 2020-09-25 19:25:58 +09:00
Dan Balasescu
9b29c9e185
Merge branch 'master' into editor-ternary-states 2020-09-25 16:58:15 +09:00
Dean Herbert
727ab98d22 Update taiko selection handler with new logic 2020-09-25 15:32:45 +09:00
Dean Herbert
33fad27ec2 Avoid API change to DrawableHitObject 2020-09-24 13:28:29 +09:00
Dean Herbert
156edf24c2 Change properties to methods and improve naming 2020-09-24 13:22:31 +09:00
Dean Herbert
00b0228b61 Merge branch 'master' into fix-taiko-editor-type-stats 2020-09-24 13:18:13 +09:00
Dean Herbert
9a0e5ac154 Handle type/strength changes from samples changes 2020-09-23 18:09:40 +09:00
Dean Herbert
8f3eb9a422 Fix taiko sample selection not updating when changing strong/rim type 2020-09-23 17:59:11 +09:00
Dean Herbert
487fc2a2c6 Add missing change handler scopings to taiko context menu operations 2020-09-23 16:58:22 +09:00
Bartłomiej Dach
4072abaed8 Allow miss explosions to be displayed 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
1c7556ea5d Schedule explosion addition to ensure both hits are processed 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
074387c676 Show strong hit explosion where applicable 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
919b19612f Add lookups for strong hit explosions 2020-09-20 19:40:30 +02:00
smoogipoo
847ec8c248 Fix n^2 characteristic in taiko diffcalc 2020-09-19 14:52:05 +09:00
smoogipoo
c62e4ef5e5 Allow one hitobject in taiko beatmap converter edge case 2020-09-18 13:06:41 +09:00
Dean Herbert
fdbd7b8a05
Merge branch 'master' into fix-taiko-endless-conversion 2020-09-17 22:31:35 +09:00
smoogipoo
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
smoogipoo
81f0a06fc4 Fix potential endless taiko beatmap conversion 2020-09-17 16:30:34 +09:00
Dean Herbert
7f2ce14f36
Merge pull request #9294 from smoogipoo/morth-taiko-changes 2020-09-15 16:11:17 +09:00
Bartłomiej Dach
a350802158 Fix wrong mono streak length handling in corner case 2020-09-10 20:50:26 +02:00
Bartłomiej Dach
6e5c5ab901 Fix invalid initial value of currentMonoLength 2020-09-10 18:22:49 +02:00
smoogipoo
74eea8900b Remove unnecessary check for negative durations 2020-09-10 20:00:57 +09:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
smoogipoo
d700ae55fb Merge branch 'master' into morth-taiko-changes 2020-09-10 16:34:09 +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
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
smoogipoo
d387c0cba0 Merge branch 'master' into morth-taiko-changes 2020-09-03 17:35:26 +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
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
2cf2ba8fc5 Store computed accent colour to local 2020-08-26 14:24:04 +09:00
smoogipoo
ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
Bartłomiej Dach
7c9fae55ad Hopefully fix off-by-one errors 2020-08-22 22:50:58 +02:00
Bartłomiej Dach
5afe9b73d2 Fix invalid cref 2020-08-22 21:27:08 +02:00
Bartłomiej Dach
a080774799 Add xmldoc to taiko difficulty calculation code 2020-08-22 19:44:58 +02:00
Bartłomiej Dach
8ace7df0fd Reorder members for better readability 2020-08-22 19:34:49 +02:00
Bartłomiej Dach
7e2bef3b9f Split conditional for readability 2020-08-22 19:34:49 +02:00
Bartłomiej Dach
bcf3cd5657 Remove unnecessary yield iteration 2020-08-22 19:34:49 +02:00
Bartłomiej Dach
cb3fef7616 Inline same parity penalty 2020-08-22 19:34:49 +02:00
Bartłomiej Dach
ec99fcd7ab Avoid passing down rhythm list every time 2020-08-22 19:34:49 +02:00
smoogipoo
9fbc5f3aeb Update taiko with legacy colour setters 2020-08-22 00:23:08 +09:00
Bartłomiej Dach
27f97973ee Add more proper typing to skills 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
cb5ea6aa9a Generalise p-norm function 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
51d41515ef Simplify expression with ternary 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
c827e21506 Extract helper method to reset rhythm strain 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
80e4c15727 Use Math.Clamp 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
ce0e5cf9a1 Slightly optimise and de-branch rhythm pattern recognition 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
d7ff3d77eb Slightly optimise and de-branch repetition pattern recognition 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
00ae456f08 Remove unnecessary null check 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
c6a640db55 Remove superfluous IsRepeat field 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
f22050c975 Remove unnecessary initialiser 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
ff44437706 Extract method for marking cheese 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
292d38362c De-nest cheese detection logic 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
6c759f31f1 Add and use limited capacity queue 2020-08-18 20:19:58 +02:00
Bartłomiej Dach
9fb494d5d3 Eliminate unnecessary loop 2020-08-18 17:36:23 +02:00
Bartłomiej Dach
cd2280b5bf Fix cheese indexing bug 2020-08-18 17:36:21 +02:00
smoogipoo
8ded5925ff Xmldoc colour strain 2020-08-13 13:47:35 +09:00
smoogipoo
5010d2044a Replace IsKat with HitType 2020-08-13 01:35:56 +09:00
smoogipoo
d2a03f1146 Refactor TaikoDifficultyHitObject 2020-08-13 00:59:22 +09:00
smoogipoo
4c00c11541 Remove unnecessary change 2020-07-29 20:53:14 +09:00
smoogipoo
e09a5ac835 Merge branch 'master' into morth-taiko-changes 2020-07-29 20:52:54 +09:00
Bartłomiej Dach
8e6a0493b4 Adjust InputDrum usage 2020-07-26 17:50:25 +02:00
Bartłomiej Dach
648f9204f5 Add sample lifetime constraints for taiko 2020-07-26 17:50:25 +02:00
Bartłomiej Dach
ea3ef37f9a Add support for indexless mascot texture lookups 2020-07-25 12:03:54 +02:00
Dan Balasescu
2997fb3f4e
Merge pull request #9635 from peppy/perfect-mod-combo-objects-only
Make perfect mod ignore all non-combo-affecting hitobjects
2020-07-23 20:54:39 +09:00
Dean Herbert
2c62b23d85 Update naming 2020-07-22 19:53:45 +09:00
Dean Herbert
c1442568b9 Make perfect mod ignore all non-combo-affecting hitobjects 2020-07-21 17:04:45 +09:00
Dean Herbert
648e414c14 Update InputHandlers in line with framework changes 2020-07-19 11:39:11 +09:00
smoogipoo
fc0f3f9171 Fix taiko drumroll bodies behaving badly with edge alphas 2020-07-17 16:55:01 +09:00
smoogipoo
c44ac9104f Fix post-merge error 2020-07-17 14:19:43 +09:00
smoogipoo
98accf2777 Merge branch 'master' into morth-taiko-changes 2020-07-17 14:19:32 +09:00
Dean Herbert
5049977395
Merge pull request #9578 from smoogipoo/accuracy-based-mania 2020-07-16 16:12:48 +09:00
smoogipoo
87713215dc Remove redundant parens 2020-07-16 14:30:17 +09:00
smoogipoo
35d6501478 Also adjust taiko 2020-07-16 14:13:46 +09:00
smoogipoo
dcd345eed9 Add a few tests 2020-07-16 01:35:38 +09:00
smoogipoo
0ea13dea55 Introduce legacy timing point fp errors 2020-07-13 17:06:00 +09:00
smoogipoo
352f59942e Fix incorrect time delta in taiko strain 2020-07-13 16:50:54 +09:00
Dean Herbert
bd5957bc0a Add dynamic compilation exclusion rules for ruleset types 2020-07-10 14:49:44 +09:00
smoogipoo
5db103dc61 Improve quality of taiko hit target 2020-06-29 14:42:20 +09:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +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
smoogipoo
486b899e8f Rename method 2020-06-19 22:11:29 +09:00
smoogipoo
83e6c3efdb Adjust API for returning statistics 2020-06-19 20:31:52 +09:00
smoogipoo
68027fcc2c Update with latest changes 2020-06-08 16:30:26 +09:00
Dean Herbert
61f906d9c4 Fix span piece being incorrect in some drag scenarios 2020-06-02 21:02:09 +09:00
Dean Herbert
665530f1c3 Remove excess newline 2020-06-02 17:22:59 +09:00
Dean Herbert
816f721f3d Move selection blueprint to correct namespace 2020-05-30 15:24:44 +09:00
Dean Herbert
b068992a15 Add missing licence headers 2020-05-29 18:58:34 +09:00
Dean Herbert
e0aae15c0a Hard type incoming ruleset 2020-05-29 16:45:47 +09:00
Dean Herbert
da289c474e Split files out 2020-05-29 16:45:47 +09:00
Dean Herbert
7f8f41715d Remove stray whitespace 2020-05-29 16:45:47 +09:00
Dean Herbert
7b52faa76d Update override 2020-05-29 16:45:47 +09:00
Dean Herbert
3e973c176f Remove unnecessary overrides 2020-05-29 16:45:47 +09:00
Dean Herbert
b2fad91589 Add swell and drumroll blueprints 2020-05-29 16:45:47 +09:00
Dean Herbert
dd7dbfd548 Rename to IHasDuration 2020-05-29 16:45:47 +09:00
Dean Herbert
534dccc0c3 Move sett from EndTime to Duration 2020-05-29 16:45:47 +09:00
Dean Herbert
a953f9e422 Add drum roll composition support 2020-05-29 16:45:47 +09:00
Dean Herbert
280b0adb1d Split out IHasPath from IHasCurve to better define hitobjects 2020-05-29 16:45:47 +09:00
Dean Herbert
a2eec5d963 Fix strong bindable changes for DrumRolls 2020-05-29 16:45:47 +09:00
Dean Herbert
910326623c Place rim hits using right mosue for now 2020-05-29 16:45:47 +09:00
Dean Herbert
50fcd4149f Support Strong bindable changes 2020-05-29 16:45:47 +09:00
Dean Herbert
4e9631b546 Support HitType bindable changes 2020-05-29 16:45:47 +09:00
Dean Herbert
3487c1fd1b Add menus to mark as rim and strong 2020-05-29 16:45:47 +09:00
Dean Herbert
4b1a2b5bc2 Fix offsets 2020-05-29 16:45:47 +09:00
Dean Herbert
90acba8c36 Introduce initial placement blueprint logic 2020-05-29 16:45:39 +09:00
Dean Herbert
7d4e60f05e Add basic setup for TaikoHitObjectComposer 2020-05-29 16:45:39 +09:00
smoogipoo
bc35bc5efb Merge branch 'master' into applydefaults-cancellation 2020-05-25 16:45:30 +09:00
smoogipoo
5852a37eb7 Update with latest changes 2020-05-24 11:48:56 +09:00
smoogipoo
9461097b00 Update with latest changes 2020-05-22 20:50:21 +09:00
smoogipoo
d04da46522 Merge branch 'master' into morth-taiko-changes 2020-05-22 20:48:04 +09:00
Dean Herbert
c0e68f9854 Also support taiko drum 2020-05-21 11:08:06 +09:00
Dean Herbert
db4e3047dd Add test for final sample output 2020-05-19 23:28:13 +09:00
Dean Herbert
e9710b6f83 Add taiko type conversion test coverage 2020-05-19 09:43:05 +09:00
Dean Herbert
013683c23b Fix taiko rim markers incorrectly playing as whistle samples 2020-05-19 00:17:13 +09:00
smoogipoo
1865cd0762 Fix possible exceptions in performance calculators 2020-05-18 15:10:59 +09:00
smoogipoo
6534510999 Use cancellation token in taiko swell/drumroll 2020-05-15 19:25:14 +09:00
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
Dan Balasescu
f761c5e119
Merge branch 'master' into reposition-taiko-playfield 2020-05-14 19:37:05 +09:00
smoogipoo
4bf5477252 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-14 17:04:09 +09:00
Dean Herbert
134a94e86d Rename enum members (no idea what a TaikoDon is) 2020-05-14 10:02:47 +09:00
Dean Herbert
9ba1a8af88 Fix mascot getting stuck in clear state on rewind 2020-05-14 09:44:21 +09:00
Bartłomiej Dach
0933217389 Simplify mascot scaling 2020-05-13 18:53:47 +02:00
Dean Herbert
6f2cc23a43
Merge branch 'master' into taiko-don 2020-05-13 19:27:54 +09:00
Dean Herbert
00efeb7cc6 Fix spawning too many sprites due to not yet populated sizing 2020-05-13 19:19:58 +09:00
Bartłomiej Dach
942cc48e99 Improve mascot scaling 2020-05-12 20:26:11 +02:00
Dean Herbert
e28e89213f Fix incorrect spawning when scale adjustments are applied to child sprites 2020-05-12 16:58:47 +09:00
Dean Herbert
c04f2b0840 Reposition taiko playfield to be closer to the top of the screen 2020-05-12 15:51:59 +09:00
Dean Herbert
c7d8793c1d Remove unnecessary overlap 2020-05-12 15:44:14 +09:00
Dean Herbert
949e17cc0e Rework scroller to support backwards playback 2020-05-12 15:23:47 +09:00
Dean Herbert
3b1680583e Fix taiko scroller not following gameplay time 2020-05-12 11:31:08 +09:00
Bartłomiej Dach
e5821ff2b2 Integrate GameplayBeatmap changes 2020-05-11 22:53:05 +02:00
Dean Herbert
77041bdbb5 Move implementation to DrawableHit to avoid "breaking" legacy encoding 2020-05-11 16:29:50 +09:00
smoogipoo
b0ed39f32b Do not use statics 2020-05-11 14:57:47 +09:00
smoogipoo
779af48802 Resolve errors + auto-format 2020-05-11 14:53:42 +09:00
smoogipoo
d613888803 Add initial changes 2020-05-11 14:50:02 +09:00
Craftplacer
43342c57b8
Fix switch case
... caused by a poor merge
2020-05-11 07:13:06 +02:00
Dan Balasescu
d697de29a6
Merge branch 'master' into taiko-don 2020-05-11 13:24:27 +09:00
Dean Herbert
b4d790c076 Fix taiko sample mapping for strong hits 2020-05-11 12:53:54 +09:00
Dean Herbert
8243dc239a
Merge branch 'master' into taiko-don 2020-05-10 22:34:47 +09:00
Dean Herbert
5902cd81a4 Move passing transforms to post-load for safety 2020-05-10 07:52:54 +09:00
Dean Herbert
3565fe1cb2 Fix incorrect passing logic 2020-05-10 07:51:39 +09:00
Dean Herbert
115cbf25ae Fix new sprites not getting spawned with correct passing state 2020-05-08 19:15:19 +09:00
Dean Herbert
1a31e1f10f Also check for AffectsCombo to avoid too many passing switches 2020-05-08 19:13:41 +09:00
Dean Herbert
cea6be5e52 Expose as JudgementResult instead of "passing" state 2020-05-03 23:55:44 +09:00