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

1660 Commits

Author SHA1 Message Date
iiSaLMaN
c11f508400 Use transform management for mania hit objects 2019-08-26 22:06:30 +03:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths 2019-08-26 18:59:50 +09: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
smoogipoo
e30ae57ea6 Scale mania beat lengths relative to each other 2019-08-26 12:51:23 +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
b3556403aa Make GetNextObject() a virtual method 2019-08-19 16:18:25 +02:00
Desconocidosmh
0f9706e798 Fix using invalid constant 2019-08-17 00:18:25 +02:00
Desconocidosmh
7de1757aae Small improvements 2019-08-16 12:50:48 +02:00
Desconocidosmh
24d2b504dd Stop autoplay from missing on very dense notes when playing mania 2019-08-16 12:39:54 +02:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09: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
8327452fe1 Make AccentColour a bindable 2019-07-22 14:48:59 +09:00
Dean Herbert
9bed0094de Merge remote-tracking branch 'upstream/master' into android 2019-07-02 19:40:50 +09: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
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09: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
4c5f41e40f Implement hp increase for mania 2019-04-22 17:04:18 +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
3b3b1e51ee Move hit animation logic into virtual method 2019-03-12 19:41:33 +09:00
David Zhao
12f334035f Create properties for use in DrawableManiaJudgement 2019-03-12 19:23:24 +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
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind 2019-03-06 14:04:04 +09:00
tangalbert919
1e6cb3e7d8 Merge remote-tracking branch 'upstream/master' into android 2019-03-05 17:56:13 -06:00
smoogipoo
78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09: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
smoogipoo
c722ea0299 Add space 2019-03-01 14:30:58 +09:00
andy840119
e634475bf4 IsDuel -> Dual 2019-02-28 23:40:03 +09:00
andy840119
4b2be4612f support duel mode in mania beatmap 2019-02-28 19:07:43 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09: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
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Dean Herbert
cd3f3be79d
Merge branch 'master' into master 2019-02-25 09:59:18 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
Ignacio Conde
a62f150962 Fixed Issue #4159 2019-02-22 02:28:38 -03: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
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
d6a2fe6891
Remove excess newline 2019-02-20 10:29:08 +09:00
smoogipoo
4efc03cdf0 Add beatmap argument + fix crashes 2019-02-19 17:56:38 +09:00
smoogipoo
5457097342 Update with PopulateAttributes() removal 2019-02-19 17:48:00 +09:00
smoogipoo
bf17826363 Fix post-merge errors 2019-02-19 16:30:29 +09:00
smoogipoo
9cce9ce97c Consider aggregate peaks 2019-02-18 15:00:32 +09:00
smoogipoo
68725dc005 Implement new difficulty calculator for Rulesets.Mania 2019-02-18 15:00:20 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
smoogipoo
e319a760b8 Add mania difficulty calculator test 2019-02-15 16:25:44 +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
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
Unknown
8ddff673b7 revert previous rename and rename ruleset specific classes instead 2019-01-25 11:14:37 +01:00
Dean Herbert
f4729d41f3 Merge branch 'master' into samah-ios 2019-01-25 18:49:08 +09:00
Dean Herbert
67331039ef
Don't use TransferValueOnCommit 2019-01-25 12:53:30 +09:00
Dean Herbert
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
Unknown
01ab371c87 add "Scroll speed" to ManiaSettingsSubsection 2019-01-24 17:39:23 +01:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
tangalbert919
e3ce203c68 Merge remote-tracking branch 'upstream/master' into android 2019-01-23 17:45:46 -06:00
Dean Herbert
8160162cde Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-01-21 20:58:17 +09:00
Shane Woolcock
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Kyle Chang
bd6c845fc8 Use IApplicableToBeatmap for mirror and random mania mods 2019-01-15 22:51:52 -05:00
Shane Woolcock
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
tangalbert919
47268898be Expose internals for Android test projects 2019-01-06 00:04:25 -06: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
cb2444e01c Remove Meh from TaikoHitWindows 2018-12-06 19:04:54 +07:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert
a1666fb7fa MouseDownPosition -> DragPosition 2018-11-30 14:21:20 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
Dean Herbert
085acf29a0 Fix blueprints behaving incorrectly 2018-11-29 19:29:36 +09:00
Dean Herbert
ab0ce46362 Make hold note placement blueprints look a bit more blueprint-y 2018-11-29 18:13:15 +09:00
Dean Herbert
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
Dean Herbert
8fd04cb47b Fix mania placement blueprints appearing outside valid stage placement area 2018-11-29 13:20:37 +09: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
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
Dean Herbert
4cfeb1b9a1
Merge branch 'master' into note-placement 2018-11-26 14:35:31 +09:00
Dean Herbert
c944e8bb29
Merge branch 'master' into fix-deletion-crash 2018-11-26 14:20:02 +09:00
Dean Herbert
bfebed053d
Merge branch 'master' into note-placement 2018-11-26 14:19:46 +09:00
smoogipoo
60ffad169f Fix post-merge errors 2018-11-26 11:47:48 +09:00
smoogipoo
c0fcbc283e Merge branch 'note-placement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
2018-11-26 11:47:22 +09:00
smoogipoo
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
smoogipoo
5d6a438f98 Make selected mania hitobjects always alive 2018-11-26 11:34:25 +09:00
smoogipoo
91aa00b0e9 Add helper method to get column by position 2018-11-26 10:54:54 +09:00
smoogipoo
4ba3fa4ab6 osuTK 2018-11-26 10:44:48 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
Dean Herbert
7de85659ba Merge branch 'master' into mania-selection-movement 2018-11-21 20:00:46 +09:00
smoogipoo
dc8cd51e15 Implement mania note deletion 2018-11-20 17:26:00 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dan Balasescu
8cee4141e8
Merge branch 'master' into note-placement 2018-11-19 19:08:53 +09:00
smoogipoo
2ee56e4a78 Add a body piece 2018-11-19 18:59:05 +09:00
smoogipoo
ad950cfc90 Implement hold note placement 2018-11-19 18:40:43 +09:00
smoogipoo
8071244d97 Make sizing happen per-blueprint 2018-11-19 18:40:27 +09:00
Dan Balasescu
d9b8d2d15c
Trim whitespace 2018-11-19 18:05:21 +09:00
Dan Balasescu
079230d9ed
Merge branch 'master' into mania-selection-movement 2018-11-19 18:03:12 +09:00
smoogipoo
d1cbaa9612 Use the column width 2018-11-19 18:02:01 +09:00
smoogipoo
52309465eb Apply some simple fixes 2018-11-19 17:59:52 +09:00
smoogipoo
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
smoogipoo
595e2ffbff Unbind event when column changes 2018-11-19 16:20:21 +09:00
smoogipoo
ce956d7fd4 Fix exception when order of objects changes 2018-11-19 16:19:56 +09:00
smoogipoo
4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
jorolf
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
smoogipoo
f7fc2ca569 Basic inter-column selection movement 2018-11-15 21:37:22 +09:00
smoogipoo
df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
smoogipoo
eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09:00
smoogipoo
63642586c4 Merge remote-tracking branch 'origin/master' into mania-selection-movement 2018-11-15 20:47:53 +09: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
Dean Herbert
3fbabdfed2
Merge branch 'master' into notepieces 2018-11-14 17:30:39 +09:00
Dean Herbert
a1dd1057ce
Merge branch 'master' into more-global-scrollalgo 2018-11-14 17:15:24 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
smoogipoo
a9a33b1fcb Implement mania selection movements 2018-11-13 16:42:40 +09:00
smoogipoo
fc0030a391 Use common positional adjustment for note blueprints 2018-11-13 15:45:06 +09:00
smoogipoo
25101ecd2c Snap placement blueprint to columns 2018-11-13 14:13:29 +09:00
smoogipoo
3d8ef97e81 Add testcase 2018-11-12 19:41:06 +09:00
smoogipoo
1403fa26cf Fix placement not working correctly for downwards scroll 2018-11-12 19:40:57 +09:00
smoogipoo
1d40a042f6 Extract common methods into ManiaPlacementBlueprint 2018-11-12 18:32:44 +09:00
smoogipoo
3a1fee59fb Implement note placement 2018-11-12 18:24:18 +09:00
smoogipoo
a0c75a0597 Merge branch 'notepieces' into note-placement 2018-11-12 17:59:54 +09:00
smoogipoo
e302d5d005 Separate NoteSelectionBlueprint into a note piece 2018-11-12 17:59:39 +09:00
smoogipoo
8be6e351f5 Merge branch 'fix-mania-selections' into add-mania-selection-testcase 2018-11-12 17:39:58 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
e7969ecec7 Move ScrollAlgorithm inside IScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
54668a0dec Simplify construction of ScrollingInfo 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
9fde7f7f44 Move scrolling info to osu.Game 2018-11-12 17:34:35 +09:00
smoogipoo
e3c60c2f96 Cleanups 2018-11-12 17:18:58 +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
Dean Herbert
03af600273 Merge remote-tracking branch 'upstream/master' into fix-mania-selections 2018-11-09 11:35:46 +09:00
smoogipoo
d0b63e8f8d Fix missing references 2018-11-08 14:13:57 +09:00
smoogipoo
21f8a0a56f Fix selection box using an incorrect size 2018-11-08 14:02:07 +09:00
smoogipoo
4b1b494893 Fix selection masks not having the correct size 2018-11-08 14:02:07 +09:00
smoogipoo
5d51719572 Make selection blueprints handle position adjustments 2018-11-07 16:21:32 +09:00
smoogipoo
2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00
smoogipoo
11be820efe CreateMaskFor -> CreateBlueprintFor 2018-11-06 18:03:21 +09:00
smoogipoo
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +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
Dean Herbert
b28c0cd128
Merge branch 'master' into editor-mask-placement 2018-10-31 06:46:48 +09:00
smoogipoo
5712a52817 Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-30 16:46:13 +09:00
Kyle Chang
6d00aff9fd Add type parameter to IApplicableToBeatmap 2018-10-30 00:13:33 -04:00
Kyle Chang
9b246f065c Have dual stage mod apply changes to beatmap directly 2018-10-28 02:23:18 -04:00
smoogipoo
f674fcf2c8 Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
smoogipoo
677d0d4a19 Renamespace ruleset masks 2018-10-26 13:31:38 +09:00
smoogipoo
8703db5cc1 Rename HitObjectMask -> SelectionMask 2018-10-26 13:31:23 +09:00
smoogipoo
d36ac59ca2 Reduce complexity of creating edit ruleset containers 2018-10-17 18:06:00 +09:00
smoogipoo
f384c7228e Fix post-merge issues 2018-10-16 17:28:23 +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
smoogipoo
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +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
smoogipoo
ec9f23ab73 Make IBeatmap.HitObjects an IReadOnlyList 2018-10-11 19:53:07 +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
3420e0c7eb Re-implement composition tools + implement placement masks 2018-10-03 16:27:26 +09:00
smoogipoo
540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
smoogipoo
1164108a95 Renamespace ruleset masks 2018-10-03 13:45:41 +09:00
smoogipoo
4cdb6dcea5 Rename HitObjectMask -> SelectionMask 2018-10-03 13:28:00 +09:00
smoogipoo
4af885f6b1 Adjust default mania speed to match stable 2018-10-01 18:30:52 +09:00
Kyle Chang
88b0c234cc Move judgement text to internal container 2018-09-30 04:01:33 -04:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +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
Dean Herbert
ced6e5efd0 Synchronise animation; reduce flashiness 2018-09-07 17:17:03 +09:00
Dean Herbert
1e39b84089 Increase visibility of osu!mania long notes 2018-09-06 23:49:54 +09:00
Dean Herbert
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
smoogipoo
49913f00f0 Fix xmldoc 2018-08-25 00:07:48 +09:00
smoogipoo
26dfabc86c Aggressively check for valid columns before iterating endlessly 2018-08-24 23:57:44 +09:00
smoogipoo
6475dfaeef Allow 2B maps to be converted to mania 2018-08-23 09:19:33 +09:00
Dean Herbert
786ed8203f
Merge branch 'master' into fix-mirror-note-conversion 2018-08-17 14:47:16 +09:00
smoogipoo
3d6721111a Increase the maximum allowable iterations during mania conversion 2018-08-17 13:26:53 +09:00
smoogipoo
99ace9805f Fix mirror note generation never completing 2018-08-17 12:54:32 +09:00
Dean Herbert
dfecb3235b Fix custom exception stack trace output 2018-08-16 20:41:53 +09:00
Dean Herbert
b26c8e3b9e Fix notifiation stack trace output on mania conversion failure 2018-08-16 14:04:48 +09:00
Dean Herbert
6cc6d77815
Merge branch 'master' into mania-conversion-safety 2018-08-16 11:19:14 +09:00
smoogipoo
74a79bfcfa Fix hold note head/tails not being nested hitobjects 2018-08-16 10:45:06 +09:00
Dean Herbert
d28acaada1
Merge branch 'master' into mania-conversion-safety 2018-08-16 10:37:07 +09:00
smoogipoo
26d4bb5451 xmldoc + reword 2018-08-15 09:51:02 +09:00
smoogipoo
2019a89a08 Softly-handle infinite loops in mania beatmap conversion 2018-08-14 16:45:35 +09:00
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework 2018-08-14 13:16:16 +09:00
smoogipoo
f719b9bef5 Fix mania scroll direction not being read from database 2018-08-07 12:20:24 +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
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
smoogipoo
2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo
807794d512 Make Rulesets.Mania use the new judgement result structure 2018-08-02 20:36:54 +09:00
smoogipoo
cd70e5e30b Migrate Rulesets.Mania to the new judgement system 2018-08-02 16:44:01 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02: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
Dan Balasescu
824c217a0d Adjust comment 2018-07-19 19:46:03 +09:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container 2018-07-19 19:38:43 +09:00
smoogipoo
c3c270621b Fix hold note note masks blocking mouse input 2018-07-19 19:32:47 +09:00
smoogipoo
be297ddf76 Fix direction reversal not quite working correctly 2018-07-19 19:30:20 +09:00
smoogipoo
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
smoogipoo
54e288f09b Correctly give note masks a scrolling info 2018-07-17 16:55:50 +09:00
smoogipoo
6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
smoogipoo
c51fe6a119 Remove more unused stuff 2018-07-17 16:01:47 +09:00
smoogipoo
48c1561676 Remove now unnecessary mask layer 2018-07-17 16:01:14 +09:00
smoogipoo
9f730dd784 Merge branch 'editor-composer-cleanup' into mania-mask-container
# Conflicts:
#	osu.Game/Rulesets/Edit/HitObjectComposer.cs
#	osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +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
smoogipoo
577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dean Herbert
58fe434dd0 Don't use in invalidation logic to avoid incorrect execution 2018-07-16 16:39:52 +09:00
Dean Herbert
98cddc0c04 Fix some legacy cases 2018-07-16 16:26:37 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling 2018-07-10 16:32:14 +09:00
Dan Balasescu
a1d2092cc9
Fix incorrect default drain time 2018-07-06 13:29:40 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
f007e71c87 Retrieve the mania key action through DI 2018-07-02 12:31:41 +09:00
Dean Herbert
c0b65a6a73 Change default IsBonus definition and remove unnecessary overrides 2018-06-29 17:07:08 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring 2018-06-29 14:59:15 +09:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes 2018-06-25 19:53:22 +09:00
Dean Herbert
a397827841 Reduce line length 2018-06-25 19:28:38 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions 2018-06-25 18:36:23 +09:00
smoogipoo
97057ced85 Merge remote-tracking branch 'origin/master' into full-mania-fix 2018-06-25 12:43:49 +09:00
Jean-Denis Boivin
55364af56c
I guess you meant an "or" ? 2018-06-24 14:55:27 -04:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +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
smoogipoo
6cd9a22e26 Update testcase 2018-06-19 13:52:24 +09:00
smoogipoo
a623155b9f Fix missing using 2018-06-19 13:51:53 +09:00
smoogipoo
f090e82b63 Fix inverted conditional 2018-06-18 21:06:09 +09:00
smoogipoo
0625bfda30 Don't split single hitobject into multiple patterns 2018-06-18 20:17:49 +09:00
smoogipoo
8529cece4a Fix precision error 2018-06-18 20:17:19 +09:00
Dean Herbert
1d9d240454
Merge branch 'master' into mania-playfield-inversions 2018-06-18 04:41:17 +09:00
Dean Herbert
6fa72c510f Avoid listing the base mods twice 2018-06-18 00:48:35 +09:00
smoogipoo
0a99d21938 Use the passed-in ruleset 2018-06-17 18:01:28 +09:00
smoogipoo
55f0b3c42c Distance object generator should output a secondary pattern
In osu!stable, only the hitobjects which ended at the distance object's EndTime would be considered for further pattern generation.

Previously this generator was group _all_ objects including those that don't end at the object's EndTime, resulting in incorrect hitobject count for further pattern generation.
2018-06-15 22:10:57 +09:00
smoogipoo
2d59ae9354 Commit forgotten variable 2018-06-15 22:08:24 +09:00
smoogipoo
53a6d01304 Fix stair type not being flipped correctly 2018-06-15 21:06:54 +09:00
smoogipoo
5f5d797c1e Remove unused field 2018-06-15 21:06:35 +09:00
smoogipoo
e51f96e181 Fix some notes not being recorded 2018-06-15 20:53:18 +09:00
smoogipoo
c1f7db80f1 Forgot to commit random change 2018-06-15 20:52:09 +09:00
smoogipoo
fe9aaf000c Fix missing conditional 2018-06-15 20:50:36 +09:00
smoogipoo
481546ec7a Fix drain time not being rounded to the second 2018-06-15 20:49:11 +09:00
smoogipoo
afbf35b814 Add rng components to mania conversion tests 2018-06-15 20:48:48 +09:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
Dean Herbert
719056ca4a
Merge branch 'master' into mania-keymod-optimisation 2018-06-15 18:29:27 +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
fd84afb89b Fix non-inverted calculation 2018-06-14 19:38:48 +09:00
smoogipoo
a3bf16e481 Fix missing convert type 2018-06-14 19:37:32 +09:00
smoogipoo
b25a6a33cc Fix 1K breaking hitcircle / slider conversions 2018-06-14 19:37:21 +09:00
smoogipoo
08b9cf75e9 Don't compute keymod difficulties for mania-specific beatmaps
These don't affect the number of keys in the beatmap at all for mania-specific beatmaps.
2018-06-14 17:10:08 +09:00
smoogipoo
22add2abc5 Move mania difficulty attributes to ManiaDifficultyCalculator 2018-06-14 16:25:44 +09:00
smoogipoo
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo
966099fabc Adjust ManiaDifficultyCalculator in-line with changes 2018-06-14 15:54:05 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
smoogipoo
7651819fb0 Add same change to mania's hit explosions 2018-06-12 12:53:53 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
smoogipoo
3bad319dd2 Fix filename 2018-06-11 16:19:57 +09:00
smoogipoo
10d1dfa7cd A bit of cleanup 2018-06-11 16:10:27 +09:00
smoogipoo
b9bf3a1829 Make mania scroll downwards by default 2018-06-11 15:56:30 +09:00
smoogipoo
162237dc46 Fix bar lines being offset 2018-06-11 15:43:15 +09:00
smoogipoo
f49b7d6e16 Add mania direction to settings 2018-06-11 14:36:19 +09:00
smoogipoo
93696fb5e5 Merge branch 'ruleset-configs' into mania-playfield-inversions
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
smoogipoo
4fb6a8627e Merge remote-tracking branch 'origin/master' into mania-playfield-inversions 2018-06-11 13:45:47 +09:00
smoogipoo
baaf431b9e Make IScrollingInfo and store direction as bindable 2018-06-11 13:42:13 +09:00
smoogipoo
ca5103615d DI the scrolling info rather than pass by ctor 2018-06-11 13:42:13 +09:00
smoogipoo
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e Make ruleset config manager variants nullable 2018-06-11 13:13:36 +09:00
Crusensis
fbc0cd6f5f Split AffectsCombo into IsBonus 2018-06-09 18:14:33 -07:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
smoogipoo
0fb4e6b41b Fix hold note body not following the scroll direction 2018-06-08 18:16:55 +09:00
Dan Balasescu
4dfc328117
Remove unused array 2018-06-08 17:46:38 +09:00
smoogipoo
5c8bea82f8 Fix scroll direction not applying to nested hitobjects 2018-06-08 15:29:08 +09:00
smoogipoo
7deaffdb62 Fix hit explosions not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo
d73c2a1654 Fix various note elements not following the scroll direction 2018-06-08 15:24:19 +09:00
smoogipoo
80a577f182 Fix notes not scrolling correctly 2018-06-08 15:16:45 +09:00
smoogipoo
ee64760406 Add mania stage test case 2018-06-08 14:28:27 +09:00
smoogipoo
32037701bf Make the column hitobject area follow the scroll direction 2018-06-07 21:40:12 +09:00
smoogipoo
0c35908802 Reorder fields 2018-06-07 21:19:31 +09:00
smoogipoo
207cdbdefe Make the column key area follow the scroll direction 2018-06-07 21:13:57 +09:00
smoogipoo
11f067d7d6 Fix background input 2018-06-07 21:13:29 +09:00
smoogipoo
d49758d149 Make background handle its own lit state 2018-06-07 20:59:04 +09:00
smoogipoo
4af8baefc1 Make the column background follow the scroll direction 2018-06-07 20:49:31 +09:00
smoogipoo
9b10cc4e0c Remove invertability of ManiaStage 2018-06-07 19:53:47 +09:00
smoogipoo
ce7a5e8914 Update visual style to match new notes 2018-06-07 19:19:32 +09:00
smoogipoo
55475d129f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
smoogipoo
24b314b51f Fix hold note masks not working 2018-06-07 19:00:02 +09:00
smoogipoo
f299ae0fbd Fix positioning 2018-06-07 18:59:52 +09:00
smoogipoo
cd532cde2d Fix note masks not working 2018-06-07 18:28:49 +09:00
smoogipoo
d1b469c1a3 Better handling of nested playfields' hitobjects 2018-06-07 16:28:21 +09:00
smoogipoo
279a2844f0 Actually make ManiaHitObjectComposer constructible/testable 2018-06-07 16:08:37 +09:00
smoogipoo
f715734662 Remove unnecessary csproj edit 2018-06-07 15:57:21 +09:00
smoogipoo
485026da6f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 15:32:31 +09:00
Dan Balasescu
8d0161c2fc Refactoring 2018-06-07 15:11:48 +09:00
Dean Herbert
f9449e841a Improve overall visual clarity and explosion effects 2018-06-07 14:30:27 +09:00
Dean Herbert
dff4b360b7 Fix ticks not getting accent colour 2018-06-07 14:30:27 +09:00
Dean Herbert
56ea1c1d63 Adjust hold note visibility and glow composition 2018-06-07 14:30:27 +09:00
Dean Herbert
81a3a8a1a4 Add corner radius 2018-06-07 11:57:30 +09:00
Dean Herbert
dc10277d50 Thicker bar lines and new design colour 2018-06-07 11:16:26 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759 Reverse order of exposed objects in HitObjectContainer
Closes #2740.
2018-06-06 15:03:47 +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
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
smoogipoo
31cbec99a1 Fix mania hold notes displaying judgements 2018-05-28 18:12:49 +09:00
smoogipoo
d850e34003 Actually cast to int 2018-05-26 09:25:16 +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
AlFasGD
c7dfe88ad2 Complete PR's independence 2018-05-22 09:18:02 +03:00
AlFasGD
a178c44b60 Remove snap line dependencies 2018-05-22 09:12:51 +03:00
AlFasGD
8aac1f50ee Remove more dependencies 2018-05-22 09:12:22 +03:00
AlFasGD
2769f6c47b Fix issues 2018-05-22 09:09:25 +03:00
AlFasGD
bbe7765a95 Add files to not require dependencies from #2534 2018-05-22 09:03:47 +03:00
AlFasGD
61a18b952f Remove useless things 2018-05-21 23:24:10 +03:00
AlFasGD
d504a44dfb Implement mask layering (incomplete) 2018-05-21 23:08:04 +03:00
Dean Herbert
6c00046835
Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
smoogipoo
43cdbec0a3 Fix hold note hitwindow lenience 2018-05-17 13:59:04 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
Dean Herbert
97e179b390
Merge branch 'master' into mania-performance-improvements 2018-05-17 12:54:04 +09:00
smoogipoo
2fc1939d65 Fix hold notes never dying 2018-05-16 19:43:01 +09:00
smoogipoo
5aadc35a25 Stably-sort difficulty hitobjects to prevent future issues 2018-05-16 14:47:50 +09:00
smoogipoo
edbb3a5a57 Rename to use new hit result namings 2018-05-16 12:44:11 +09:00
smoogipoo
de63a1b578 Remove construction of new ruleset 2018-05-16 01:43:58 +09:00
smoogipoo
ed902d9325 Cleanup 2018-05-16 01:36:28 +09:00
smoogipoo
1fdc77d579 Update with the rebalance changes 2018-05-16 01:34:07 +09:00
smoogipoo
4019683f6c Implement osu!mania performance calculation 2018-05-16 01:24:53 +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
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
0cdd39b8b8 Add todo because TailNote shouldn't hardcore lenience 2018-05-11 15:32:13 +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
b737644208 Add mania statistics 2018-05-07 15:51:08 +09:00
smoogipoo
e20323b5f6 Trim whitespace 2018-05-07 11:23:29 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
f3aa9269ff Fix mania-specific beatmap conversion 2018-05-07 09:17:12 +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
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits 2018-03-31 10:43:58 -07:00
smoogipoo
bb7618eb0c FIx mania playfield playing the wrong/duplicated sounds
Fixes #2266.
2018-03-29 16:13:31 +09:00
smoogipoo
187a025d36 Make hitobjects sorted by their start times 2018-03-29 16:07:31 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits 2018-03-28 20:42:35 -07: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
Joseph Madamba
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07: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
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes 2018-03-16 11:27:39 +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
1eeacb7bf7
Change descriptions and special section 2018-03-14 01:05:19 -07:00
Dean Herbert
908d38279b
Merge branch 'master' into fix-mania-conversion 2018-03-14 12:27:32 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
smoogipoo
9e09d434dd Fix argument null exception in ManiaBeatmapConverter 2018-03-14 11:27:14 +09:00
Dean Herbert
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty 2018-03-12 13:31:48 +09:00
smoogipoo
fbb80edde1 Minor cleanups 2018-03-12 13:01:29 +09:00
smoogipoo
46caab6310 Reorder arithmetic operation 2018-03-12 11:56:49 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
Dan Balasescu
dc85067b8c
Merge branch 'master' into mania_mirror 2018-03-12 11:52:38 +09:00
tgi74000
a4dfeff2d7 Renamed ManiaMirrorMod to ManiaModMirror 2018-03-10 08:44:46 +01:00
tgi74000
ed20e31bbe Removed redundant parentheses 2018-03-10 08:39:11 +01:00
Dan Balasescu
ac9de336db
Merge branch 'master' into fix-mania-conversion 2018-03-09 16:09:14 +09:00
tgi74000
1f48cfb79a Added Mirror Mod for Mania 2018-03-08 17:35:20 +01:00
Dean Herbert
fe3ab94afb Fix mania judgement regression 2018-03-07 19:19:56 +09: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
Poyo
e187c6453d Added mania-difficulty mod support 2018-03-05 18:19:06 -08:00
smoogipoo
02265ad686 Enable mania's basic conversion testcase 2018-03-05 20:20:46 +09:00
smoogipoo
27a510aad8 The endtime-object pattern is never checked against 2018-03-05 20:20:42 +09:00
smoogipoo
4be478d38e Fix LowProbability conversions happening during kiai time 2018-03-05 20:20:22 +09:00
smoogipoo
356d353cea Fix ConversionDifficulty never actually being calculated 2018-03-05 20:20:18 +09:00
smoogipoo
675c7d0dfd Invert Max/Mins 2018-03-05 20:20:14 +09:00
smoogipoo
dfeee79a24 Fix incorrect probability 2018-03-05 20:20:10 +09:00
smoogipoo
2bd58e5421 Re-order RNG call to match osu-stable 2018-03-05 20:20:06 +09:00
smoogipoo
4da30c6940 Fix missing conversion case 2018-03-05 20:20:00 +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
0145ef5277 Fix mania using the wrong validation data 2018-03-02 13:13:01 +09:00
smoogipoo
573d6d1b5f Allow multiple mappings to be generated for a single hitobject 2018-03-02 13:13:01 +09:00
smoogipoo
9d035fc5d0 Add a mania beatmap conversion testcase 2018-03-02 13:13:01 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes 2018-03-01 22:26:16 +09:00
smoogipoo
8cfb119383 Fix FastRandom using uint instead of int for NextDouble() 2018-03-01 16:17:01 +09:00
smoogipoo
c783a19e41 Fix mania frame conversion not working at all 2018-03-01 02:28:15 +09:00
smoogipoo
195b6642e6 Reimplement important frames 2018-03-01 02:28:15 +09:00
smoogipoo
cf42d5bbd5 Remove mostly-unused Score parameter 2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53 CreateReplayFrame -> CreateConvertibleReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
a7e6c19e61 Remove todo (probably not a consideration going forward) 2018-03-01 02:28:14 +09:00
smoogipoo
222ae70062 Populate rulesets with their replay frames 2018-03-01 02:28:14 +09:00
smoogipoo
a02eaf0e94 Use StageDefinition to determine special column in ManiaReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
b8b869e8b7 Remove now unused property 2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
Poyo
96f416fef3 Update code style
Sorry, bot overlords.
2018-02-26 00:18:54 -08:00
Poyo
31cf00e3b8 Implement mania star difficulty calculation 2018-02-25 23:52:38 -08:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
802aaefe35 Give rulesets a way to disable/enable perfect/ok hit results 2018-02-08 13:54:08 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
smoogipoo
6810948a6f Fix mania testcase 2018-02-08 13:16:53 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
smoogipoo
15fe1a7966 Remove mania's custom storage of HitWindows 2018-02-02 18:53:18 +09:00
smoogipoo
acf20c079c General improvements around usage of HitWindows for mania 2018-02-02 18:47:54 +09:00
smoogipoo
a0c1662fb7 Move mania's HitWindows to osu.Game 2018-02-02 17:52:55 +09:00
FreezyLemon
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
smoogipoo
5742e61e68 Merge remote-tracking branch 'origin/master' into ruleset-configs 2018-01-26 15:39:09 +09:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
smoogipoo
45e8a2b69b Remove ManiaPlayfield local scrollTime bindable
Now not needed due to having this databased.
2018-01-25 20:49:25 +09:00
smoogipoo
b77f08941c Make mania play the next note's sounds if no note is hit
Fixes #1911.

This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
Dean Herbert
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
Dean Herbert
1fda45fe10 Fix broken formatting 2018-01-23 16:40:18 +09:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
smoogipoo
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
Dan Balasescu
9b471dea33
Back to max 10 special keys for now, change xmldoc to normal comment 2018-01-23 10:51:01 +09:00
Dan Balasescu
2bc67629b8
Improve xmldoc + remove explicit Special2 value
Special2 value is implicit at Special1 + 1 (2).
2018-01-23 10:03:34 +09:00
smoogipoo
68a6323168 Remove SpecialColumnPosition for now
This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.
2018-01-22 16:19:05 +09:00
smoogipoo
8a8b3f25e7 SpecialColumn -> SpecialColumnPosition 2018-01-22 16:12:45 +09:00
smoogipoo
351be4308f Oops, forgot to commit OnJudgement change 2018-01-22 16:12:35 +09:00
smoogipoo
90d8ee8d36 Fix stage background being too transparent
This is the original colour for the background. Not sure why this was changed.
2018-01-22 16:12:15 +09:00
smoogipoo
3d36fd3676 Update xmldoc to be more descriptive of single/dual stages 2018-01-22 16:11:26 +09:00
smoogipoo
0ef6384de0 Fix hitexplosions not working in the testcase 2018-01-22 16:11:06 +09:00
smoogipoo
c1331cef1b Disallow DualStages for non-converted beatmaps 2018-01-22 15:52:54 +09:00
smoogipoo
ba58b25f01 Fix showing too many keybindings 2018-01-22 15:47:31 +09:00
smoogipoo
1350b68f15 DualStages always doubles the column count in lazer 2018-01-22 15:18:39 +09:00
smoogipoo
eede8333ba getVariantType -> getPlayfieldType 2018-01-22 15:18:11 +09:00
smoogipoo
17d75b349d Dual stages is not ranked ಠ_ಠ 2018-01-22 15:11:45 +09:00
smoogipoo
77c4da5f0f KeyCoop -> DualStages 2018-01-22 15:11:15 +09:00
smoogipoo
583aa9922f IKeyBindingMod -> IPlayfieldTypeMod 2018-01-22 15:07:14 +09:00
smoogipoo
65a2e09593 Privatise VariantMappingGenerator to ManiaRuleset 2018-01-22 15:03:05 +09:00
smoogipoo
2674859b54 ManiaKeyBindingVariantType -> PlayfieldType 2018-01-22 14:59:17 +09:00
smoogipoo
286b1bb81f Solo -> Single, Coop -> Dual 2018-01-22 14:57:25 +09:00
smoogipoo
3b47c0fea0 Remove versus-mode variant 2018-01-22 14:54:47 +09:00
smoogipoo
293023d99a Fix keybinding offsets due to special keys 2018-01-22 14:38:41 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
smoogipoo
89f4bfa7b5 Track mania scroll speed 2018-01-18 17:00:41 +09:00
smoogipoo
7910b47868 Move ConfigManager registration/dependency injection to RulesetContainer 2018-01-18 17:00:23 +09:00
ANDY840119-PC\andy840119
6c67f96fdb fix ci error 2018-01-18 02:01:01 +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
smoogipoo
db27faa471 Add a ScrollTime config setting to osu!mania 2018-01-17 21:13:14 +09:00
smoogipoo
d96234bf40 Enforce that there's only one configmanager per ruleset 2018-01-17 21:08:23 +09:00
smoogipoo
9f4ebad6e3 Add mania config manager 2018-01-17 20:21:25 +09:00
smoogipoo
c309cc9454 Privatise OnJudgements as much as possible 2018-01-16 15:37:32 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements 2018-01-16 15:26:13 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
smoogipoo
8c5ef0a330 Remove base OnJudgement from Playfield to properly accomodate nested playfields 2018-01-15 20:48:57 +09:00
smoogipoo
39b6425c3e Use a grid container to position the stages
Should be more flexible in the future + provides a more dual-stage feel.
2018-01-15 19:55:15 +09:00
smoogipoo
28586317dd Give stages a size again 2018-01-15 19:44:42 +09:00
smoogipoo
8a7892b66a Make variant keybindings work 2018-01-15 19:29:51 +09:00
smoogipoo
b9909ed1cf Refactor addition of hitobjects 2018-01-15 18:20:43 +09:00
smoogipoo
89c3fcbf6a Refactor column construction 2018-01-15 18:11:53 +09:00
smoogipoo
dd67070b6f ManiaAction.Special -> ManiaAction.Special1 2018-01-15 17:58:04 +09:00
smoogipoo
351afc350e Implement co-op keybindings 2018-01-15 17:43:45 +09:00
smoogipoo
0d79d16692 Cleanup testcase 2018-01-15 15:52:07 +09:00
smoogipoo
dbcabfb6ac Remove ManiaAction.Specia2 2018-01-15 15:50:57 +09:00
smoogipoo
1c74e56bab Increase the point at which normal keys start in ManiaAction 2018-01-15 15:50:43 +09: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
smoogipoo
9f98983550 Remove gravity mod
Not sure how this made it back in here.
2018-01-15 15:36:36 +09:00
smoogipoo
bfdfb52666 Fix a few usages of AllJudged possibly not being correct 2018-01-15 15:28:08 +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
ANDY840119-PC\andy840119
cf0d9e4d9b not sure is it a goodway to delete mania ManiaAction.Special or add more 2018-01-14 21:20:01 +09:00
ANDY840119-PC\andy840119
2d266a8604 fix :
1. Instead of this property, turn SpecialColumnPosition into a
2. special column does not display
2018-01-14 20:44:17 +09:00
ANDY840119-PC\andy840119
5ecfc3a57c fix CI error 2018-01-14 13:06:37 +09:00
ANDY840119-PC\andy840119
58bf611d17 This should be done in the stage instead of the playfield. 2018-01-14 12:51:55 +09:00
ANDY840119-PC\andy840119
d07636a105 Fix :
1. This (along with OnJudgement above) should be done in the following three steps:
2. How about giving the stages an Inverted BindableBool, and having them decide their scale?
2018-01-14 12:49:01 +09:00
ANDY840119-PC\andy840119
f7a908fbfa Fix :
This (along with OnJudgement above) should be done in the following three steps:
.
i'm not sure does it means the code i write
2018-01-14 12:08:09 +09:00
ANDY840119-PC\andy840119
4f0e1f03d2 fix the problem that smoogipoo suggest
1. Rename to stages
2. This should be checking for null or 0, with two exceptions:
3. Space before and after =.
4. foreach (var stage ...
5. Rename to getStageByColumn, and actualColumn -> column.
2018-01-14 11:49:23 +09:00
ANDY840119-PC\andy840119
e947e46566 fix :
1. Add space before {, before Duration, and after 1000
2. How about just ManiaStage?
3. This is really just Columns.Count, you're not saving much with this extra variable here.
2018-01-14 11:41:52 +09:00
ANDY840119-PC\andy840119
561c9f2233 update rom ppy master
.
Find out that has some problem long hit note will not show hit result
2018-01-14 11:32:54 +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
354d781002 Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check 2018-01-12 17:49:31 +09:00
smoogipoo
cae93a1d1f Add comment to fade override of holdnote tail 2018-01-12 17:09:39 +09:00
smoogipoo
03824eccc8 Block fadeout on holdnote heads 2018-01-12 17:09:21 +09:00
Dean Herbert
057efa24c7 Move a few interfaces to base classes 2018-01-12 14:26:09 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
smoogipoo
9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +09:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
ANDY840119-PC\andy840119
118e0b63eb fix CI error 2018-01-11 00:07:27 +09:00
ANDY840119-PC\andy840119
cc0520d722 1. because set stage's width doesn't help, so use margin instead
2. adjust spacing when has different number of stages
2018-01-10 23:47:38 +09:00
smoogipoo
6255aaab68 Per-hitobject lifetime management 2018-01-10 19:17:43 +09:00
為什麼
fb857c5e37
Merge branch 'master' into master 2018-01-10 18:48:00 +09:00
smoogipoo
f71d086a41 Fix post-merge issues 2018-01-10 18:08:43 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
ANDY840119-PC\andy840119
4060583b10 Merge branch 'master' of https://github.com/ppy/osu
# Conflicts:
#	osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
2018-01-09 22:09:25 +09:00
Dean Herbert
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
ANDY840119-PC\andy840119
d5b436d91b use public List<Column> Columns => listColumnStages.SelectMany(x => x.Columns).ToList(); instead 2018-01-08 23:11:20 +09:00
smoogipoo
2d345b2f80 Fix mania hold note tick positioning 2018-01-07 11:43:31 +09:00
FreezyLemon
47f5b23dcf fix child size == 0 exception 2018-01-07 00:53:44 +01:00
ANDY840119-PC\andy840119
ca7cd40fba 1. update from ppy master
2. update header
2018-01-06 11:21:10 +09:00
為什麼
98929952e3
Merge branch 'master' into master 2018-01-06 11:17:15 +09:00
ANDY840119-PC\andy840119
50aaf571fb miss 2018-01-06 11:08:49 +09:00
ANDY840119-PC\andy840119
a55ac899a8 fix Empty argument list is redundant 2018-01-06 11:08:04 +09:00
ANDY840119-PC\andy840119
356c7ad528 Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu into mania_fix
# Conflicts:
#	osu-framework
2018-01-05 23:29:33 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
1276e2c71a Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-05 14:58:57 +09:00
Dean Herbert
b2e723d288
Merge branch 'master' into mania-keymods 2018-01-05 13:55:20 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
smoogipoo
ce94c825d1 Fix length of hold notes 2018-01-04 22:05:38 +09:00
smoogipoo
e0e84ff370 Fix mania playfield scrolling hitobjects in the wrong direction 2018-01-04 22:05:20 +09:00
smoogipoo
f569d54958 Local circlesize/od variables 2018-01-04 19:52:29 +09:00
smoogipoo
a7aab21a29 Re-namespace files 2018-01-04 19:22:15 +09:00
smoogipoo
651e24e3cc Implement proper scrolling directions 2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
ANDY840119-PC\andy840119
409664e4dc White space needs to be trimmed 2018-01-03 23:50:52 +09:00
ANDY840119-PC\andy840119
aadafae8cb 1. fix TestCaseManiaHitObjects broken
2. add (4+4) (2+4+2) (1+8+1) column stages step in TestCaseManiaPlayfield
2018-01-03 23:47:05 +09:00
ANDY840119-PC\andy840119
a855a21ccb group -> stage 2018-01-03 23:04:51 +09:00
ANDY840119-PC\andy840119
5326f71ed9 fix some error that smoogipoo says 2018-01-03 22:58:08 +09:00
ANDY840119-PC\andy840119
ee13df94fc Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-01-03 22:02:50 +09:00
smoogipoo
333e1867ab Implement osu!mania keymods
ScoreMultiplier not currently working - that's a more involved change that requires the aforementioned "BeatmapAttributes" changes.
2018-01-03 21:27:32 +09:00
smoogipoo
a4d05e5102 Implement interface on ManiaKeyMod for now 2018-01-03 21:26:36 +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
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Dean Herbert
28cd72a12b Add note about mania xKey mods for future implementation 2017-12-31 04:27:35 +09:00
為什麼
3f318fde2f
Merge branch 'master' into master 2017-12-29 22:48:07 +09:00
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
ANDY840119-PC\andy840119
7b94a710e3 Appveyor Chan, Please 2017-12-28 23:55:06 +09:00
ANDY840119-PC\andy840119
9faa5fb199 pray 2017-12-28 23:40:02 +09:00
ANDY840119-PC\andy840119
a322c15bbd after resharper : (
.
裝上Resharper,從此VS的速度一片黑暗
2017-12-28 23:15:12 +09:00
ANDY840119-PC\andy840119
cfc4c39255 Fixed the alert from AppVeyor.
maybe.
2017-12-28 22:57:41 +09:00
ANDY840119-PC\andy840119
28da60cc38 https://github.com/ppy/osu/issues/716
1. split the playfield columns by ManiaModKeyCoop
2. can chaneg the key number by ManiaKeyMod
2017-12-28 22:40:23 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
smoogipoo
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +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
Dean Herbert
aeafa5645a Make Samples null by default and prepopulate in mania 2017-12-23 18:06:46 +09:00
smoogipoo
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
smoogipoo
ac1d27e925 Fix possible nullref exceptions 2017-12-21 23:02:46 +09:00
smoogipoo
d80079a73a Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-21 20:15:01 +09:00
smoogipoo
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
smoogipoo
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
Dean Herbert
020d272636 Make all TestCases public 2017-12-20 21:51:00 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
FreezyLemon
4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
smoogipoo
f9e34dfa3d Assume that control points are already sequentially-ordered
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
smoogipoo
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
smoogipoo
a30270658d Merge remote-tracking branch 'origin/master' into netstandard 2017-12-01 18:50:28 +09:00
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
Dean Herbert
3e01a0dda5
Merge branch 'master' into mania-auto-generation-fixes 2017-11-29 19:11:36 +09:00
smoogipoo
d69fa0966f Generate ManiaReplayFrame instead of ReplayFrame 2017-11-29 18:42:54 +09:00
smoogipoo
dfd035d07b Merge remote-tracking branch 'origin/master' into mania-auto-generation-fixes 2017-11-29 18:42:17 +09:00
Dean Herbert
93d7cd5a6d
Merge branch 'master' into performance-calculator 2017-11-29 18:37:07 +09:00
Dan Balasescu
7cbca37e2d
Remove redundant cast 2017-11-29 18:18:36 +09:00
smoogipoo
6fd550dc91 Simplify/sanitize construction of ManiaReplayFrame 2017-11-29 15:47:10 +09:00
smoogipoo
1136db1556 Fix mania replays not defining important frames
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
smoogipoo
7db7fb91dd Ignore ruleset testcases from CI 2017-11-28 21:45:24 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
smoogipoo
00f9f97850 Fix compile errors (rider didn't warn me about these) 2017-11-28 19:13:10 +09:00
smoogipoo
375f2710d4 Rename file 2017-11-28 19:09:17 +09:00
smoogipoo
cc9e06e161 Remove unused elements 2017-11-28 19:07:10 +09:00
smoogipoo
eaf2b1d94d Remove line that shouldn't have been added yet 2017-11-28 19:06:46 +09:00
smoogipoo
567e378bbb CI fixes 2017-11-28 19:02:39 +09:00
smoogipoo
f8c296877b Add testcase for mania beatmap conversion (currently ignored) 2017-11-28 18:59:20 +09:00
smoogipoo
b97cab4f29 Make ManiaFramedReplayInputHandler properly account for special keys
These are interleaved into the playfield, so we have to use the playfield's columns' actions.
2017-11-28 15:27:20 +09:00
smoogipoo
84702211ec Rewrite mania auto generator to properly account for overlapping objects 2017-11-28 15:17:02 +09:00
smoogipoo
2c53be7853 Fix possible invalid cast when generating mania patterns 2017-11-27 18:39:13 +09:00
Dean Herbert
288c21dfec Move TestCase descriptions to attributes
Depends on https://github.com/ppy/osu-framework/pull/1186.
2017-11-23 16:09:32 +09:00
smoogipoo
f9ad4b6acb Make categoryDifficulties return doubles to improve decimal accuracy 2017-11-21 19:55:09 +09:00