Dean Herbert
|
c944e8bb29
|
Merge branch 'master' into fix-deletion-crash
|
2018-11-26 14:20:02 +09:00 |
|
smoogipoo
|
5d6a438f98
|
Make selected mania hitobjects always alive
|
2018-11-26 11:34:25 +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
|
079230d9ed
|
Merge branch 'master' into mania-selection-movement
|
2018-11-19 18:03:12 +09:00 |
|
jorolf
|
80bd98bb9d
|
apply suggestions
|
2018-11-15 17:38:38 +01: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
|
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 |
|