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 |
|