Dan Balasescu
|
3692846367
|
Merge branch 'master' into snapping-refactor
|
2019-10-25 18:26:14 +09:00 |
|
smoogipoo
|
ae011e8ee8
|
Fix distance snap grid test scenes
|
2019-10-25 17:25:46 +09:00 |
|
smoogipoo
|
4ca6a5a0cc
|
Interface the distance snap provider
|
2019-10-25 16:50:21 +09:00 |
|
smoogipoo
|
607b4d874a
|
Refactor flow of snapping through HitObjectComposer
|
2019-10-25 16:40:30 +09:00 |
|
Dean Herbert
|
0b3c7f28af
|
Merge branch 'master' into fix-dragbox-first-frame
|
2019-10-24 23:01:32 +09:00 |
|
Dean Herbert
|
fa3350ce2d
|
Refactor blueprint movement and selection events (#6588)
Refactor blueprint movement and selection events
|
2019-10-24 22:58:03 +09:00 |
|
smoogipoo
|
a969914d6e
|
Mention coordinate space
|
2019-10-24 18:24:22 +09:00 |
|
smoogipoo
|
d83b9ef0e4
|
Rename grid snapping methods
|
2019-10-24 18:18:04 +09:00 |
|
smoogipoo
|
f45f17339c
|
Implement slider path distance snapping
|
2019-10-24 18:17:30 +09:00 |
|
smoogipoo
|
7a71352684
|
Fix drag box being positioned incorrectly for 1 frame
|
2019-10-24 17:22:14 +09:00 |
|
smoogipoo
|
fb88001c0e
|
Reorder blueprint addition/removal + add regions
|
2019-10-24 16:53:34 +09:00 |
|
smoogipoo
|
45bd91f63f
|
Add special cases for click-selection
|
2019-10-24 16:14:29 +09:00 |
|
smoogipoo
|
8e4a21bee7
|
Separate out mouse down/click/up handling
|
2019-10-24 15:58:22 +09:00 |
|
smoogipoo
|
a07e5a269b
|
Extract drag events into multiple methods
|
2019-10-24 15:33:08 +09:00 |
|
smoogipoo
|
f128e99fb2
|
Remove unused methods
|
2019-10-24 15:07:04 +09:00 |
|
smoogipoo
|
e04c77178c
|
Move selection events to BlueprintContainer
|
2019-10-24 14:58:02 +09:00 |
|
smoogipoo
|
714c89faa4
|
Move selection drag events to BlueprintContainer
|
2019-10-24 14:57:58 +09:00 |
|
smoogipoo
|
cef2318cf5
|
Move drag box drag handling to BlueprintContainer
|
2019-10-23 18:38:06 +09:00 |
|
Dean Herbert
|
f61d7e4fbe
|
Add smoothing and tidy code a touch
|
2019-10-23 17:56:09 +09:00 |
|
smoogipoo
|
c9fec50f63
|
Remove unnecessary whitespace
|
2019-10-23 17:00:17 +09:00 |
|
smoogipoo
|
97383b4a37
|
Show centre point of distance snap grid
|
2019-10-23 16:58:56 +09:00 |
|
Dean Herbert
|
0bf35faae8
|
Update incorrect reference
|
2019-10-21 19:25:56 +09:00 |
|
Dean Herbert
|
e3fa5f1da3
|
Merge branch 'master' into beatsnap-grid-integration
|
2019-10-21 18:44:34 +09:00 |
|
Dean Herbert
|
b157aaead1
|
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
|
2019-10-21 17:09:43 +09:00 |
|
smoogipoo
|
38c2c328ff
|
Rename HitObject -> DrawableObject in selection blueprints
|
2019-10-21 17:04:56 +09:00 |
|
smoogipoo
|
fc7e4680a7
|
Split on multiple lines
|
2019-10-21 14:08:28 +09:00 |
|
smoogipoo
|
463079e148
|
Implement placement snapping
|
2019-10-18 13:48:59 +09:00 |
|
smoogipoo
|
ba4402207a
|
Implement selection time snapping
|
2019-10-18 12:53:38 +09:00 |
|
smoogipoo
|
1dc7c59853
|
Implement selection position snapping
|
2019-10-18 12:53:27 +09:00 |
|
smoogipoo
|
bc76a9cb8c
|
Expose selection changed event from BlueprintContainer
|
2019-10-18 12:40:27 +09:00 |
|
smoogipoo
|
c5ee533524
|
Merge branch 'dho-apply' into beatsnap-grid-integration
|
2019-10-18 12:38:29 +09:00 |
|
smoogipoo
|
510ce9345f
|
Fix potential blueprint nullrefs with the new structure
|
2019-10-17 16:14:28 +09:00 |
|
Dean Herbert
|
f92331531c
|
Rename grid to DistanceSnap to be more in line with its purpose
|
2019-10-17 15:32:02 +09:00 |
|
smoogipoo
|
b6b8098b98
|
Add an arbitrary offset to prevent div-by-0
|
2019-10-16 19:44:53 +09:00 |
|
smoogipoo
|
2d4b7dc361
|
Remove redundant code
|
2019-10-16 19:33:18 +09:00 |
|
smoogipoo
|
5ac5e34f85
|
Use a cleaner distance function
|
2019-10-16 19:32:45 +09:00 |
|
Dean Herbert
|
f3c38ae089
|
Merge branch 'master' into osu-beatsnapping-grid
|
2019-10-13 18:38:57 +09:00 |
|
Dean Herbert
|
00f0957cc3
|
Merge branch 'master' into editor-grids-2
|
2019-10-12 23:28:51 +09:00 |
|
smoogipoo
|
45835f97a1
|
Split out grids into separate files
|
2019-10-11 18:41:17 +09:00 |
|
smoogipoo
|
050d86a741
|
Always use the local coordinate space
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
9ecec806c2
|
Rename grid creation method + parameter
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
5f0cd356d7
|
Rename startPosition to centrePosition
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
8fb2628f9e
|
Improve xmldocs
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
66e0fef85b
|
Expose StartPosition for derived grids to use
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
97d4a8e59e
|
Remove unnecessary dependency
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
2df519ddfa
|
Simplify colour retrieval function
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
2aa3d0bb39
|
Implement base class for beat snapping grids
|
2019-10-11 18:24:33 +09:00 |
|
smoogipoo
|
2e2768870f
|
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
|
2019-10-10 16:38:41 +09:00 |
|
Dean Herbert
|
0681bb9a2b
|
Fix potential nullref
|
2019-10-09 16:49:10 +09:00 |
|
Dean Herbert
|
2d8e5615e4
|
Extract timeline and layout logic from ComposeScreen
|
2019-10-09 16:05:55 +09:00 |
|
smoogipoo
|
179656788d
|
Remove unnecessary method
|
2019-10-08 19:27:59 +09:00 |
|
smoogipoo
|
c1db11fa06
|
More removal of "drag"
|
2019-10-08 19:24:58 +09:00 |
|
smoogipoo
|
8b661e624d
|
Remove drag from class/method namings + refactor
|
2019-10-08 19:08:31 +09:00 |
|
smoogipoo
|
08d043f447
|
Move selection relative to the hitobject start positions
|
2019-10-08 18:57:03 +09:00 |
|
Dean Herbert
|
63bf8ff832
|
Better signify under construction screens in editor
|
2019-10-08 14:32:48 +09:00 |
|
Dean Herbert
|
24269c0384
|
Fix skins not being displayed correctly in the editor
|
2019-10-08 12:52:34 +09:00 |
|
smoogipoo
|
652acac87f
|
Move placement movement event to BlueprintContainer
|
2019-10-03 16:14:42 +09:00 |
|
smoogipoo
|
cbbc6aad6e
|
Make method static
|
2019-08-31 21:32:02 +09:00 |
|
smoogipoo
|
40729356fa
|
Move beat divisor colour retrieval to BindableBeatDivisor
|
2019-08-30 17:34:58 +09:00 |
|
smoogipoo
|
7927b684d3
|
Hook up + use editor beatmap
|
2019-08-29 16:06:40 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Dean Herbert
|
1b75fbed9a
|
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
|
2019-06-14 23:25:17 +09:00 |
|
Dean Herbert
|
bc574520bf
|
Update ScrollContainer usages in line with framework changes
|
2019-06-14 15:55:32 +09:00 |
|
Dean Herbert
|
15b9b53d35
|
Fix IconButtons not being scaled correctly
|
2019-06-14 13:40:32 +09:00 |
|
Dan Balasescu
|
22940373a0
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 13:54:21 +09:00 |
|
smoogipoo
|
5c6b4d923f
|
Reorder methods
|
2019-05-09 13:53:53 +09:00 |
|
David Zhao
|
d625f3c104
|
Private method
|
2019-05-09 13:21:01 +09:00 |
|
David Zhao
|
ff3c226596
|
Give ZoomableScrollContainer an initial width
|
2019-05-08 13:37:03 +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 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
David Zhao
|
6502e26d09
|
Add draw size invalidation to ZoomableScrollContainer
|
2019-04-19 16:21:15 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +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
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
5487b011d6
|
Fix some inspections rider isn't able to deal with automatically
|
2019-03-02 14:34:56 +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
|
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
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09: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
|
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
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
smoogipoo
|
8692be9de3
|
Fix sliderbar not working correctly with TransferValueOnCommit = true
|
2019-01-08 16:07:54 +09:00 |
|
smoogipoo
|
f9f300b215
|
Fix drag breaking if scrolling while dragging
|
2018-11-26 16:08:56 +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
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
smoogipoo
|
55edeb095d
|
SelectionBox -> SelectionHandler
|
2018-11-19 16:58:11 +09:00 |
|
smoogipoo
|
4cbda97b1e
|
Move positional adjustment to SelectionBox
|
2018-11-16 17:12:24 +09:00 |
|
smoogipoo
|
df7515b66f
|
Pass all selected hitobjects to the selection blueprints
|
2018-11-15 21:01:09 +09:00 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
smoogipoo
|
6d43baf4bf
|
Make show/hide only invoked once each
|
2018-11-13 13:12:11 +09:00 |
|
smoogipoo
|
fbc20d2d4d
|
Hide placement when cursor is not in the playfield
|
2018-11-13 12:52:04 +09:00 |
|
smoogipoo
|
5d51719572
|
Make selection blueprints handle position adjustments
|
2018-11-07 16:21:32 +09:00 |
|