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

156 Commits

Author SHA1 Message Date
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
smoogipoo
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
ANDY840119-PC\andy840119
3b291abf60 Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
smoogipoo
d2b1e27527 Cleanup implementation of coop key mod
This is how I intended the functionality to be implemented.
2018-01-15 15:49:03 +09:00
ANDY840119-PC\andy840119
bbb741245e fix CI error 2018-01-14 21:51:07 +09:00
ANDY840119-PC\andy840119
999386497a implement co-op mod 2018-01-14 21:35:35 +09:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
f569d54958 Local circlesize/od variables 2018-01-04 19:52:29 +09:00
smoogipoo
b68daaeb4b Group -> Stage 2018-01-03 19:13:42 +09:00
smoogipoo
bd171926d6 Remove AvailableColumns from ManiaRulesetContainer
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
smoogipoo
d288d8a51f Remove SampleInfoList 2017-12-25 15:40:01 +09:00
Dean Herbert
e7c85d38a8 Move list initialisation to pattern generation code 2017-12-23 19:17:05 +09:00
smoogipoo
2c53be7853 Fix possible invalid cast when generating mania patterns 2017-11-27 18:39:13 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
TocoToucan
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
smoogipooo
2f2abf122b Add exceptions galore. 2017-08-22 16:46:12 +09:00
smoogipooo
e337fbcf4f Make availableColumns into a ctor argument. 2017-08-22 16:22:40 +09:00
smoogipooo
909cae5861 CI fixes. 2017-08-22 14:21:28 +09:00
smoogipooo
68c7226d12 Fix cherry pick issues. 2017-08-22 14:18:17 +09:00
smoogipooo
4eec59f669 Only set the number of availableColumns once, at ManiaRulesetContainer level.
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2017-08-22 14:07:37 +09:00
smoogipooo
6a7b410bc3 Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147 2017-08-21 11:58:54 +09:00
Dan Balasescu
21d44b1e99 Remove correct duplicate code.
Already present on line 51.
2017-08-09 06:24:08 +09:00
John Neijzen
9e17549d7f Update HitObjectPatternGenerator.cs 2017-08-08 22:56:27 +08:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
smoogipooo
e529ced131 Fix mania-specific beatmaps not setting samples correctly. 2017-05-29 16:18:01 +09:00
smoogipooo
3f4cbd02cd Fix warnings. 2017-05-26 16:29:20 +09:00
smoogipooo
946cd4bfa3 General cleanup + more xmldocs. 2017-05-24 21:57:38 +09:00
smoogipooo
dcf879687d Implement basic hold note + tick input. 2017-05-24 20:45:01 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
ea4a285329 Fix compile errors. 2017-05-23 14:08:15 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
7314a9019c Fix nullref. 2017-05-22 16:39:30 +09:00
smoogipooo
f70bfd5378 CI fixes. 2017-05-22 13:43:53 +09:00
Dan Balasescu
4556ead3b6 Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 12:54:06 +09:00
Dean Herbert
b50f9cad44 Merge branch 'master' into mania-endtime-object-conversion 2017-05-22 12:14:53 +09:00
Dan Balasescu
d02aaf0a28 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 11:36:36 +09:00
smoogipooo
8077ddf944 Update with pattern changes. 2017-05-22 10:34:12 +09:00
smoogipooo
7d417e4219 Merge remote-tracking branch 'smoogipooo/mania-pattern-changes' into mania-hitobject-object-conversion 2017-05-22 10:32:32 +09:00
smoogipooo
dba9dd3509 Remove siblings. 2017-05-22 10:30:03 +09:00
smoogipooo
e232968ea7 Fix line endings resulting in CI error. 2017-05-22 10:25:28 +09:00
smoogipooo
6714a244e8 Add check before possibly going into endless loop. 2017-05-22 10:23:08 +09:00
smoogipooo
2d11a8bdf0 Update with pattern changes. 2017-05-22 10:20:42 +09:00
Dan Balasescu
4ce3a78066 Update Pattern.cs 2017-05-22 10:18:42 +09:00
smoogipooo
e9f7be8dce Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion 2017-05-22 10:17:54 +09:00
smoogipooo
cd66e2af14 Update with pattern changes. 2017-05-22 10:17:08 +09:00
smoogipooo
9fd4ab2302 Merge branch 'mania-pattern-changes' into mania-distance-object-conversion 2017-05-22 10:14:32 +09:00
smoogipooo
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00
smoogipooo
8c260e3364 Renamings + refactorings to Pattern. 2017-05-22 10:04:25 +09:00
smoogipooo
9de18d45a5 Use bitshifted notation. 2017-05-22 10:00:11 +09:00
smoogipooo
9f2ca1acbf Remove siblings. 2017-05-22 09:57:03 +09:00
smoogipooo
3041b55aac Remove siblings. 2017-05-22 09:50:36 +09:00
smoogipooo
ecf81fa8d2 Cleanup. 2017-05-22 08:25:48 +09:00
smoogipooo
8d94c2ef8b Fix CI errors (for now). 2017-05-19 21:17:14 +09:00
smoogipooo
f8270f31a9 Fix build errors. 2017-05-19 21:15:29 +09:00
smoogipooo
6ab7a91415 Add generator to generate patterns from HitObjects. 2017-05-19 20:57:20 +09:00
smoogipooo
e76cb4cc31 Update to match base branch. 2017-05-19 17:51:59 +09:00
smoogipooo
0a596ef1e4 Merge branch 'mania-beatmap-conversion' into mania-endtime-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:50:19 +09:00
smoogipooo
90270ac586 Update to match base branch. 2017-05-19 17:48:23 +09:00
smoogipooo
5d8f0a4707 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:42:24 +09:00
smoogipooo
7b05930fc2 Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
This reverts commit 6821197a6a.
2017-05-19 17:38:06 +09:00
smoogipooo
860b607f45 A bit more cleanup. 2017-05-19 16:49:05 +09:00
smoogipooo
1cb3fc7262 Oops fix unused using. 2017-05-19 16:45:06 +09:00
smoogipooo
6821197a6a Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects. 2017-05-19 16:40:01 +09:00
smoogipooo
2cea5f0fa3 Add comments. 2017-05-19 16:39:02 +09:00
smoogipooo
9191c4f3e3 Remove LegacyBeatmapConverter. 2017-05-19 16:31:56 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dan Balasescu
e52b87bc58 Fix incorrect comment. 2017-05-18 19:47:16 +09:00
Dan Balasescu
b5674c8f30 Update DistanceObjectPatternGenerator.cs 2017-05-18 19:33:02 +09:00
smoogipooo
1f6939f57b Add IHasEndTime object pattern generation. 2017-05-18 19:31:56 +09:00
smoogipooo
a239411808 Fix warnings/errors. 2017-05-18 19:10:32 +09:00
smoogipooo
78453c7ce3 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-18 19:06:27 +09:00
smoogipooo
c80e2e8f0a Attempt to solve warnings... 2017-05-18 18:46:50 +09:00
smoogipooo
35bd608a4a Simplify method parameters, make conversion work again. 2017-05-18 18:41:44 +09:00
smoogipooo
a30e49d21b Add hold end samples. 2017-05-18 18:19:29 +09:00
smoogipooo
53a2f34f8b Set siblings, removing warning. 2017-05-18 18:15:09 +09:00
smoogipooo
eae4f8b412 Fix compilation due to previously-removed function. 2017-05-18 18:11:09 +09:00
smoogipooo
2af025e630 Add IHasDistance object pattern generation. 2017-05-18 18:09:13 +09:00
smoogipooo
afd3eb4b8d Implement things a bit more to remove warnings. 2017-05-18 18:04:32 +09:00
smoogipooo
873ff34487 This function can't be used for all pattern generations. So let's not use it. 2017-05-18 17:43:59 +09:00
smoogipooo
af34777f44 Trim whitespace. 2017-05-18 17:00:11 +09:00
smoogipooo
164a1bb743 Remove distance object pattern generator for now (next PR). 2017-05-18 15:38:15 +09:00
smoogipooo
1fa1897d71 Define the concept of patterns + additional comments. 2017-05-18 15:05:45 +09:00
smoogipooo
618c162535 Move more functions to ObjectConversion + resharper cleanup. 2017-05-18 14:17:23 +09:00
smoogipooo
de8271ad6b Fix out of range exceptions due to out-of-order hitobjects. 2017-05-18 14:08:48 +09:00
smoogipooo
6dae5cbacf Fix distance object conversion not calculating end time. 2017-05-18 14:08:32 +09:00
smoogipooo
7c48fb2b92 General fixes. 2017-05-18 13:37:22 +09:00
smoogipooo
c1a44ea6b4 Renaming + commenting. 2017-05-18 13:25:55 +09:00
smoogipooo
16eda2467f Make compile. 2017-05-18 12:50:12 +09:00
smoogipooo
f6dc85c2f8 Fix incorrect note count probabilities. 2017-05-18 12:39:51 +09:00
smoogipooo
e9275138e1 Finish up DistanceObjectConversion. 2017-05-18 12:39:37 +09:00
smoogipooo
22128f158c Fix a few errors. 2017-05-18 12:10:01 +09:00
smoogipooo
b52ec11260 Add (almost finished) basis of slider hit object conversion... 2017-05-17 20:47:02 +09:00
smoogipooo
2f8556a44a Fix hold notes + make it compile again. 2017-05-17 13:20:33 +09:00
smoogipooo
fdd98e23bd Fix generation. 2017-05-17 13:08:59 +09:00
smoogipooo
1ded043778 Add basic mania-specific beatmap conversion.
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
2017-05-17 13:07:56 +09:00