1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 18:47:26 +08:00
Commit Graph

15239 Commits

Author SHA1 Message Date
Dean Herbert
00749ffcec
Merge pull request #3693 from smoogipoo/manual-position-adjustments
Let selection blueprints handle positional adjustments
2018-11-09 11:22:13 +09:00
Dean Herbert
27549586e6
Merge branch 'master' into manual-position-adjustments 2018-11-09 10:53:41 +09:00
smoogipoo
d0b63e8f8d Fix missing references 2018-11-08 14:13:57 +09:00
smoogipoo
33056b8098 Adjust namespaces 2018-11-08 14:04:21 +09:00
smoogipoo
f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo
2f87f267a3 Fix height being set instead of width 2018-11-08 14:04:20 +09:00
smoogipoo
195f82fa96 Give visualiser methods range+length params again 2018-11-08 14:04:20 +09:00
smoogipoo
f41bfd14ca Add some xmldocs 2018-11-08 14:04:20 +09:00
smoogipoo
76ea314c27 Reorder params 2018-11-08 14:04:20 +09:00
smoogipoo
589c3a47e2 Remove state computation + updates from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
smoogipoo
0bdeebbce2 Expose basic values from ISpeedChangeVisualiser 2018-11-08 14:04:20 +09:00
smoogipoo
8583fd1380 Fix testcase never working 2018-11-08 14:04:20 +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
c6350c6efd Remove IHasEditablePosition 2018-11-08 13:03:11 +09:00
jorolf
5c09662c14 Allow flashlight size to be variant 2018-11-07 23:40:33 +01:00
Dean Herbert
c4be2af498
Merge pull request #3691 from smoogipoo/fix-hitobject-masking
Fix hitobjects not updating IsMaskedAway after being judged
2018-11-08 00:38:38 +09:00
Dean Herbert
f2e22e0fd1
Merge branch 'master' into fix-hitobject-masking 2018-11-08 00:26:38 +09:00
Dean Herbert
9467b055a5
Merge pull request #3690 from smoogipoo/cleanup-editor
Adjust some missed renames
2018-11-07 17:13:02 +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
cf4dad0fe8 Fix hitobjects not updating IsMaskedAway after being judged 2018-11-07 15:42:40 +09:00
smoogipoo
4277cb0d59 Adjust some missed renames 2018-11-07 15:04:48 +09:00
Dean Herbert
c142b86fd6
Merge pull request #3685 from smoogipoo/cleanup-editor
Re-namespace + rename compose-mode components
2018-11-07 13:55:27 +09:00
smoogipoo
e9e50f41fb Use Name/NameScreen format 2018-11-07 13:04:17 +09:00
jorolf
2cffce805a add flashlight mod 2018-11-07 00:48:54 +01:00
Dean Herbert
7f73fc2d39 Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
smoogipoo
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
smoogipoo
ac25718c5a Renamespace compose-mode components 2018-11-06 18:14:46 +09:00
smoogipoo
27d82052f4 BorderLayer -> EditorPlayfieldBorder 2018-11-06 18:10:46 +09:00
smoogipoo
85f96ad62f Fix a few missed renames 2018-11-06 18:07:53 +09:00
smoogipoo
b3fa7c111b Rename testcases 2018-11-06 18:06:20 +09:00
smoogipoo
bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
smoogipoo
11be820efe CreateMaskFor -> CreateBlueprintFor 2018-11-06 18:03:21 +09:00
smoogipoo
90c813618a Merge PlacementContainer into BlueprintContainer 2018-11-06 18:02:55 +09:00
smoogipoo
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
smoogipoo
ad2836a61e MaskSelection -> SelectionBox 2018-11-06 17:52:47 +09:00
smoogipoo
65bb91dcf7 Merge MaskContainer into BlueprintContainer 2018-11-06 17:51:26 +09:00
smoogipoo
26c9390c16 HitObjectMaskLayer -> BlueprintContainer 2018-11-06 17:36:10 +09:00
smoogipoo
faab744cbd DragLayer -> DragBox 2018-11-06 17:24:57 +09:00
Dean Herbert
779e57f0ca Change .idea ignore rules to not ignore run configurations 2018-11-06 16:32:11 +09:00
Dean Herbert
5eecdffa5d
Merge pull request #3683 from peppy/build-executable-flag
Add executable flag to build.sh
2018-11-06 16:31:13 +09:00
Dean Herbert
2c4aa5af65 Add executable flag to build.sh 2018-11-06 16:16:15 +09:00
Dean Herbert
1fbf15d65c
Merge pull request #3681 from peppy/update-framework
Update framework and other dependencies
2018-11-05 18:33:31 +09:00
Dean Herbert
4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +09:00
Dean Herbert
6aa61e1516
Merge pull request #3600 from smoogipoo/fix-slider-samples
Fix sliders using the wrong samples
2018-11-05 18:19:25 +09:00
smoogipoo
ace1dce281 Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
2018-11-05 18:10:22 +09:00
Dean Herbert
697b1f6728
Merge pull request #3680 from smoogipoo/fix-add-bank
Fix sample additions not falling back to non-addition bank
2018-11-05 18:06:21 +09:00
smoogipoo
92d570342c Fix sample additions not falling back to non-addition bank 2018-11-05 17:35:24 +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