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

2061 Commits

Author SHA1 Message Date
smoogipoo
31fae045fa Update judgement processors with new hit results 2020-09-29 16:33:38 +09:00
smoogipoo
b1877b649b Use new hit results in mania 2020-09-29 16:33:38 +09:00
Dean Herbert
6095446f10 Fix autoplay generators failing on empty hitobjects lists 2020-09-28 15:38:54 +09:00
smoogipoo
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
Morilli
9c041dbac2 Fix mania scrollspeed slider precision 2020-09-15 08:24:01 +02:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
Dean Herbert
a65f564e45 Add icons for other ruleset editors 2020-09-09 18:40:01 +09:00
smoogipoo
117c7ec6b2 Merge branch 'master' into score-recalc 2020-09-09 14:38:36 +09:00
Dean Herbert
4680728b9c Merge branch 'master' into update-dcc-exclusions 2020-09-07 18:01:44 +09:00
smoogipoo
c72a8d4755 Add zero-length slider test 2020-09-07 17:18:40 +09:00
smoogipoo
ecc9c2957f Avoid float precision error in mania conversion 2020-09-07 16:30:05 +09:00
smoogipoo
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
Dean Herbert
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00
Dean Herbert
72cb65c22f Update and add missing beatmap statistic icons to info wedge 2020-09-03 17:52:22 +09:00
Bartłomiej Dach
d419fe4dbf Remove note shaking mention that doesn't apply in mania 2020-08-31 12:03:05 +02:00
smoogipoo
acbeb5406f Add/improve xmldoc 2020-08-31 13:33:41 +09:00
smoogipoo
aa151e4cd7 Merge branch 'master' into mania-notelock 2020-08-31 13:31:41 +09:00
Dan Balasescu
bd2f863b56
Merge branch 'master' into legacy-mirror-mod-replays 2020-08-31 12:41:17 +09:00
Dean Herbert
cd0a73883d
Merge pull request #9945 from smoogipoo/skin-colour-fix-2
Exactly reproduce osu!stable skin colour alphas
2020-08-29 20:06:26 +09:00
Bartłomiej Dach
da82556f6b Add two-way legacy conversions for mirror mod 2020-08-29 11:49:17 +02:00
smoogipoo
85bda29b71 Add mania max combo attribute 2020-08-28 19:16:24 +09:00
Dean Herbert
da34544fdc
Merge branch 'master' into hold-note-lighting 2020-08-28 18:27:29 +09:00
Bartłomiej Dach
43d6d2b2e8 Add back unstable rate display 2020-08-27 20:46:49 +02:00
Bartłomiej Dach
f152e1b924 Revert IStatisticRow changes 2020-08-27 20:13:44 +02:00
Bartłomiej Dach
1a04ec5375 Merge branch 'master' into unstable-rate 2020-08-27 19:56:08 +02:00
smoogipoo
7002193165 Mark nullable members 2020-08-27 23:16:59 +09:00
smoogipoo
29b29cde8e Flip condition to reduce nesting 2020-08-27 23:09:54 +09:00
smoogipoo
7a5292936e Add some xmldocs 2020-08-27 21:15:05 +09:00
Bartłomiej Dach
a1f731d455
Merge branch 'master' into mania-keys-under-notes 2020-08-27 14:06:43 +02:00
smoogipoo
6f93df0b9d Fix ticks causing hold note misses 2020-08-27 21:05:12 +09:00
smoogipoo
deb172bb6c Implement basic mania hit order policy 2020-08-27 20:24:21 +09:00
Bartłomiej Dach
05e725d59f Add unstable rate statistic to rulesets in which it makes sense 2020-08-26 22:06:29 +02:00
Bartłomiej Dach
bbb3d7522e Scope up return type to IStatisticRow 2020-08-26 19:24:12 +02:00
smoogipoo
157e1d8965 Add fades 2020-08-26 20:46:12 +09:00
smoogipoo
6fe1279e9d Re-use existing inset container 2020-08-26 20:23:01 +09:00
smoogipoo
1db836e9e0 Merge branch 'master' into hold-note-lighting 2020-08-26 20:22:07 +09:00
smoogipoo
9372c6eef6 Implement hold note lighting 2020-08-26 20:21:56 +09:00
smoogipoo
d057f5f4bc Implement mania "KeysUnderNotes" skin config 2020-08-26 15:37:16 +09:00
smoogipoo
0800e43796 Remove padding from columns 2020-08-25 19:57:49 +09:00
smoogipoo
c09cef4fca Apply post-merge fixes to LegacyStageBackground 2020-08-25 19:40:17 +09:00
smoogipoo
8dde512657 Merge branch 'master' into skin-colour-fix-2 2020-08-25 19:39:01 +09:00
smoogipoo
ff72ccabd8 Rename method 2020-08-25 18:44:32 +09:00
Dean Herbert
940b4acf0d
Merge branch 'master' into fix-hittarget-layering 2020-08-25 15:44:38 +09:00
smoogipoo
ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
smoogipoo
723e5cafb6 Fix column potentially added at wrong indices 2020-08-25 14:49:04 +09:00
smoogipoo
018523a43a Rework to remove cross-class pollutions 2020-08-25 01:21:27 +09:00
smoogipoo
77bf646ea0 Move column lines to background layer 2020-08-24 23:01:06 +09:00
smoogipoo
500cb0ccf5 Fix legacy hit target being layered incorrectly 2020-08-24 22:36:37 +09:00
Dean Herbert
1f717c4b00
Merge branch 'master' into hold-note-freeze 2020-08-23 22:38:48 +09:00
Bartłomiej Dach
891f5cb130 Add padding to mania column borders to match stable 2020-08-21 20:00:20 +02:00
smoogipoo
08078b9513 Rename method to remove "InitialColour" namings 2020-08-22 00:56:29 +09:00
smoogipoo
454564b189 Update mania with legacy colour setters 2020-08-22 00:19:15 +09:00
smoogipoo
b3338347b7 Remove fade on successful hits 2020-08-21 23:56:27 +09:00
smoogipoo
8632c3adf0 Fix hold notes bouncing with SV changes 2020-08-21 23:11:15 +09:00
Dan Balasescu
42ee9b75df
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-21 19:38:59 +09:00
smoogipoo
aead13628b Rework freezing to use masking 2020-08-21 17:52:42 +09:00
smoogipoo
37cf7999b1 Merge branch 'master' into hold-note-freeze 2020-08-21 14:39:25 +09:00
smoogipoo
54a2322090 Use Array.Empty<> 2020-08-20 22:51:52 +09:00
smoogipoo
f1e0946603 Remove release samples in invert mod 2020-08-20 22:38:47 +09:00
Dean Herbert
f6ca31688e Fix incorrect spacing 2020-08-19 21:39:55 +09:00
Dean Herbert
37f40f4a09
Merge branch 'master' into mania-slidertick-lighting 2020-08-19 21:19:25 +09:00
Dean Herbert
74f8e61381
Merge branch 'master' into mania-body-recycling 2020-08-19 20:40:15 +09:00
Dean Herbert
3eac81eb52
Merge pull request #9891 from smoogipoo/mania-mod-invert 2020-08-19 19:12:02 +09:00
Dean Herbert
72f16eb186
Merge pull request #9905 from smoogipoo/fix-holdnote-tick-judgement 2020-08-19 19:07:38 +09:00
Dean Herbert
0184bee44d
Merge branch 'master' into mania-mod-invert 2020-08-19 18:41:32 +09:00
smoogipoo
1d9d885d27 Mask the tail as the body gets shorter 2020-08-19 01:40:26 +09:00
smoogipoo
4d4d9b7356 Add rewinding support 2020-08-19 01:37:31 +09:00
Jihoon Yang
474f245222 Replace nested loop with early return 2020-08-18 08:40:29 -07:00
Jihoon Yang
af8f727721 Disable LegacyHitExplosion for hold notes 2020-08-18 08:28:53 -07:00
smoogipoo
99315a4aa7 Fix incorrect anchors for up-scroll 2020-08-19 00:05:36 +09:00
smoogipoo
988ad378a7 Fix body size + freeze head piece 2020-08-19 00:05:05 +09:00
smoogipoo
da07354f05 Fix some judgements potentially giving wrong score 2020-08-18 19:51:16 +09:00
smoogipoo
385f7cf85d Implement mania hold note body recycling 2020-08-18 17:56:48 +09:00
Jihoon Yang
138dc5929e Changed MIN_TIME_RANGE as well 2020-08-18 01:46:41 -07:00
Jihoon Yang
4ddc04793f Changed MAX_TIME_RANGE instead of the single instance 2020-08-18 01:44:30 -07:00
smoogipoo
d157c42340 Increase density by not skipping objects 2020-08-18 17:40:44 +09:00
Jihoon Yang
628be66653 Updated calculation of mania scroll speed 2020-08-18 01:24:56 -07:00
smoogipoo
e1ed8554a1 Use yinyang icon 2020-08-18 17:23:11 +09:00
smoogipoo
583760100a Implement mania invert mod 2020-08-18 01:40:55 +09:00
smoogipoo
548ccc1a50 Initial implementation of hold note freezing 2020-08-18 00:29:00 +09:00
Dean Herbert
f139423786
Merge branch 'master' into mania-hitexplosion-pooling 2020-07-30 10:40:29 +09:00
smoogipoo
5df406a035 Add pooling for mania judgements 2020-07-29 16:41:10 +09:00
smoogipoo
00821e7b65 Re-implement support for small ticks 2020-07-29 16:14:19 +09:00
smoogipoo
7f2e554ad4 Fix animations not being reset 2020-07-29 15:52:25 +09:00
smoogipoo
0f1f4b2b5c Add pooling for mania hit explosions 2020-07-29 15:36:42 +09:00
smoogipoo
375dad0878 Increase PERFECT from 320 to 350 score 2020-07-28 17:59:52 +09:00
smoogipoo
f7cd6e83aa Adjust mania scoring to be 95% based on accuracy 2020-07-28 17:58:58 +09:00
Dan Balasescu
a640541324
Merge pull request #9612 from peppy/input-handler-updates
Input handler updates in line with framework changes
2020-07-22 20:30:32 +09:00
Dean Herbert
2c62b23d85 Update naming 2020-07-22 19:53:45 +09:00
smoogipoo
f044c06d08 Fix hold notes accepting presses during release lenience 2020-07-20 22:26:58 +09:00
Dean Herbert
648e414c14 Update InputHandlers in line with framework changes 2020-07-19 11:39:11 +09:00
Dean Herbert
56480d1665
Merge pull request #9538 from LastExceed/mania-fadein 2020-07-17 18:22:13 +09:00
smoogipoo
b3769112fb Fix mania hold note bodies behaving badly with edge alphas 2020-07-17 17:08:26 +09:00
smoogipoo
8d9e5db641 Use enum values instead of class override 2020-07-16 21:29:39 +09:00
smoogipoo
03a7b8a6ef Rename 2020-07-16 21:18:24 +09:00
smoogipoo
18d3685023 Pass in content 2020-07-16 21:17:51 +09:00
smoogipoo
967238e269 Add comment explaining scale 2020-07-16 17:47:00 +09:00
smoogipoo
74c7d9e67d Use WithChild 2020-07-16 17:42:37 +09:00
smoogipoo
02031cea01 Add newline 2020-07-16 17:42:37 +09:00
smoogipoo
84e2e5677a Add more info to xmldoc 2020-07-16 17:42:37 +09:00
smoogipoo
d546db0ec9 Fix default coverage 2020-07-16 17:35:00 +09:00
smoogipoo
b7f6ae5db9 Make the cover into a container 2020-07-16 17:26:48 +09:00
smoogipoo
1384e61747 Move cover to a separate file, rename 2020-07-16 17:26:34 +09:00
Dean Herbert
5049977395
Merge pull request #9578 from smoogipoo/accuracy-based-mania 2020-07-16 16:12:48 +09:00
smoogipoo
2b39857b8c Make mania 80% acc 20% combo 2020-07-16 14:10:52 +09:00
smoogipoo
1a6ae3194e Add test 2020-07-15 19:45:48 +09:00
LastExceed
d2e78d080c fix naming convention violation 2020-07-15 11:29:13 +02:00
LastExceed
4a2890c054 implement FI by flipping HD upside down 2020-07-15 11:15:47 +02:00
LastExceed
e12f02a634 simplify reversing using rotation 2020-07-15 11:07:30 +02:00
LastExceed
b43b1673cc fix leftover parameter name 2020-07-15 10:41:34 +02:00
LastExceed
f73fd7ffe9 read scroll direction from IScrollingInfo instead of config 2020-07-14 17:04:09 +02:00
LastExceed
3b7d52da09 rearrange LaneCover members 2020-07-14 16:48:14 +02:00
LastExceed
25fb49d59f bind laneCover direction to scroll direction 2020-07-14 16:44:29 +02:00
LastExceed
921939f97a extract coverage updating logic to separate method 2020-07-14 15:12:00 +02:00
LastExceed
fcda4d9f15 move lanecover implementation to ManiaModHidden 2020-07-14 15:06:15 +02:00
LastExceed
fec2594ac6 reverse LaneCover when playing up-scroll 2020-07-14 11:56:31 +02:00
LastExceed
ca39f2aa24 only insert BufferedContainer when using FI 2020-07-13 13:43:32 +02:00
LastExceed
3178217216 remove unnecessary import 2020-07-13 13:14:47 +02:00
LastExceed
4b3cffb246 expose hitObjectContainer in HitObjectArea 2020-07-13 11:55:13 +02:00
LastExceed
bdf680aecb inline single-use constants 2020-07-12 14:53:40 +02:00
LastExceed
3606febe31 fix case convention violation 2020-07-12 14:23:55 +02:00
LastExceed
1cf8b599a1 implement fadein 2020-07-12 13:57:44 +02:00
LastExceed
06ed5316c4 expose hitObectArea in Column 2020-07-12 13:57:36 +02:00
LastExceed
0e49bf127b wrap HitObjectContainer in BufferedContainer 2020-07-12 13:57:06 +02:00
Dean Herbert
bd5957bc0a Add dynamic compilation exclusion rules for ruleset types 2020-07-10 14:49:44 +09:00
Bartłomiej Dach
b37eb63579 Merge branch 'master' into mania-conversion-precision 2020-06-30 20:16:47 +02:00
Bartłomiej Dach
39cfbb67ad Replace iterated addition with rounding 2020-06-30 20:16:19 +02:00
Dean Herbert
e5a901cec7
Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-28 22:14:22 +09:00
Bartłomiej Dach
1551c42c12 Avoid division when slicing node sample list 2020-06-27 17:03:32 +02:00
Bartłomiej Dach
5e92809401 Add failing test case 2020-06-27 16:46:43 +02:00
Bartłomiej Dach
c47f762f24 Update test scene to allow checking samples 2020-06-27 16:45:39 +02:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Bartłomiej Dach
8233f5fbc4 Check skin option in skin transformers 2020-06-22 20:08:32 +02:00
smoogipoo
4d30761ce3 Fix 1M score being possible with only GREATs in mania 2020-06-22 19:52:23 +09:00
smoogipoo
988baad16f Expand statistics to fill more of the screen 2020-06-22 19:20:43 +09:00
smoogipoo
261adfc4e6 Create a local playable beatmap instead 2020-06-22 18:38:41 +09:00
smoogipoo
33fdd7466c Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-22 15:38:48 +09:00
Bartłomiej Dach
ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00
Dan Balasescu
9c7031965f
Merge branch 'master' into mania-element-lookup-refactor 2020-06-21 22:36:53 +09:00
Dean Herbert
26f049ab16
Merge pull request #9330 from smoogipoo/reduce-mania-hp-drain
Reduce mania's HP drain by 20%
2020-06-21 19:58:15 +09:00
smoogipoo
44925b3951 Reduce mania's HP drain by 20% 2020-06-21 18:05:26 +09:00
smoogipoo
19eb6fad7f Make hold note ticks affect combo score rather than bonus 2020-06-21 17:42:17 +09:00
mcendu
ca555a6a52 rename per-column skin config retrieval to GetColumnSkinConfig
Removed parameter "index"; all these cases should use extension instead
2020-06-20 14:56:39 +08:00
mcendu
8298a2c8a9 inline stage light lookup and clarify behavior 2020-06-20 14:53:25 +08:00
smoogipoo
486b899e8f Rename method 2020-06-19 22:11:29 +09:00
smoogipoo
81ad257a17 Add timing distribution to mania ruleset 2020-06-19 21:18:58 +09:00
mcendu
9a0a1ba0df correct logic of hasKeyTexture determination 2020-06-13 23:12:15 +08:00
mcendu
ffae73a966 let retrievals outside mania skin components use extension
https://github.com/ppy/osu/pull/9264#discussion_r439730321
2020-06-13 23:07:04 +08:00
mcendu
bd7b7b5017 make all former LegacyManiaElement subclasses use extension method
Remove LegacyManiaElement
2020-06-13 23:06:25 +08:00
mcendu
308ec6a491 add extension method for mania skin config retrieval 2020-06-13 23:05:57 +08:00
Dean Herbert
8402d4a5f3 Remove newline 2020-06-13 21:18:56 +09:00
mcendu
4eeb22ca18 rename a few variables and fix typo 2020-06-13 18:47:40 +08:00
mcendu
5655e090d1 revert movement of is mania skin check statements 2020-06-13 18:45:06 +08:00
mcendu
aa476835e7 tidy up code 2020-06-13 11:31:34 +08:00
mcendu
7c3e7b65a8 add custom file path support for osu\!mania judgement sprite 2020-06-12 21:22:22 +08:00
Bartłomiej Dach
896177801a Avoid creating copies of node samples every time 2020-06-05 00:07:27 +02:00
Bartłomiej Dach
c4cae006aa Correctly slice node sample list when converting 2020-06-04 22:47:39 +02:00
Bartłomiej Dach
ac019bddd6 Only play samples at start of hold note in mania maps 2020-06-04 22:33:34 +02:00
Bartłomiej Dach
35544ede50 Add failing test cases 2020-06-04 22:33:30 +02:00
Dan Balasescu
a8b137bb71
Merge pull request #9123 from peppy/move-setter-to-duration
Move setter from EndTime to Duration
2020-06-01 16:52:38 +09:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
b9464a2aa8
Merge branch 'master' into editor-create-composer-fix 2020-06-01 15:38:15 +09:00
smoogipoo
d7e0391b5f Merge branch 'master' into i-has-curve-with-repeats 2020-06-01 14:27:43 +09:00
Dean Herbert
0ef971be28 Merge branch 'master' into i-has-curve-with-repeats 2020-05-31 22:30:18 +09:00
mcendu
b06017dbf1
supress horizontal scaling of left-and-right stages 2020-05-31 11:28:54 +08:00
Dean Herbert
e8b43e8e1f Merge branch 'master' into move-setter-to-duration 2020-05-29 16:04:23 +09:00
Dean Herbert
8fa8c561e7 Pass hitobjects as a parameter to CreateBlueprintContainer 2020-05-29 12:20:50 +09:00
Dean Herbert
6be5917eb0 Remove necessity for custom mania interface caching 2020-05-27 23:15:16 +09:00
Dean Herbert
919ff92d15 Remove unused resolved composer 2020-05-27 22:56:12 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
6b5b215299 Split out IHasPath from IHasCurve to better define hitobjects 2020-05-26 17:44:47 +09:00
Dan Balasescu
b5de30ef3d
Merge branch 'master' into editor-scrolling-playfield-support 2020-05-26 14:46:58 +09:00
Dean Herbert
0cc6d6d97c
Merge pull request #9033 from smoogipoo/applydefaults-cancellation
Add cancellation token support to CreateNestedHitObjects()
2020-05-26 12:04:06 +09:00
Dean Herbert
827345ed88 Fix mania offsets 2020-05-25 22:06:02 +09:00
Dean Herbert
e7442ec3a2 Remove need for ManiaSnapResult 2020-05-25 19:33:03 +09:00
Dean Herbert
2c16619ecd Move time to position conversion to ScrollingHitObjectContainer 2020-05-25 19:32:39 +09:00
Dean Herbert
b8130bd366 Make mania selection blueprint abstract 2020-05-25 19:31:09 +09:00
smoogipoo
bc35bc5efb Merge branch 'master' into applydefaults-cancellation 2020-05-25 16:45:30 +09:00
Dean Herbert
ce35d09e7d Fix incorrect alpha application to lines on rewinding 2020-05-22 12:45:37 +09:00
Dean Herbert
d529a2aefa Remove left-over function 2020-05-22 12:28:01 +09:00
Dean Herbert
b2667bbb02 Move protected implementation down 2020-05-22 11:45:58 +09:00
Dean Herbert
6de2597958 Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-22 11:27:36 +09:00
Dean Herbert
8a105bdbcf Remove unused ColumnAt method 2020-05-22 11:23:39 +09:00
Dean Herbert
7dd3b3eeb5 Remove unused method 2020-05-21 15:16:59 +09:00
Dean Herbert
a756e6d212 Add xmldoc and remove unnecessary parameter 2020-05-21 15:16:30 +09:00
Dean Herbert
ce8b6b7383 Correctly account for blueprint origins 2020-05-21 15:15:24 +09:00
Dean Herbert
a9a1c00cf1 Move responsibility placement blueprint's StartTime set to within 2020-05-21 14:50:33 +09:00
Dean Herbert
bac78707de Move more logic to column to both clean things up and fix tests 2020-05-21 14:25:37 +09:00
Dean Herbert
5ad7842b91 Move ScreenSpacePositionAtTime to inside Column implementation 2020-05-21 13:33:02 +09:00
Dean Herbert
94bb59db0d Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-21 12:50:49 +09:00
Dean Herbert
83a5913b8d Undo beat snapping related changes 2020-05-21 12:12:21 +09:00
Dean Herbert
69db62b78a Combine implementation of time-to-position lookup 2020-05-20 21:42:21 +09:00
Dean Herbert
63b5f1a376 Remove unnecessary IRequireHighFrequencyMousePosition 2020-05-20 21:14:20 +09:00
Dean Herbert
e3cec9cf6c Simplify column assignment 2020-05-20 21:13:08 +09:00
Dean Herbert
7c9fbb6fcf Split out classes 2020-05-20 21:03:03 +09:00
Dean Herbert
19e2da9c73 Fix down scrolling giving incorrect positioning data 2020-05-20 21:01:29 +09:00
Dean Herbert
26fb779f4d Move remaining positioning logic local to hold note blueprint 2020-05-20 21:01:29 +09:00
Dean Herbert
2f78866dfb Move positioning out of mania blueprints 2020-05-20 21:01:29 +09:00
Dean Herbert
62092e3f5b Propagate mania column in SnapResult 2020-05-20 21:01:29 +09:00
Dean Herbert
82d6549161 Pass down snap result and remove local TimeAt usage 2020-05-20 21:01:29 +09:00
Dean Herbert
970bd86d2e Remove local TimeAt usage in mania placement 2020-05-20 21:01:29 +09:00
Dean Herbert
23bf0d000e Implement mania beat snapping support 2020-05-20 21:01:19 +09:00
Dean Herbert
ffb8d48fc3 Fix osu!mania editor placement regressions 2020-05-20 21:01:03 +09:00
Dean Herbert
c46bfc2532 Create SnapResult class to hold various snapping results 2020-05-20 21:00:47 +09:00
Dean Herbert
3354d48a38 Change snapping to be screen space coordinate based 2020-05-20 21:00:29 +09:00
Dean Herbert
0bc3073d49 Fix test failures 2020-05-20 15:01:32 +09:00
Dean Herbert
d31a59b074 Fix logic results in infinite loop on default timing point return 2020-05-20 14:55:36 +09:00
Dean Herbert
4f83bb679b Merge branch 'master' into mania-distance-snap-grid 2020-05-20 11:44:19 +09:00
Dean Herbert
85156c62ef Add xmldoc and address some code quality concerns 2020-05-19 23:05:08 +09:00
Dean Herbert
c28a9bdb80 Move load method up 2020-05-19 23:02:20 +09:00
Dean Herbert
a6f3dc53f7 Fix time value not being updated for next timing point 2020-05-19 23:01:36 +09:00
Dean Herbert
d56466e2b9 Add very basic pooling of grid lines 2020-05-19 19:07:35 +09:00
Dean Herbert
406f39e8bf Construct online visible lines 2020-05-18 21:27:26 +09:00
Dean Herbert
b35b150f38 Simplify colouring logic 2020-05-18 19:48:51 +09:00
Dean Herbert
16e85ae0b1 Remove Grid class 2020-05-18 17:52:04 +09:00
Dean Herbert
d9bb90078b Move grids to inside columns 2020-05-18 17:47:52 +09:00
Dean Herbert
3e81d6d55f
Merge pull request #9053 from smoogipoo/fix-possible-ppcalc-exception
Fix possible exceptions in performance calculators
2020-05-18 16:37:33 +09:00
smoogipoo
1865cd0762 Fix possible exceptions in performance calculators 2020-05-18 15:10:59 +09:00
Bartłomiej Dach
76c5be7bc1 Disallow catch-specific judgements in mania 2020-05-17 17:16:22 +02:00
smoogipoo
4719fcc291 Actually use the cancellation token 2020-05-15 18:17:39 +09:00
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
smoogipoo
238d87f976 Add comment about gray usage 2020-05-15 15:56:32 +09:00
smoogipoo
1c6c128d11 Add const 2020-05-15 15:51:54 +09:00
smoogipoo
392d44e1fb Always fully display one beat 2020-05-15 15:49:50 +09:00
smoogipoo
4cbd51feb9 Fix test errors 2020-05-15 13:08:15 +09:00
smoogipoo
3441ab457d Fix hitobjects placed at non-beatsnapped times 2020-05-14 20:06:34 +09:00
smoogipoo
0e33494074 Fix flashing when changing beat divisor 2020-05-14 19:58:39 +09:00
smoogipoo
42c3d892cd Only update alive lines 2020-05-14 19:55:14 +09:00
smoogipoo
91d1b15d5a Integrate grid with the mania composer 2020-05-14 19:55:07 +09:00
smoogipoo
16585f767e Add initial beat snap grid implementation 2020-05-14 19:17:24 +09:00
smoogipoo
0ef3bae26a Expose playfield from IManiaHitObjectComposer 2020-05-14 18:34:51 +09:00
smoogipoo
78f1b230e9 Disable right-click placement in the mania editor 2020-05-13 14:43:50 +09:00
Dean Herbert
064e5004ed
Merge branch 'master' into fix-mania-selection 2020-04-29 17:15:48 +09:00
smoogipoo
4f332ace14 Use 0 length 2020-04-29 14:27:21 +09:00
smoogipoo
0c95d11fdb Remove unnecessary value change binding 2020-04-29 13:27:33 +09:00
Dan Balasescu
024f10a494
Use non-generic bindable
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-29 13:24:31 +09:00
smoogipoo
1aaab40228 Fix mods affecting mania scroll speed 2020-04-28 19:34:02 +09:00
smoogipoo
ff3928465c Add xmldoc 2020-04-28 18:58:29 +09:00
smoogipoo
db12fafc2c Update comment 2020-04-28 18:58:29 +09:00
smoogipoo
ff24a15760 Fix vertical drag in down-scroll scenarios 2020-04-28 18:36:24 +09:00
smoogipoo
7d54d4b800 Improve test scene 2020-04-28 18:36:10 +09:00
smoogipoo
f93291e25b Remove unused override 2020-04-28 18:35:22 +09:00
smoogipoo
a7a680b486 Fix horizontal drag not working 2020-04-28 18:34:55 +09:00
smoogipoo
e5131400e7 Remove now unnecessary position manipulation 2020-04-28 18:34:39 +09:00
smoogipoo
3eb7c8755c Cleanup 2020-04-28 15:34:41 +09:00
smoogipoo
330521a2ae Fix lifetime override not working 2020-04-28 15:34:10 +09:00
smoogipoo
7342e00151 Convert positions to local HOC coordinate space 2020-04-28 14:00:14 +09:00
smoogipoo
cebc0fc046 Attempt to fix multiple selection movements 2020-04-27 20:35:24 +09:00
smoogipoo
b88dd44252 Fix movement not working correctly in down-scroll 2020-04-27 19:47:25 +09:00
smoogipoo
acf95fca9c Remove old, now unnecessary method 2020-04-27 17:14:15 +09:00
smoogipoo
7f5a1d7f44 Merge branch 'master' into fix-mania-selection 2020-04-27 17:09:40 +09:00
Dean Herbert
59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders
Implement legacy beatmap encoding for all rulesets
2020-04-24 17:49:34 +09:00
smoogipoo
2b0deec491 Finish note placement on mouse down 2020-04-24 13:20:41 +09:00
smoogipoo
4ebb28d3e7 wip 2020-04-23 17:52:54 +09:00
smoogipoo
0a840a2613 Fix mania not getting its own selection handler 2020-04-23 17:41:33 +09:00
smoogipoo
12c235027d Remove stale file 2020-04-23 13:28:27 +09:00
smoogipoo
4f0b5a34d3 Fix hold note placement body sized incorrectly 2020-04-23 12:53:23 +09:00
smoogipoo
22d2607ff5 Only commit if placement is active 2020-04-23 12:53:09 +09:00
smoogipoo
c59096a941 Fix note placement 2020-04-23 12:36:40 +09:00
smoogipoo
58af75ad57 Add back missing line 2020-04-22 13:45:12 +09:00
smoogipoo
6da0872ae5 Use the last node sample for the tail note 2020-04-22 09:06:04 +09:00
smoogipoo
1f962f5c56 Reword comment 2020-04-22 09:06:04 +09:00
smoogipoo
cc0c82aaeb Implement IHasXPosition on ManiaHitObject 2020-04-22 09:06:04 +09:00
smoogipoo
d957614fc9 Cleanup handling of mania samples 2020-04-22 09:06:04 +09:00
smoogipoo
0a2b585c65 Apply missing scale 2020-04-21 17:14:49 +09:00
Dean Herbert
4c689c6ad2 Add constant for max stage keys 2020-04-21 10:56:04 +09:00
smoogipoo
4e271ff46f Add support for 10K mod + 20K dual stages 2020-04-20 21:28:36 +09:00
smoogipoo
5d96d67226 Add special key definition just for sanity 2020-04-20 14:40:37 +09:00
smoogipoo
b881293b98 Allow 10k to be played on a single stage 2020-04-20 14:08:23 +09:00
smoogipoo
e534d59c80 Use another argument exception 2020-04-15 13:08:15 +09:00
Dean Herbert
d47e414fb1 Apply review feedback (unroll inner loop / xml fixes) 2020-04-15 12:35:43 +09:00
Dean Herbert
7f95418262 Fix osu!mania replays actuating incorrect keys when multiple stages are involved 2020-04-14 16:52:17 +09:00
Dean Herbert
c51bad0e35 Cache ManiaPlayfield instead 2020-04-13 13:42:21 +09:00
Dean Herbert
cdff6060d3 Remove recursive hierarchy traversal for mania sample balance 2020-04-13 13:01:27 +09:00
Dean Herbert
65b96079a0 Move dampening to base implementation and change range to 0..1 2020-04-13 13:01:02 +09:00
Fire937
22d89dbff7 Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback 2020-04-12 01:46:32 +02:00
Fire937
f274ec297c Add positional sound support for all rulesets
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
2020-04-12 01:33:25 +02:00
Dean Herbert
12c21cba7e Add missing masking specification 2020-04-11 15:20:27 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
smoogipoo
d13231eff7 Use ctor for default width 2020-04-08 18:23:24 +09:00
smoogipoo
83db6cebb6 Implement bottom stage image 2020-04-08 16:20:54 +09:00
smoogipoo
cd15b672eb Implement left and right stage images 2020-04-08 16:20:47 +09:00
smoogipoo
e429c274a9 Initial structure 2020-04-08 15:35:37 +09:00
Dean Herbert
9db996a91f Increase size of default osu!mania skin's keys to allow clearance with HUD 2020-04-08 14:13:31 +09:00
Dean Herbert
3794b55eef Rename ManiaStage to Stage 2020-04-08 14:13:31 +09:00
Dean Herbert
2062087155
Merge branch 'master' into more-mania-colours 2020-04-07 23:36:42 +09:00
Dean Herbert
9ff4458fd6
Merge branch 'master' into mania-skin-note-images 2020-04-07 22:41:22 +09:00
Dean Herbert
2118998243
Merge pull request #8653 from smoogipoo/better-mania-scrollspeed
Fix inconsistent scroll speeds in mania
2020-04-07 22:38:55 +09:00
smoogipoo
11d58fb7f6 Implement column background and light colours 2020-04-07 16:53:55 +09:00
smoogipoo
9fd73492ca Implement judgement line colour 2020-04-07 16:53:55 +09:00
smoogipoo
9cfeb60afc Fix missed speed removal in mania 2020-04-07 16:30:58 +09:00
smoogipoo
3ecb99462f Make note height scale by minimum column width 2020-04-07 16:07:18 +09:00
smoogipoo
707a6269b3 Fix incorrect key texture lookup 2020-04-06 19:03:37 +09:00
Dean Herbert
cfa2404626 Remove explicit specification of new default 2020-04-06 12:39:49 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed 2020-04-03 23:25:14 +09:00
Dean Herbert
eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed 2020-04-03 22:47:53 +09:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor 2020-04-03 22:22:59 +09:00
smoogipoo
23b7cde941 Add milliseconds value alongside 2020-04-03 18:38:04 +09:00
smoogipoo
1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
Dean Herbert
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
smoogipoo
b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
smoogipoo
571748d105 Add some xmldocs + nullable parameter 2020-04-03 12:31:05 +09:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Dean Herbert
f919a2f267
Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 23:57:03 +09:00
Dan Balasescu
0f5fd8051c
Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 23:08:31 +09:00
Dean Herbert
c35dd0153d
Merge branch 'master' into mania-column-line-colour 2020-04-02 23:03:22 +09:00
Dean Herbert
bff58f36e5
Merge pull request #8563 from smoogipoo/expand-mania-vertically
Expand mania to fit vertical screen bounds
2020-04-02 23:01:56 +09:00
smoogipoo
47e2ff5ce6 Fix incorrect frame length for hit explosions 2020-04-02 22:56:30 +09:00
Dean Herbert
e1a9a76e01
Merge pull request #8564 from smoogipoo/fix-holdnote-texturing
Fix hold note animation not being reset
2020-04-02 22:42:47 +09:00
Dean Herbert
8f2a3578bd Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 21:59:01 +09:00
smoogipoo
62f1bc276d Add skinning support for column line colour 2020-04-02 18:10:17 +09:00
smoogipoo
9552319732 Fix hold note animation not being reset 2020-04-02 17:09:08 +09:00
smoogipoo
5aa4c4f3cb Remove corner radius 2020-04-02 16:10:09 +09:00
smoogipoo
7ba533b7a4 Expand mania to fit vertical screen bounds 2020-04-02 16:04:09 +09:00
mcendu
dae738d6a4
add todo entries 2020-04-02 14:58:31 +08:00
smoogipoo
62f6683a20 Remove unnecessary generic 2020-04-02 15:57:50 +09:00
smoogipoo
c8d161e03a Fix explosion expiry 2020-04-02 15:57:02 +09:00
mcendu
f3b96f8f50
add fallback to normal note image 2020-04-02 14:29:30 +08:00
smoogipoo
de7ee57100 Fix adding null hit explosions 2020-04-02 15:27:31 +09:00
smoogipoo
fa3a449c3b Implement legacy normal hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo
b375a02cff Cleanup positioning factor definition 2020-04-02 14:37:29 +09:00
smoogipoo
c8eee8d204 Add structure for legacy hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo
94031b57ea Split hit explosion positioning from column 2020-04-02 14:37:29 +09:00
Dean Herbert
1446b0782b
Merge branch 'master' into mania-existence-check 2020-04-01 23:11:09 +09:00
Dean Herbert
312f94d810
Merge pull request #8541 from smoogipoo/fix-default-explosion-position
Fix incorrect explosion position on default skin
2020-04-01 21:46:58 +09:00
Dan Balasescu
33119d38ad
Merge branch 'master' into fix-default-explosion-position 2020-04-01 20:03:23 +09:00
smoogipoo
f4d8defa48 Fix incorrect explosion position on default skin 2020-04-01 20:01:35 +09:00
Dean Herbert
aac7915eab
Merge branch 'master' into fix-column-light-position 2020-04-01 19:46:33 +09:00
smoogipoo
558feade87 Fix ci warnings 2020-04-01 18:19:11 +09:00
smoogipoo
59eac34d82 Fix barlines scrolling at different speeds in legacy skins 2020-04-01 18:00:17 +09:00
smoogipoo
ff2c5b446e Fix column lights positioned incorrectly 2020-04-01 16:06:09 +09:00
Dean Herbert
9de348235e Add comment about legacy fallback widths 2020-04-01 15:30:51 +09:00
mcendu
87e5e98cae
use GetAnimation for checking 2020-04-01 14:17:23 +08:00
smoogipoo
2d6d1a8cc6 Implement column width and column spacing 2020-04-01 13:38:03 +09:00
mcendu
716c7fa07a
Add check to detect whether mania is skinned 2020-04-01 11:04:29 +08:00
smoogipoo
bb5fa472dc Remove null-stage fallback 2020-04-01 11:59:34 +09:00
mcendu
44fcd2613f
Add support for special column 2020-03-31 22:58:04 +08:00
mcendu
c9a81e7f71 Merge branch 'column-type3' into mania-skinning-refactor 2020-03-31 22:33:27 +08:00
mcendu
ff499b7d6b
fix indent 2020-03-31 19:12:02 +08:00
mcendu
df2379fb0e
remove unnecessary using 2020-03-31 18:10:43 +08:00
mcendu
3e0991d350
fix indent 2020-03-31 18:00:56 +08:00
mcendu
d41ff8c4b4
remove Column field from LegacyHitTarget 2020-03-31 17:58:29 +08:00
mcendu
ecc305bb63
extract superclass for all mania skinning elements 2020-03-31 17:54:51 +08:00
mcendu
977e1a3bfe
split shortcut into two methods 2020-03-31 17:48:37 +08:00
mcendu
71fc240aee
make mania skin elements use new method 2020-03-31 17:32:05 +08:00
mcendu
ec3d21e2b7
convert older elements to LegacyManiaColumnElement
Also added xmldoc for new shorthand method.
2020-03-31 17:18:53 +08:00
mcendu
5179635b2d
add shorthand method for config retrieval 2020-03-31 17:08:05 +08:00
smoogipoo
3cd353d387 Fix possible nullrefs 2020-03-31 16:57:58 +09:00
smoogipoo
1952fcc0ce Implement mania hold note skinning 2020-03-31 16:42:35 +09:00
smoogipoo
11430d616e Allow null hitobject 2020-03-31 16:00:08 +09:00
smoogipoo
b805ed6bf1 Flip anchors and origins 2020-03-31 15:59:52 +09:00
smoogipoo
9a37a328b6 Add component overrides for hold note head/tail 2020-03-31 15:39:00 +09:00
smoogipoo
c4f76ffdaf Implement mania note skinning 2020-03-31 15:29:25 +09:00
smoogipoo
ae668e3e87 Fix post-merge errors 2020-03-31 15:24:13 +09:00
smoogipoo
211a8db4c5 Merge branch 'mania-key-area-skinning' into mania-note-skinning 2020-03-31 15:23:59 +09:00
smoogipoo
538dc0c558 Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning 2020-03-31 15:20:56 +09:00
smoogipoo
1a858c602a Merge branch 'mania-column-background-skinning' into mania-note-skinning 2020-03-31 15:20:14 +09:00
smoogipoo
16439f7d8e Fix incorrect fallback index being used 2020-03-31 15:15:49 +09:00
smoogipoo
4b05f7ff27 Merge branch 'mania-skinning-testability' into mania-key-area-skinning 2020-03-31 15:11:32 +09:00
smoogipoo
75e43acb1a Add a legacy element to help with texture fallbacks 2020-03-31 15:11:08 +09:00
mcendu
2008a7bbec
fix naming 2020-03-31 14:03:11 +08:00
mcendu
3fb044c3b6
rm unnecessary usings 2020-03-31 12:09:04 +08:00
mcendu
323146e4a6
simplify column type check logic 2020-03-31 11:53:17 +08:00
smoogipoo
71387016b2 Add missing judgement line 2020-03-31 12:26:31 +09:00
smoogipoo
02237133cb Implement mania hit target skinning 2020-03-31 12:17:44 +09:00
smoogipoo
cb1513b374 Add mania key area skinning 2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8 Implement column background skinning 2020-03-31 10:57:56 +09:00
smoogipoo
a8f7d7ea42 Add structure for mania configuration lookups 2020-03-30 23:21:40 +09:00
smoogipoo
c3cde7a163 Combine files 2020-03-30 23:21:40 +09:00
smoogipoo
c1789140d5 Prepare skin transformer for mania components 2020-03-30 23:21:40 +09:00
smoogipoo
6ff2273b64 Make column + stage cached 2020-03-30 23:21:40 +09:00
Dean Herbert
f75c082601 Fix osu!mania replays recording incorrectly when key mod applied 2020-03-27 15:50:11 +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
9f73b2960d Prevent unnecessary auto-size computations in mania 2020-03-02 20:08: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
0fe41fd50a Fix blueprint showing even when mouse outside of container 2020-02-13 09:03:48 +09:00
Dean Herbert
e31d69c749 Add commit status to EndPlacement; call BeginPlacement on initial movement 2020-02-07 18:02:48 +09:00
Dean Herbert
cd6902a312 Make EndTime and RepeatCount settable 2020-02-05 17:52:51 +09:00
Dean Herbert
bd7c137394 Remap osu!mania dual stage key bindings to be more ergonomic 2020-01-26 18:34:43 +09:00
Dean Herbert
289be7a17b Merge branch 'i-beat-snapping' into timeline-maybe 2020-01-23 15:45:33 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
Dean Herbert
6dd50572d2 Break mania more 2020-01-21 17:37:43 +09:00
Dean Herbert
bd96cf94a6 Begin refactoring SelectionBlueprint to handle non-drawable HitObjects 2020-01-21 12:47:14 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-20 17:08:59 +09:00
Dean Herbert
d57f55f053 Apply remaining changes required to restore previous functionality 2020-01-15 19:09:49 +09:00
mcendu
5d160376c0
nullable-ize Mod.Icon 2020-01-14 21:22:00 +08:00
mcendu
76c70a7622 Move hit target bar height def to defaulthittarget 2020-01-11 21:19:46 +08:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
smoogipoo
dfa6575f75 Adjust mania HP increase values 2020-01-07 15:24:33 +09:00
mcendu
a897f497a2
remove LaneGlowPiece and GlowPiece 2020-01-04 18:35:37 +08:00
Albie Spriddell
3a903339d6 add playingverb and database migrations 2020-01-03 11:39:15 +00:00
Dean Herbert
ee332e0d42 Split out BlueprintContainer functionality further 2020-01-02 18:21:16 +09:00
mcendu
20c5748342 Use hitTarget in place of stageHint 2019-12-29 23:37:28 +08:00
mcendu
51000765dd remove override 2019-12-29 23:29:00 +08:00
mcendu
61fb9f5613 Remove class StageHint and usage 2019-12-29 23:18:50 +08:00
mcendu
cdfbe96e9b Make AccentColour of StageHint virtual 2019-12-29 14:52:51 +08:00
mcendu
5d2b5cc950 correct type of field stageHint 2019-12-28 14:05:46 +08:00
mcendu
bf162f148e Move mania stage hint to its own class 2019-12-28 13:48:10 +08:00
Dean Herbert
3a5015d013
Merge branch 'master' into fix-hold-note-input 2019-12-27 21:48:38 +09:00
Dean Herbert
aa97487f8e
Merge branch 'master' into hp-drain 2019-12-27 14:58:22 +09:00
Dean Herbert
cfa1dfa1a4 Split out into own method 2019-12-27 11:37:05 +09:00
Dean Herbert
5260eb76d0 Merge remote-tracking branch 'upstream/master' into mania-judgement 2019-12-27 11:17:47 +09:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain 2019-12-26 23:51:12 +09:00
Dean Herbert
32843ffef5
Merge branch 'master' into fix-hold-note-input 2019-12-26 23:50:53 +09:00
mcendu
92dd1ade17
Attempt to implement mania-specific sprites 2019-12-26 21:03:21 +08:00
smoogipoo
d45556eb6a Remove whitespace 2019-12-26 17:57:16 +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
63c96d5a83 Fix tail note not properly capping result 2019-12-23 18:49:08 +09:00
smoogipoo
d6fd1007c4 internal -> public 2019-12-23 18:48:14 +09:00
smoogipoo
7ac6f68de8 Rewrite hold note input handling 2019-12-23 17:48:57 +09:00
smoogipoo
42853b5af6 Separate head/tail notes from hold note class 2019-12-23 17:48:57 +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
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
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08: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
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
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
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod 2019-11-26 06:57:47 +00:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod 2019-11-25 07:25:30 +00:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01: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
8239c2da61 Refactor to avoid using try-finally as control flow. 2019-11-22 00:12:03 +08:00
Huo Yaoyuan
4cd7d67fe4 Use early return for if-pattern-matching. 2019-11-22 00:02:40 +08:00
Huo Yaoyuan
20f01ff3e9 Revert false positives of 'unused assignment'. 2019-11-21 23:54:38 +08: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
b5c20fecee Merge branch 'master' into netstandard2.1 2019-11-19 21:40:12 +08:00
Huo Yaoyuan
608785b99a Update .Net Standard projects to 2.1 2019-11-18 18:35:58 +08:00
Huo Yaoyuan
53bc2dcab7 Use costum displaying text for inherited references. 2019-11-18 15:29:18 +08:00
Huo Yaoyuan
b04bca7db6 Reference elements in origin definition. 2019-11-17 20:55:40 +08:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f Use ??=. 2019-11-12 19:56:51 +08:00
Huo Yaoyuan
31cc0d13da Use 'out var'. 2019-11-12 19:55:26 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Huo Yaoyuan
4b75e0bf6a Redundant assignment. 2019-11-12 19:53:47 +08:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
fd7bdc03ab Merge remote-tracking branch 'upstream/master' into infrastructure 2019-11-11 11:11:59 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +09:00
smoogipoo
6fc1be64c2 Make hitobject samples a bindable list 2019-11-08 14:04:57 +09:00
smoogipoo
1f9f03dc66 Add temporary fix for null references 2019-11-07 13:36:54 +09:00
smoogipoo
8d42e45fd3 Make holdnote notes update lazily 2019-11-07 13:23:00 +09:00
smoogipoo
8141509a71 Split hold note blueprints into separate file 2019-11-07 12:59:05 +09:00
smoogipoo
2c1bfd62ef Disallow selections to be moved outside of the playfield 2019-11-06 17:28:04 +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
smoogipoo
38c2c328ff Rename HitObject -> DrawableObject in selection blueprints 2019-10-21 17:04:56 +09:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply 2019-10-18 19:45:10 +09:00
Dean Herbert
e3740fbc77
Merge pull request #6528 from smoogipoo/fix-mania-selection-movement
Fix mania hitobject selections not moving correctly
2019-10-18 16:28:04 +09:00
smoogipoo
c4cc960e15 Fix mania hitobject selections not moving correctly 2019-10-17 18:00:15 +09:00
smoogipoo
510ce9345f Fix potential blueprint nullrefs with the new structure 2019-10-17 16:14:28 +09:00
smoogipoo
bc41eb176e Clean up head/tail setting in various DHOs 2019-10-17 14:02:23 +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
8a284bacba Make mania use the new nested hitobject structure 2019-10-17 12:37:20 +09:00
smoogipoo
79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions (#6431)
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00