1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 08:42:55 +08:00
Commit Graph

1837 Commits

Author SHA1 Message Date
Dean Herbert
88b3bf06e8 Merge branch 'master' into add-bundle-header 2020-12-16 13:40:15 +09:00
Dan Balasescu
48805a82f9
Merge branch 'master' into taiko-strong-state-refactor 2020-12-15 11:46:52 +09:00
Dan Balasescu
52d9864818
Merge pull request #11179 from bdach/swell-rewind-crash
Fix swells crashing on rapid seeks in editor
2020-12-15 11:21:37 +09:00
Bartłomiej Dach
523e803440 Fix swells crashing on rapid seeks in editor 2020-12-15 00:28:00 +01:00
Bartłomiej Dach
2051f49f78 Ensure correct initial state of taiko bar lines 2020-12-14 21:58:17 +01:00
Bartłomiej Dach
512549b4ea Rename DrawableTaikoStrong{-> able}HitObject 2020-12-14 21:47:31 +01:00
Bartłomiej Dach
5af1ac1b53 Rename TaikoStrong{-> able}HitObject 2020-12-14 21:46:02 +01:00
Bartłomiej Dach
7ba04a2cc3 Merge branch 'master' into taiko-strong-state-refactor 2020-12-14 21:44:50 +01:00
Dean Herbert
1793385e96 Pass a score to the replay recorder to allow reading more general scoring data 2020-12-14 16:52:14 +09:00
Dean Herbert
7041503063 Avoid intermediary delegate 2020-12-14 15:34:32 +09:00
Bartłomiej Dach
ea09cbddc6 Register bar line pool & use in drawable ruleset 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
a8e86a20e1 Unify bar line types & prepare for pooling 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
f83c5fa81d Add backing bindable for major field 2020-12-13 22:12:26 +01:00
Bartłomiej Dach
beee9b89d5 Change bar line SHOC to nested playfield 2020-12-13 22:12:26 +01:00
Bartłomiej Dach
080f7a3e32 Add/fix up xmldocs with clarifications 2020-12-13 14:39:32 +01:00
Bartłomiej Dach
091b08b507 Scope drawable nested hits more closely to models 2020-12-13 14:38:16 +01:00
Bartłomiej Dach
61c488cd5e Create HO-specific nested hit types 2020-12-13 13:08:32 +01:00
Bartłomiej Dach
4d444df6b3 Rename DHO CreateStrong{-> Nested}Hit 2020-12-13 13:08:32 +01:00
Bartłomiej Dach
b1635ecd16 Reflect can-be-strong split in DHO structure 2020-12-13 13:08:30 +01:00
Bartłomiej Dach
f74567e8eb Introduce base class for hitobjects that can be strong 2020-12-13 12:36:39 +01:00
Bartłomiej Dach
1ddc896b76 Rename Strong{-> Nested}HitObject 2020-12-13 12:34:14 +01:00
ekrctb
c70b13ecc2 Adjust namespace 2020-12-07 12:30:25 +09:00
ekrctb
f78bd7c739 Move piece files of Taiko ruleset 2020-12-07 12:29:14 +09:00
smoogipoo
5760e1c1fc Make HitSampleInfo immutable 2020-12-01 15:37:51 +09:00
Bartłomiej Dach
5fbe1823a0
Merge branch 'master' into editor-beat-snap-always 2020-11-30 18:39:22 +01:00
Dean Herbert
c17d67bc7d Merge branch 'master' into editor-beat-snap-always 2020-11-30 18:34:38 +09:00
smoogipoo
8f48389f89 Merge branch 'master' into improve-dho-time-offsets 2020-11-30 18:01:48 +09:00
Dean Herbert
f29aa9c4fc Move taiko barlines to their own ScrollingHitObjectContainer to avoid being considered as a selectable object 2020-11-27 14:35:12 +09:00
Dean Herbert
9811c46e35 Rename application method to better describe what it actually does 2020-11-26 19:16:18 +09:00
smoogipoo
0414e5c550 Add MaximumJudgementOffset to DrawableHitObject, use in more places 2020-11-26 01:12:42 +09:00
Bartłomiej Dach
827a089810
Merge branch 'master' into change-taiko-ez 2020-11-22 13:29:02 +01:00
Bartłomiej Dach
80d81c3044
Reword taiko easy mod description to fit others better
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2020-11-16 20:24:04 +01:00
Bartłomiej Dach
128adce017 Merge branch 'master' into change-taiko-ez 2020-11-16 19:37:47 +01:00
PercyDan54
017a6b7153
Fix checks 2020-11-16 18:22:17 +08:00
PercyDan54
d7acfd5413
Remove retires from ModEasy 2020-11-16 18:15:15 +08:00
Dean Herbert
dc38aeac43 Remove unnecessary local definition of colour logic from taiko judgement 2020-11-16 17:23:02 +09:00
Bartłomiej Dach
7736d1ae85 Fix taiko-specific missing cases 2020-11-15 15:41:58 +01:00
PercyDan54
3406b0d74f
Fix checks 2020-11-15 14:54:04 +08:00
PercyDan54
cf7ac6d5e3
Remove import 2020-11-15 13:38:21 +08:00
PercyDan54
a4b20d2117
Make EZ mod able to fail in Taiko 2020-11-15 13:00:07 +08:00
smoogipoo
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
Bartłomiej Dach
1f83769bb2 Inline empty explosion in legacy transformer 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
0d5cac89b3 Explicitly set lifetime to ensure empty drawables are cleaned up 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
21709ba4bc Do not lookup default kiai explosion if skin has own 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
00a486ab51 Reintroduce KiaiHitExplosion as skinnable 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
81c9663e76 Move {-> Default}KiaiHitExplosion 2020-11-12 18:29:22 +09:00
Dean Herbert
0cadb31947 Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-05 17:07:52 +09:00
Dean Herbert
a3dc1d5730 Update existing implementations 2020-11-04 17:14:23 +09:00
Dean Herbert
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
Dean Herbert
3adf451e82 Handle changes via SamplePoints list for simplicity 2020-11-02 14:40:40 +09:00
Dean Herbert
bfa6ae1b66 Fix taiko drum not correct handling sample / group point changes
Closes https://github.com/ppy/osu/issues/10642
2020-11-02 14:40:40 +09:00
Dan Balasescu
1b53e6c782
Merge branch 'master' into sample-lookup-improvements 2020-11-02 13:04:35 +09:00
Dean Herbert
2ec2749cb4 Fix taiko lookup logic 2020-10-30 11:59:41 +09:00
Dean Herbert
3ea27e23e8 Update namespace references 2020-10-29 15:20:10 +09:00
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
Dean Herbert
ff1d63060d Add and consume passing state in GameplayBeatmap 2020-05-01 20:08:18 +09:00
Dean Herbert
3033ab80ce Add passing/failing test 2020-05-01 19:49:30 +09:00
Dean Herbert
6ff31fb786 Fix sizing when gameplay scale is adjusted 2020-05-01 19:49:23 +09:00
Dean Herbert
510df8b282 Improve tiling logic 2020-05-01 19:49:01 +09:00
Dean Herbert
afcb45f28b Move to playfield 2020-05-01 19:48:31 +09:00
Dean Herbert
8955b98cbb Add basic taiko scroller implementation 2020-05-01 17:56:09 +09:00
Bartłomiej Dach
d021e213b2 Reword comment 2020-05-01 00:29:03 +02:00
Bartłomiej Dach
1e7b10320f Adjust mascot positioning in playfield layout 2020-05-01 00:19:12 +02:00
Bartłomiej Dach
f5526890cc Add comment about animation presence 2020-04-30 22:51:22 +02:00
Bartłomiej Dach
db4c8b2ba5 Fix transition out of clear state 2020-04-30 22:16:25 +02:00
Bartłomiej Dach
5cfc05e12a Ensure correct initial state 2020-04-30 22:03:39 +02:00
Bartłomiej Dach
22fde8d2a0 Implement partial clear transition logic 2020-04-30 21:58:05 +02:00
Dan Balasescu
68efdd145d
Merge pull request #8909 from peppy/fix-legacy-explosion-rewind
Fix skinned taiko hit explosions not being removed on rewind
2020-04-30 21:00:41 +09:00
Dean Herbert
d0a8c0fa71 Add kiai support to osu!taiko skinned playfields 2020-04-30 16:43:00 +09:00
Dean Herbert
48af4d4eb4 Fix skinned taiko hit explosions not being removed on rewind 2020-04-30 16:18:15 +09:00
Dean Herbert
49a98fde73 Move to non-legacy class 2020-04-30 09:57:14 +09:00
Dean Herbert
783dc58ef0 Move taiko additive blending locally to avoid applying to legacy skins 2020-04-30 09:41:56 +09:00
Bartłomiej Dach
b0e97793b6 Implement transitions into and from clear state 2020-04-30 00:14:27 +02:00
Bartłomiej Dach
0d917ca339 Ensure correct behaviour for clear animation 2020-04-29 21:52:09 +02:00
Bartłomiej Dach
9d6720e7e6 Scope up parameter 2020-04-29 21:30:13 +02:00
Bartłomiej Dach
e81d33dcec Refactor mascot animations to split logic paths 2020-04-29 21:27:02 +02:00
Bartłomiej Dach
6e2ed0c4f3 Refactor mascot to only contain state transitions 2020-04-29 20:28:46 +02:00
Dean Herbert
48733a7e2f Change taiko hit explosion animation to match stable for skins 2020-04-29 17:53:37 +09:00
Bartłomiej Dach
5f0a4103c2 Merge branch 'master' into taiko-don 2020-04-28 23:46:42 +02:00
Dan Balasescu
79e1b16119
Merge branch 'master' into taiko-explosion-skinning 2020-04-28 12:17:09 +09:00
Dean Herbert
84641765c5 Adjust exceptions and fix capitalisation 2020-04-28 11:08:19 +09:00
Craftplacer
6de6f068fd Merge branch 'taiko-don' of https://github.com/Craftplacer/osu into taiko-don 2020-04-27 23:19:22 +02:00
Craftplacer
74d36cad78 Change state variables 2020-04-27 23:19:18 +02:00
Craftplacer
96660b2cca Flip frame count check 2020-04-27 23:18:40 +02:00
Craftplacer
834eeb6d98 Reduce duplicate texture retrieval code 2020-04-27 23:18:26 +02:00
Craftplacer
9b3c1e4126 Remove unused bindables 2020-04-27 23:17:52 +02:00
Craftplacer
5caa4dedc2
Update osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:27:03 +02:00
Craftplacer
c049302650
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:23:04 +02:00
Dean Herbert
be59ee945a Add taiko hit explosion skinning support 2020-04-27 22:36:27 +09:00
Craftplacer
e8a0b77729 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-27 12:43:51 +02:00
Dean Herbert
ca055581af Fix taiko hit target alpha on legacy skins 2020-04-27 18:18:11 +09:00
Dean Herbert
52cf1e1859 Fix hit type not being provided and hit time offset not being considered 2020-04-27 16:48:27 +09:00
Dean Herbert
b9f28c8373 Combine hit types and remove old drumroll hits using a more efficient method 2020-04-27 16:13:28 +09:00
Dean Herbert
ff736a22dd Fix typos in comment 2020-04-27 14:41:19 +09:00
Dean Herbert
1cd4fd2ac4
Merge branch 'master' into taiko-drumroll-party 2020-04-27 13:27:10 +09:00
smoogipoo
20ae973e4a Use max result instead of GOOD 2020-04-27 12:29:11 +09:00
smoogipoo
2630fc1405 Break instead of return for consistency 2020-04-27 12:27:43 +09:00
smoogipoo
7dc090cc24 Add support for hit explosions 2020-04-27 12:23:53 +09:00
smoogipoo
dd36b839b9 Refactor 2020-04-27 12:01:31 +09:00
Craftplacer
e830c7d833 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-27 02:13:09 +02:00
Craftplacer
d46643ec52 Rework special case for strong hits 2020-04-27 02:10:12 +02:00
Craftplacer
dc6acf6ec9 Various code changes, fixes 2020-04-27 01:40:57 +02:00
Dean Herbert
4ca7ce7715
Merge branch 'master' into taiko-barline-skinning 2020-04-25 18:58:44 +09:00
Tim Oliver
c1c930c472 Fixed linting warnings 2020-04-25 13:47:20 +08:00
Tim Oliver
2a197db481 Merge branch 'master' into taiko-drumroll-party
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-25 13:31:50 +08:00
Tim Oliver
3cc0b21eae Added more smart checking to removing rewound drumroll hits 2020-04-25 13:18:02 +08:00
Craftplacer
364f5bf788
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-24 22:57:23 +02:00
Tim Oliver
477fe72fcf Changed note playback to happen on new result 2020-04-25 00:15:59 +08:00
Tim Oliver
2be3a8184d Removed modifications to drum roll object 2020-04-25 00:15:37 +08:00
Dan Balasescu
b3175f9dfa
Merge branch 'master' into taiko-playfield-background-skinning 2020-04-24 19:27:38 +09:00
Dean Herbert
05b3db0147 Remove masking 2020-04-24 16:56:18 +09:00
Craftplacer
8ae119ab62 Fix last formatting error 2020-04-24 08:05:57 +02:00
Craftplacer
84aa37d7c3 Fix all local tests 2020-04-24 07:57:16 +02:00
Craftplacer
ac44185f09 Fix formatting 2020-04-24 07:09:20 +02:00
Craftplacer
dbf39be607 Decide on the name "Mascot", add testing, bug fixed, etc. 2020-04-24 06:59:05 +02:00
Craftplacer
6de08db653 Add removed skin component back 2020-04-24 02:50:47 +02:00
Craftplacer
bbe831698c Remove unused code 2020-04-24 02:50:33 +02:00
Craftplacer
608596c3b3 Rename DefaultTaikoDonTextureAnimation to TaikoDonTextureAnimation 2020-04-24 02:50:10 +02:00
Tim Oliver
029d15f2a2 Fixed syntax warning for playfield children 2020-04-23 20:14:39 +08:00
Tim Oliver
1fa3764a1d Cleaned up Update method in Taiko Playfield 2020-04-23 18:26:53 +08:00
Tim Oliver
c059588a09 Removed un-needed unproxy method 2020-04-23 18:26:40 +08:00
Tim Oliver
dded4f8176 Fixed syntax warnings in Taiko playfield 2020-04-23 18:17:31 +08:00
Tim Oliver
f1ae8af581 Removed un-needed using directives 2020-04-23 18:16:05 +08:00
Tim Oliver
a9897ba627 Moved proxy behaviour to drumroll container 2020-04-23 18:15:12 +08:00
Tim Oliver
b471a240cc Fixed merge typo in playfield members 2020-04-23 16:59:56 +08:00
Dean Herbert
12f156dcec Add taiko barline skinning support 2020-04-23 14:32:48 +09:00
Dean Herbert
b4e1ad81d0 Fix alignment of right half of legacy input drum 2020-04-23 13:48:08 +09:00
Dean Herbert
f804be25d1 Remove incorrect area sizing (now using fillmode / relative instead) 2020-04-23 13:39:44 +09:00
Dean Herbert
559487b205 Move playfield background implementation to its own file 2020-04-23 13:23:49 +09:00
Dean Herbert
4032d66959 Apply same legacy scale adjust logic to TaikoLegacyHitTarget 2020-04-23 13:17:46 +09:00
Dean Herbert
61d2580e1c Fix gap to left of InputDrum on legacy skins 2020-04-23 13:07:38 +09:00
Dean Herbert
2e022fbcb5 Add comment about padding update computation 2020-04-23 12:49:53 +09:00
Dean Herbert
49568a3d56 Adjust input drum to work with new playfield changes 2020-04-23 12:49:53 +09:00
Dean Herbert
37f7e0a734 Restructure TaikoPlayfield for better skin support 2020-04-23 12:49:53 +09:00
Dean Herbert
58bf288595 Remove DrawableHit's custom sizing logic
Turns out this was unnecessary and never actually being used.
2020-04-23 12:17:52 +09:00
Dean Herbert
ca56e6c0d2 Rename taiko HitTarget classes to avoid conflict with mania 2020-04-23 12:11:30 +09:00
Tim Oliver
81c51f0661 Merge branch 'master' into taiko-drumroll-party
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs
#	osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-22 23:15:48 +08:00
Tim Oliver
2600518b1b Moved drumroll container and removed rewound notes 2020-04-22 22:50:00 +08:00
Tim Oliver
26779a57b4 Exposed public ability to unproxy content 2020-04-22 22:49:30 +08:00
Craftplacer
8446fa98b5 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-22 15:21:54 +02:00
Craftplacer
617d27ace9 Restart branch 2020-04-22 15:19:29 +02:00
Tim Oliver
44405d4771 Moved result to load complete for flying hits 2020-04-22 15:50:23 +08:00
smoogipoo
ba12e23d9e Fix inspection 2020-04-22 09:06:04 +09:00
smoogipoo
d8fdd73e17 Implement IHasCurve on DrumRoll 2020-04-22 09:06:04 +09:00
Dean Herbert
bfc17bf4c0 Add taiko hit target skinning 2020-04-21 19:06:43 +09:00
Tim Oliver
5b4f69bb8c Moved flying hit objects to separate files 2020-04-20 13:32:51 +08:00
Dean Herbert
58a1c6e171 Reapply taiko visibility hack at a higher level 2020-04-17 19:52:58 +09:00
Dean Herbert
f36477e39d Add back "filled" property setting 2020-04-16 10:04:09 +09:00
Dean Herbert
bfc0d41c0c Add tick skinning support 2020-04-15 19:24:50 +09:00
Dean Herbert
07632cd1e5 Remove unnecessary container logic 2020-04-15 18:44:12 +09:00
Dean Herbert
3137417994 Add drumroll skinning 2020-04-15 18:03:23 +09:00
Dean Herbert
45d88b70f8 Split out base logic from LegacyHit into LegacyCirclePiece 2020-04-15 18:03:23 +09:00
Dean Herbert
eb165840cb Add remaining taiko hitobject skinnables and expose as SkinnableDrawable for safety 2020-04-15 18:03:23 +09:00
Andrei Zavatski
f4b5a17b65 Fix typo in DrawableTaikoHitObject 2020-04-15 07:00:38 +03:00
Dean Herbert
c3f0475748 Make CirclePiece abstract 2020-04-12 17:40:22 +09:00
Tim Oliver
412ac6121f Merge branch 'master' into taiko-drumroll-party 2020-04-12 15:36:07 +08:00
Tim Oliver
162a85042a Removed un-needed using 2020-04-12 10:38:22 +08:00
Tim Oliver
3ad36c7b84 Moved flying objects to use ignore hit judgements 2020-04-11 17:20:52 +08:00
Tim Oliver
1c0ad13d82 Added ignore hit object 2020-04-11 17:20:37 +08:00
Dean Herbert
3d5a622db7 Tidy up comments 2020-04-11 15:04:58 +09:00
Dean Herbert
63ebb7f80c Add support for taikobigcircle and fix exception on missing layers 2020-04-11 15:02:50 +09:00
Dean Herbert
96bf86099c Fix scaling of strong hits 2020-04-11 14:43:57 +09:00
Dean Herbert
dc56be0a1d Add support for skinned hits 2020-04-11 14:23:13 +09:00
Dean Herbert
009b138364 Prepare for skinnable versions 2020-04-11 14:19:59 +09:00
Dean Herbert
78db83fd0e Remove TaikoPiece class and localise kiai for now 2020-04-11 14:19:59 +09:00
Dean Herbert
7fba291134 Change inheritance of taiko hit pieces to better allow for skinning 2020-04-11 13:33:49 +09:00
Dean Herbert
d786a2c5b3 Add alignment support for skin versions older than 2.1 2020-04-08 19:42:31 +09:00
Dean Herbert
40267cb1fe Add test sprites and make alignment initially better 2020-04-08 19:42:31 +09:00
Tim Oliver
c30ea2ec29 Added content proxying to drull roll elements 2020-04-08 12:46:02 +08:00
Tim Oliver
b883586add Added logic to allow strong notes 2020-04-08 12:46:02 +08:00
Tim Oliver
7751c5e3aa Added separate scrolling track to display drum roll notes 2020-04-08 12:46:02 +08:00
Tim Oliver
9d5a977501 Added judgement forwarder to drumroll tick object 2020-04-08 12:46:02 +08:00
Tim Oliver
1057981c79 Added arbitrary hit handler to drum roll object 2020-04-08 12:46:02 +08:00
Tim Oliver
6e12f1b69b Added “instant fly” variant of hit notes 2020-04-08 12:46:02 +08:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor 2020-04-03 22:22:59 +09:00
Dean Herbert
d896d5a231 Rename filename to match class 2020-04-03 18:51:34 +09:00
Dean Herbert
0a7d9b930c Add osu!taiko legacy drum skinning support 2020-04-03 18:23:03 +09:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Dean Herbert
8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
Dean Herbert
800e395bc8 Merge branch 'master' into replay-recording 2020-03-25 20:20:59 +09:00
Dean Herbert
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert
96a849f897 Add remaining replay recorders 2020-03-24 14:55:49 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
Dean Herbert
546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
smoogipoo
e3a5be71cc Implement random mod for taiko 2020-03-23 12:09:30 +09:00
smoogipoo
5106d275ca Remove CentreHit/RimHit hitobject abstraction 2020-03-23 12:08:15 +09:00
Dean Herbert
5b8aaba4a6 Merge branch 'master' into fix-perfect-judgements 2020-03-06 00:18:05 +09:00
smoogipoo
bb4193d985 Fix taiko infinity health drain on some beatmaps 2020-03-02 13:25:04 +09:00
smoogipoo
da89798765 Merge remote-tracking branch 'origin/master' into layout-rework 2020-02-26 15:06:40 +09:00
smoogipoo
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
Dean Herbert
0e29d3c4a2 Correctly expire bar lines in osu!taiko and osu!mania 2020-02-23 13:50:05 +09:00
Dean Herbert
ffc7eaa3f2 Fix hitobjects with unknown lifetimes by enforcing non-null judgement
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.

This fixes BananaShower and JuiceStreams in osu!catch.

This also makes HitObject abstract and cleans up convert HitObject implementations.
2020-02-23 13:49:06 +09:00
Dean Herbert
cd6902a312 Make EndTime and RepeatCount settable 2020-02-05 17:52:51 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Albie Spriddell
3a903339d6 add playingverb and database migrations 2020-01-03 11:39:15 +00:00
smoogipoo
9c49da8942 Remove unnecessary extra "wait" frame 2020-01-03 16:24:39 +09:00
smoogipoo
97b4c65554 Fix taiko replay frames being mis-ordered 2020-01-03 16:24:29 +09:00
smoogipoo
cba6d9f7e6 Fix taiko samples not being loaded 2020-01-02 15:58:11 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00
Dean Herbert
b330aec03e Drain starting at the first hitobject, not gameplay start 2019-12-27 16:16:30 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain 2019-12-26 23:51:12 +09:00
smoogipoo
d45556eb6a Remove whitespace 2019-12-26 17:57:16 +09:00
smoogipoo
429272b864 Clean up + document taiko health processor 2019-12-26 15:28:30 +09:00
smoogipoo
e0c1072ab2 Add xmldocs 2019-12-26 15:01:19 +09:00
smoogipoo
eba6371526 Re-implement taiko's accumulating health processor 2019-12-26 15:01:19 +09:00
smoogipoo
522847987b Implement break/gameplay start times 2019-12-26 15:00:58 +09:00
smoogipoo
90cb9d9162 Simplify scoreprocesor/healthprocessor implementations 2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
Dean Herbert
0677f746aa Provide the ruleset to converter classes 2019-12-24 16:02:16 +09:00
Dean Herbert
a324bfbc2c Remove LegacyID from Ruleset 2019-12-24 13:48:27 +09:00
smoogipoo
6e7426a098 Simplify/improve beatmap conversion precheck 2019-12-23 17:44:18 +09:00
unknown
00ef2bd8d3 remove unused usings 2019-12-22 16:57:07 +08:00
unknown
fe73b9f8d3 make HP and OD generic and instantiate CS and AR to modes that need it 2019-12-22 16:45:32 +08:00
unknown
08b477ed52 make ModDifficultyAdjust abstract 2019-12-20 18:30:23 +08:00
smoogipoo
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings 2019-12-18 18:44:11 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
Dean Herbert
6e0802e50c Remove RulesetInfo parameter from Ruleset constructor 2019-12-18 14:49:09 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset (#7244)
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1 Move CreateScoreProcessor() to Ruleset 2019-12-17 20:08:13 +09:00
Huo Yaoyuan
40b43b85f1 CA1715: use prefix for generic parameters. 2019-12-17 13:00:25 +08:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
unknown
01c036b0b0 implement backing beats for nightcore mods 2019-12-15 16:56:02 +08:00
Huo Yaoyuan
ddb2cfc46d Use GetEndTime in Taiko and Mania 2019-12-14 18:16:13 +08:00
unknown
002a125b4a make ModDifficultyAdjust generic 2019-12-12 21:14:26 +08:00
Dean Herbert
37a94988a3 Merge branch 'improve-hud-hiding' into cinema-mod 2019-12-12 16:12:19 +09:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
unknown
b0cf44c3be fix appveyor issues 2019-12-11 20:12:29 +08:00
unknown
be3634cce1 remove ApproachRate setting 2019-12-11 20:02:23 +08:00
unknown
b795532aa5 add difficulty adjustment mods 2019-12-11 19:43:16 +08:00
smoogipoo
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
Huo Yaoyuan
6a58509f41 Fix format. 2019-12-03 20:59:42 +08:00
Huo Yaoyuan
9ddfdab27a Remove meaningless Convert calls. 2019-12-03 20:47:00 +08:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan
9425e80a5d Unify to use double in performance calculators. 2019-11-26 18:34:23 +08:00
Albie Spriddell
3b9f59cb33 add cinema mod support 2019-11-23 17:34:53 +00:00
Albie Spriddell
20edaf4ba6 add cinema mod support 2019-11-23 17:32:16 +00:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
608785b99a Update .Net Standard projects to 2.1 2019-11-18 18:35:58 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
smoogipoo
6fc1be64c2 Make hitobject samples a bindable list 2019-11-08 14:04:57 +09:00
Huo Yaoyuan
bcf8e3a9d4 Remove redundant properties from desktop projects.
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be Normalize .props 2019-10-30 21:54:14 +08:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
smoogipoo
f429a8f7c2 Add back/obsolete old AddNested() method 2019-10-17 14:02:08 +09:00
smoogipoo
d8f3678c3c Rename parameter 2019-10-17 12:53:54 +09:00
smoogipoo
d49ef6a36b Make taiko use the new nested hitobject structure 2019-10-17 11:57:00 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Bartłomiej Dach
8efab559c8 Remove unused using directives 2019-09-25 01:13:42 +02:00
Bartłomiej Dach
9323df26a1 Decouple bar line hitobjects from generator
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.

This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
624e5644a4 Change osu!catch key trigger to occur on frame before positional change 2019-09-13 23:06:35 +09:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames 2019-09-13 19:23:15 +09:00
Dean Herbert
9fc60aeefc Merge branch 'master' into reset-dho-lifetimes 2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2 Move expire to DrawableHitObject 2019-09-12 19:29:08 +09:00
Dean Herbert
acdfeef1dc Improve how osu!catch stores and replays key actions 2019-09-12 18:33:46 +09:00
Dean Herbert
af3bb5a2cd Centralise and share bar line generation code between rulesets 2019-09-10 13:30:54 +09:00
Dean Herbert
6cdc87bd29 Fix allowed results omissions 2019-09-06 15:37:20 +09:00
Dean Herbert
f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
smoogipoo
5efd455ce4 Fix taiko sample namespace 2019-09-04 12:47:10 +09:00
Dean Herbert
40c61894ef Update some case sensitive resources lookups in-line with resources 2019-09-04 10:44:24 +09:00
Dean Herbert
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
smoogipoo
8302658186 Fix other potential nullref cases that rider missed 2019-09-02 18:31:33 +09:00
smoogipoo
4c150839c0 Fix potential diffcalc hitwindow nullref 2019-09-02 17:38:58 +09:00
smoogipoo
f3656475de Return null hitwindows for non-time-based objects 2019-09-02 16:10:30 +09:00
Dean Herbert
f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
Dean Herbert
13bb0676b1
Merge branch 'master' into fix-taiko-swell-tick-display 2019-09-02 13:47:04 +09:00
smoogipoo
1df422e591 Hide taiko swell ticks 2019-09-02 13:30:55 +09:00
smoogipoo
5b685c4cd2 Fix swell ticks having non-zero time offsets 2019-09-02 13:25:39 +09:00
Dean Herbert
70e417533f Update naming 2019-08-30 15:13:29 +09:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
smoogipoo
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
Dean Herbert
720908ba22
Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in
Fix osu! approach circles fading in too late
2019-08-28 20:25:49 +09:00
Dean Herbert
9a98f39f06 Share logic with other rulesets (and make default) 2019-08-28 18:12:47 +09:00
smoogipoo
7cc92e2fad Make taiko proxy containers use LifetimeManagementContainer 2019-08-28 13:20:28 +09:00
smoogipoo
3723c441d2 Merge remote-tracking branch 'origin/master' into fix-taiko-proxy-rewind
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
2019-08-27 17:42:45 +09:00
smoogipoo
2b22fd799d Use constant value for offset 2019-08-27 15:33:53 +09:00
smoogipoo
bc7a81e733 Add initial fade transform 2019-08-27 15:33:53 +09:00
smoogipoo
dba3679817 Fix DrawableSwell not proxying its content in time/correctly 2019-08-27 15:33:28 +09:00
smoogipoo
b85e62a6e2 Fix taiko proxies being removed on rewind 2019-08-27 15:24:49 +09:00
iiSaLMaN
0eef398ca7 Remove redundant using directive 2019-08-27 05:19:21 +03:00
iiSaLMaN
cd68d030bd Remove unnecessary UpdateState overrides 2019-08-27 05:04:34 +03:00
iiSaLMaN
843da26dba Use transform management for taiko hit objects 2019-08-27 05:03:56 +03:00
smoogipoo
d4a296f911 Slight refactoring 2019-08-26 17:45:12 +09:00
smoogipoo
fd4c6e08ca Merge remote-tracking branch 'origin/master' 2019-08-26 17:37:06 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Desconocidosmh
77e9e89fec Refactoring 2019-08-19 20:45:23 +02:00
Desconocidosmh
9bd844bf4d Make comment more informative 2019-08-19 19:54:22 +02:00
Desconocidosmh
9732f5d622 Add Swell to GetNextObject() check 2019-08-19 17:28:32 +02:00
Desconocidosmh
eb83e36e0f Make TaikoAutoGenerator unpress sooner 2019-08-19 17:15:08 +02:00
Desconocidosmh
b3556403aa Make GetNextObject() a virtual method 2019-08-19 16:18:25 +02:00
Desconocidosmh
aa3651f65e Change the logic so the last button gets unpressed instead of staying pressed forever 2019-08-15 19:45:10 +02:00
Desconocidosmh
386d788813 Change if-else to ternary if 2019-08-15 18:32:45 +02:00
Desconocidosmh
ba539abac7 Refactoring 2019-08-14 21:05:24 +02:00
Desconocidosmh
e567e81981 Refactoring 2019-08-14 20:10:52 +02:00
Desconocidosmh
f849b4ce54 Make autoplay unpress sooner, if needed 2019-08-14 19:49:32 +02:00
smoogipoo
8a64ab0384 Remove generics from IApplicableToBeatmap 2019-08-01 12:39:32 +09:00
Dean Herbert
c3b81bef4a Flip default to the preferred method going forward 2019-07-22 15:55:38 +09:00
Dean Herbert
9bed0094de Merge remote-tracking branch 'upstream/master' into android 2019-07-02 19:40:50 +09:00
Unknown
665da09ed7 disable HD for taiko 2019-07-01 09:45:14 +02:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
Shane Woolcock
17d103181c Merge branch 'master' into android 2019-06-18 20:05:14 +09:30
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
tangalbert919
6fd1eb5e08 Merge remote-tracking branch 'upstream/master' into android 2019-05-08 08:15:03 -05:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
smoogipoo
b59f23d094 Implement hp increase for taiko 2019-04-22 17:04:46 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes 2019-03-29 12:59:51 +09:00
Dean Herbert
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
Dean Herbert
785433bb74
Merge branch 'master' into universal-playfield-adjust 2019-03-29 11:25:54 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility 2019-03-29 11:15:34 +09:00
Dean Herbert
8642886ffa Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust 2019-03-29 00:39:51 +09:00
Dean Herbert
09a7950a3b Fix handlers for other rulesets 2019-03-28 15:09:06 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert
39df8cce19 Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
tangalbert919
00c659a5ca Merge all changes from 2019.321.0 to android 2019-03-20 11:00:27 -05:00
Dean Herbert
7b6d882ce6 Remove double-generic type 2019-03-20 11:29:16 +09:00
Dean Herbert
3b7a76aa4e Fix typo 2019-03-20 11:22:34 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2 Refactor RulesetContainer for readability 2019-03-19 20:21:31 +09:00
tangalbert919
e865ac2086 Merge remote-tracking branch 'origin/master' into android 2019-03-17 09:39:34 -05:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns 2019-03-13 18:17:42 +09:00
David Zhao
527b77b07d Make all inheritors of drawablejudgement use new method 2019-03-12 19:52:44 +09:00
Albert Tang
7f30fce3fe
Merge branch 'master' into android 2019-03-08 10:39:24 -06:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dean Herbert
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
tangalbert919
1e6cb3e7d8 Merge remote-tracking branch 'upstream/master' into android 2019-03-05 17:56:13 -06:00
LeNitrous
c271a3a781 remove ruleset specific mods 2019-03-04 17:36:44 +08:00
LeNitrous
ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
Dean Herbert
2c76a039ca
Remove unnecessary folder reference 2019-02-20 10:46:25 +09:00
smoogipoo
5ff890434c Add beatmap argument 2019-02-19 17:57:29 +09:00
smoogipoo
c264a9cc74 Fix mods not being populated 2019-02-19 17:46:40 +09:00
smoogipoo
0ef15f5bd5 Update with PopulateAttributes() removal 2019-02-19 17:45:16 +09:00
smoogipoo
7ba0d090fc Fix post-merge errors 2019-02-19 16:40:52 +09:00
smoogipoo
7f4643a83d Adjust naming 2019-02-18 14:55:39 +09:00
smoogipoo
46b979a412 Fix colour changes not being reset 2019-02-18 14:55:20 +09:00
smoogipoo
cb17cbcdc4 Fix taiko nullrefing 2019-02-18 14:54:35 +09:00
smoogipoo
25d85b6eb4 Implement new difficulty calculator for Rulesets.Taiko 2019-02-18 14:54:21 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
smoogipoo
aa0bb7ca11 Add taiko difficulty calculator tests 2019-02-15 14:44:26 +09:00
tangalbert919
7349a6c527 Merge remote-tracking branch 'upstream/master' into android 2019-02-12 20:41:54 -06:00
HoLLy
ae9d5f999c Use correct DifficultyAttributes where possible 2019-02-06 21:28:42 +01:00
Dean Herbert
2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00
tangalbert919
80006109a2 Merge remote-tracking branch 'upstream/master' into android 2019-01-29 18:13:43 -06:00
LeNitrous
03e57d0423 fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp 2019-01-26 20:15:19 +08:00
LeNitrous
0f8c5bcbd7 actually the last whitespace 2019-01-26 13:50:27 +08:00
LeNitrous
73dbf5712d add license headers 2019-01-26 13:43:27 +08:00
LeNitrous
1427c9f576 trim whitespaces 2019-01-26 13:11:08 +08:00
LeNitrous
c6e26a92ec add wind up and wind down mods 2019-01-26 12:15:45 +08:00
Dean Herbert
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
tangalbert919
5835ccc04c Merge changes up to 2019.108.0 2019-01-08 17:53:57 -06:00
Shane Woolcock
a267a1a085 Merge branch 'master' into samah-ios 2019-01-08 17:09:26 +10:30
Dean Herbert
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics 2019-01-08 11:26:12 +09:00
tangalbert919
47268898be Expose internals for Android test projects 2019-01-06 00:04:25 -06:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
aec3753863 Fix imported replays having excess statistics 2019-01-03 14:01:20 +09:00
Shane Woolcock
32ffcb9865 Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
a83bee9461 Add ruleset visual tests 2018-12-29 20:05:37 +10:30
smoogipoo
b64932f6db Implement hit windows 2018-12-27 22:39:15 +09:00
Ivan Pavluk
d8b409f81f Merge branch 'master' of https://github.com/pavlukivan/osu 2018-12-12 17:18:32 +07:00
Ivan Pavluk
28b033bd99 Autodetect LowestSuccessfulHitResult 2018-12-12 17:15:59 +07:00
Ivan Pavluk
77e0d7ed8e
Fix formatting 2018-12-12 07:57:37 +00:00
Ivan Pavluk
e49e2fda9e Rename SuccessfulHitResult->LowestSuccessfulHitResult 2018-12-12 13:24:58 +07:00
Ivan Pavluk
a2d1c2c096
Fix formatting 2018-12-10 05:05:03 +00:00
Ivan Pavluk
839e177d2a
Docstring change 2018-12-10 04:59:35 +00:00
Ivan Pavluk
8457324044 SuccessfulHitWindow->SuccessfulHitResult 2018-12-10 09:04:12 +07:00
Ivan Pavluk
94f01b6678 Remove unused using directives 2018-12-06 20:05:03 +07:00
Ivan Pavluk
394c038c33 Removed unnecessary JudgementResult casts 2018-12-06 19:52:16 +07:00
Ivan Pavluk
407f9d2e78 Comment cleanup 2018-12-06 19:33:42 +07:00
Ivan Pavluk
cb2444e01c Remove Meh from TaikoHitWindows 2018-12-06 19:04:54 +07:00
Ivan Pavluk
8cae549541 Remove unused TaikoScoreProcessor constants 2018-12-06 15:58:03 +07:00
Ivan Pavluk
1b6658f4ee Move HealthIncreaseFor to Judgement 2018-12-06 15:09:42 +07:00
Ivan Pavluk
b5277de3f4
Remove extra newline 2018-12-06 14:08:32 +07:00
Ivan Pavluk
6d7e71c003 Fix switch stetement order 2 2018-12-05 16:28:36 +07:00
Ivan Pavluk
6c38db04ee Fix switch statement order in taiko judgements 2018-12-04 21:48:22 +07:00
Ivan Pavluk
f2b806d303 Remove swell miss HP from TaikoScoreProcessor 2018-12-04 21:36:43 +07:00
Ivan Pavluk
1975e11fcc Yet Another Whitespace Fix 2018-12-04 21:28:36 +07:00
Ivan Pavluk
7d692939fc Fixed being able to miss taiko objects by hitting them too early
Revamped taiko HP system
2018-12-04 21:20:44 +07:00
Ivan Pavluk
fbb7dc4507
Merge branch 'master' into master 2018-12-01 00:38:24 +07:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Ivan Pavluk
743598a1ac Decrease taiko swell HP drain 2018-11-30 01:33:04 +07:00
Ivan Pavluk
6b07d4581a Fixed too strong HP drain 2018-11-30 01:07:15 +07:00
Ivan Pavluk
4184f17709 ...Revert AffectsHP->AffectsHp, add HP abbrev 2018-11-29 23:12:02 +07:00
Ivan Pavluk
13a166a645 rename TaikoJudgement.AffectsHP to AffectsHp 2018-11-29 22:26:23 +07:00
Ivan Pavluk
d30ab4f77c fixed whitespace 2018-11-29 22:12:01 +07:00
Ivan Pavluk
2ca9864301 Fixed taiko swell hp and scoring 2018-11-29 22:05:13 +07:00
Ivan Pavluk
a378c50544
Fix TaikoDrumRollJudgement visibilityy 2018-11-29 09:47:12 +07:00
Ivan Pavluk
ce1e6d93e4
Update TaikoScoreProcessor.cs 2018-11-29 09:45:57 +07:00
Ivan Pavluk
00a243f7f2 Add license header 2018-11-29 09:19:41 +07:00
Ivan Pavluk
17337e05a1
Fixed whitespace 2018-11-29 09:06:40 +07:00
Ivan Pavluk
36b458bdee Fixed #3777 2018-11-29 08:56:19 +07:00
smoogipoo
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
08ffa18936 Fix nullref 2018-11-19 17:05:51 +09:00
Dean Herbert
a57f98ed4d
Merge branch 'master' into fix-taiko-lifetimes 2018-11-19 08:41:19 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
smoogipoo
e207dd728b Fix taiko proxies not receiving the correct lifetimes 2018-11-15 20:26:12 +09:00
jorolf
f0f7b15edc
remove unused using 2018-11-15 00:45:27 +01:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
jorolf
023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo
a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
smoogipoo
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
Dean Herbert
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
Dean Herbert
e09e38148b
Merge branch 'master' into fix-scroll-speeds 2018-10-12 18:25:24 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00
smoogipoo
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup 2018-10-02 09:37:04 +09:00
smoogipoo
08bd363827 Adjust taiko scrolling speed 2018-10-01 18:15:55 +09:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc Move judgement text to internal container 2018-09-30 04:01:33 -04:00
smoogipoo
3479bfa409 Rename variable 2018-09-28 17:18:34 +09:00
smoogipoo
5f61faa2d9 Fix multiple hits in the same frame pressing multiple hitobjects 2018-09-25 18:37:25 +09:00
smoogipoo
0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
Hanamuke
309d8c8cb4 CI 2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
smoogipoo
2bc827fa0c Fix taiko beatmap conversion attempting to make strong swells 2018-08-22 11:32:00 +09:00
smoogipoo
7c3556baf8 Throw exception when Swell.IsStrong is set 2018-08-15 09:12:29 +09:00
smoogipoo
8be5a606bf Fix swells possibly being strong hitobjects 2018-08-14 18:33:07 +09:00
smoogipoo
b045f5c9b6 Adjust filename 2018-08-14 14:32:06 +09:00
smoogipoo
1a35506386 Cleanup strong hit construction 2018-08-14 14:29:49 +09:00
smoogipoo
732dfde8ed DrawableStrongHandler -> DrawableNestedStrongHit 2018-08-14 14:28:40 +09:00
smoogipoo
7971d06df1 Remove AlwaysPresent 2018-08-14 14:27:47 +09:00
smoogipoo
5c4c2dff09 Fix strong hits not being visualised 2018-08-06 13:01:27 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo
3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
smoogipoo
38263714a1 Cleanups 2018-08-03 16:56:46 +09:00
smoogipoo
412e4ff681 Fix display of swells 2018-08-03 16:49:24 +09:00
smoogipoo
e6775c7a16 Fix playfield display 2018-08-03 16:46:03 +09:00
smoogipoo
19c541dbf5 Migrate swells to use nested hitobjects for ticks 2018-08-03 16:35:29 +09:00
smoogipoo
e8a140930e Migrate drum roll to use nested hitobjects for strong hits 2018-08-03 16:35:12 +09:00
smoogipoo
4494853446 Migrate DrawableDrumRoll to use a nested hitobject for strong hits 2018-08-03 16:20:08 +09:00
smoogipoo
fdf889359f Migrate DrawableHit to use a nested hitobject for strong hits 2018-08-03 16:19:37 +09:00
smoogipoo
2dff04392e Re-implement strong judgements via hitobject 2018-08-03 16:12:12 +09:00
smoogipoo
fa3c919e2e Fix up taiko judgement creation 2018-08-03 16:11:38 +09:00
smoogipoo
0da6c8c1a7 Remove unnecessary local variables 2018-08-02 22:20:07 +09:00
smoogipoo
a0887a600f Fix swells showing hit circles on intermediate judgements 2018-08-02 21:08:06 +09:00
smoogipoo
35b4ab5456 Introduce the concept of a "MainResult" 2018-08-02 21:07:40 +09:00
smoogipoo
9c2122c0ca Make Rulesets.Taiko use the new judgement result structure 2018-08-02 20:36:19 +09:00
smoogipoo
1b7b6f341c Migrate Rulesets.Taiko to the new judgement system 2018-08-02 16:09:04 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
ekrctb
c6816a6cf3 Fix potential quadratic complexity in taiko autoplay 2018-07-17 17:00:28 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
9f933187e9 Apply review feedback 2018-07-17 16:33:08 +09:00
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Roman Kapustin
2a72062c33 Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part. 2018-06-26 00:53:31 +03:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes 2018-06-25 19:53:22 +09:00
Dean Herbert
d4d9d20147
Merge branch 'master' into fix-taiko-rewind 2018-06-25 18:08:27 +09:00
Dean Herbert
5e6634cd00
Merge branch 'master' into fix-taiko-rewind 2018-06-25 17:10:53 +09:00
Dean Herbert
d7133f059d Fix incorrect implementation 2018-06-25 16:53:12 +09:00
Dean Herbert
63448dc9dc
Merge branch 'master' into master 2018-06-25 16:33:08 +09:00
smoogipoo
185789bc7f Remove unused variable 2018-06-25 16:13:15 +09:00
Dan Balasescu
26d9e3cc10
Merge branch 'master' into fix-taiko-rewind 2018-06-25 16:08:52 +09:00
smoogipoo
70e9f7cb8d Always proxy taiko hits when hit 2018-06-25 15:55:09 +09:00
nl-tatatat
09b2025fad
Update TaikoRulesetContainer.cs
Remove code that I am almost 100% sure that makes barlines every 1/1 instead of 4/1.
2018-06-24 04:48:38 -05:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
566d125658 Change order of default initialisation to look better in settings 2018-06-21 14:28:40 +09:00
smoogipoo
48989df6eb Make sure that 0 SR is returned when there are no hitobjects 2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes 2018-06-21 09:26:50 +09:00
Tom Arrow
d753df65a5 Remove default bindings for right actions 2018-06-19 18:04:53 +02:00
Dean Herbert
5b344525e1 Move proxy state check to base class 2018-06-18 00:27:18 +09:00
smoogipoo
4575319102 Privatise the proxied content 2018-06-17 17:56:46 +09:00
smoogipoo
99ef44eca2 Merge remote-tracking branch 'origin/master' into fix-taiko-proxies 2018-06-17 17:54:50 +09:00
Dean Herbert
f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes 2018-06-15 18:29:20 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +09:00
Dean Herbert
30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions 2018-06-15 17:52:53 +09:00
smoogipoo
01dd2d7919 Move taiko difficulty attributes to TaikoDifficultyCalculator 2018-06-14 16:26:51 +09:00
smoogipoo
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo
33c7ce1bec Adjust TaikoDifficultyCalculator in-line with changes 2018-06-14 15:47:42 +09:00
Joehu
b182635aae Fix taiko nightcore regression 2018-06-12 20:21:37 -07:00
smoogipoo
0f9c05d1e6 Fix taiko swells not properly rewinding 2018-06-11 22:32:08 +09:00
Dan Balasescu
1b12820de9
Restore a removed comment 2018-06-11 21:54:11 +09:00
smoogipoo
22dfe46572 Make taiko hitobject properly unproxy when rewound 2018-06-11 21:46:45 +09:00
smoogipoo
b6fb01440b Fix taiko hit states not being reverted on rewind 2018-06-11 20:44:26 +09:00
smoogipoo
8f3215f5a0 Make sure taiko hitexplosions expire and get removed 2018-06-11 20:42:04 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +09:00
smoogipoo
215cc9fba7 Change all performance calculators to use int hitwindows
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007 Remove 0.5 offsets
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
Dean Herbert
14d67e0b1e
Merge branch 'master' into fix-taiko-slider-multiplier 2018-05-18 11:39:24 +09:00
smoogipoo
3091d3a014 Implement the taiko performance calculator 2018-05-17 17:56:44 +09:00
smoogipoo
450d54eea9 Fix taiko difficulty calculator never considering mods 2018-05-17 17:56:37 +09:00
smoogipoo
b9ed976954 Fix taiko slider multiplier being applied twice 2018-05-17 14:44:30 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
smoogipoo
397d93660a Don't deep-clone beatmapinfo/control points 2018-05-17 13:17:33 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
smoogipoo
803200ff6a Apply similar changes to other rulesets 2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows 2018-05-15 17:33:27 +09:00
smoogipoo
7d027098ec Fix drumroll completions always giving GREAT judgements
Due to requiredgoodhits/requiredgreathits being calculated prior to nested hitobjects.
2018-05-14 14:13:07 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
faa82f17cc Pass original hitobject HitWindows during conversion 2018-05-11 15:30:50 +09:00
smoogipoo
7eb64ab590 Remove object counts from mania/taiko/catch 2018-05-07 15:51:08 +09:00
smoogipoo
accffda532 Add taiko statistics 2018-05-07 15:51:08 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
acbdbcc3df Update AssemblyInfo in line with framework changes 2018-04-06 13:17:26 +09:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked 2018-03-30 16:35:00 +09:00
Joseph Madamba
0887dafa2c Revert changes on hard rock mod 2018-03-29 20:36:52 -07:00
smoogipoo
187a025d36 Make hitobjects sorted by their start times 2018-03-29 16:07:31 +09:00
Dean Herbert
9aae568bbe Tidy up csproj further 2018-03-28 15:19:56 +09:00
Dean Herbert
9667d54ecb Add missing licence headers 2018-03-28 14:48:08 +09:00
Dean Herbert
0026b94cd3 Consolidate and move ruleset test projects 2018-03-28 14:41:25 +09:00
Dean Herbert
1a8aa87469 Make everything better 2018-03-27 18:56:54 +09:00
Dean Herbert
b290d2d039 Move NUnit includes to individual projects 2018-03-27 15:07:09 +09:00
smoogipoo
dd5bbbbd9f Define testable projects 2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce Fix SQLite failing to initialize on test projects 2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6 Only compile with net461 in visual studio 2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498 Add msbuild/dotnet build + launch targets 2018-03-26 10:52:54 +09:00
smoogipoo
31920f1866 Fix ruleset resources not getting included in build 2018-03-25 02:12:01 +09:00
smoogipoo
d28de89e50 Add net461 target to test projects for nunit discovery
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632).
2018-03-25 01:35:50 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
cb3d0db555 Move combo colours completely out of HitObjects 2018-03-20 15:50:12 +09:00
smoogipoo
20acc601bb Fix up breaking taiko changes 2018-03-16 16:10:09 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Dean Herbert
b62ed004f2 Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert
7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
smoogipoo
df84b23847 Fix possible nullref when there are 0 drumroll ticks 2018-03-05 21:19:40 +09:00
smoogipoo
7ce3e60722 Fix drumrolls giving GOOD judgements too one tick too late 2018-03-05 21:19:36 +09:00
smoogipoo
c013f83267 Restore IgnoreAttribute 2018-03-05 17:01:27 +09:00
smoogipoo
88c33e31e8 Add slider conversion testcases 2018-03-05 16:01:45 +09:00
smoogipoo
63155f169e Fix incorrect taiko slider conversions due to beatlength adjustments
Fixes ppy/osu#2152 .
2018-03-05 15:12:15 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
smoogipoo
a2c239d5e3 Rename to IBeatmapConverter, move to separate file 2018-03-02 20:19:47 +09:00
smoogipoo
71755f5363 Prettyfy some JSON 2018-03-02 20:12:29 +09:00
smoogipoo
820a852caf Remove unnecessary .osu properties 2018-03-02 18:37:38 +09:00
smoogipoo
cdca7371a3 Replace testcases with a basic test suite 2018-03-02 18:20:33 +09:00
smoogipoo
1f21ccffb0 Add lenience to start times 2018-03-02 18:20:12 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases 2018-03-02 16:04:32 +09:00
smoogipoo
3d5fefae8c Add TestFixtureAttribute to all tests 2018-03-02 15:34:31 +09:00
smoogipoo
6fff6da751 Ignore broken testcases 2018-03-02 14:01:34 +09:00
smoogipoo
573d6d1b5f Allow multiple mappings to be generated for a single hitobject 2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd Add beatmap parameter to beatmapconverter creation 2018-03-02 13:13:01 +09:00
smoogipoo
b2827d82d4 Add a taiko beatmap conversion test case 2018-03-02 13:13:01 +09:00