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
