Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Shane Woolcock
ce17e37c74
Conditionally add some UI elements only on desktop
...
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +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
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728
Move toolbar showing and overlay activation to OsuGame
...
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
smoogipoo
8692be9de3
Fix sliderbar not working correctly with TransferValueOnCommit = true
2019-01-08 16:07:54 +09:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
smoogipoo
bc3fcb87b7
Use input events rather than scene graph traversals
2018-11-30 15:47:55 +09:00
Dan Balasescu
e83f6707bf
Merge branch 'master' into editor-keyboard-seek
2018-11-30 15:17:06 +09:00
Dean Herbert
ab621bd873
Toggle pause in editor with spacebar
2018-11-30 14:58:09 +09:00
Dean Herbert
0ee5a5bdb4
Add support for keyboard seeking in the editor
2018-11-30 14:57:25 +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
Dan Balasescu
b446a73c0c
Add brackets
...
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
Dean Herbert
10047e6815
Adjust tick-based wheel control to be more correct
2018-11-22 20:13:40 +09:00
Dean Herbert
a48c26d999
Fix precision scroll events being handled incorrectly by editor
2018-11-22 19:40:44 +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
smoogipoo
e9e50f41fb
Use Name/NameScreen format
2018-11-07 13:04:17 +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
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
smoogipoo
171700cb91
Debounce editor summary timeline seeks
2018-11-05 15:59:40 +09:00
Dean Herbert
0a0023920f
Fix not being able to drag control points mid-snake
2018-11-02 04:09:33 +09:00
Dean Herbert
5eaf80ab76
Add missing newline
2018-10-31 12:07:06 +09:00
smoogipoo
72d48aa7f5
Add xmldocs to IPlacementHandler
2018-10-18 16:46:30 +09:00
smoogipoo
0e841628b6
Implement hitobject deletion
2018-10-18 16:36:06 +09:00
smoogipoo
969477dadd
Remove placement events, make everything pass top-down
2018-10-17 17:43:16 +09:00
smoogipoo
62635c5ab8
Add container to handle placement mask
2018-10-17 16:17:49 +09:00
smoogipoo
4ea4ec0d25
Move placement handling events to a higher level
2018-10-17 15:46:30 +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
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
934b687965
Fix selection masks not being added for new objects
2018-10-03 16:49:59 +09:00
smoogipoo
4cdb6dcea5
Rename HitObjectMask -> SelectionMask
2018-10-03 13:28:00 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button
2018-08-21 19:15:20 +09:00
smoogipoo
85dc42d47a
Re-namespace/rename CircularButton
2018-08-15 16:49:53 +09:00
Dean Herbert
6ee06602b8
Merge branch 'master' into mania-mask-container
2018-08-02 20:41:27 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button
2018-08-02 20:25:45 +09:00
smoogipoo
10b8708d4e
Make SetupCircularButton adjust corner radius by height
2018-08-01 17:47:32 +09:00
smoogipoo
9eb47ae691
Make SetupCircularButton inherit OsuButton
2018-08-01 17:02:52 +09:00
Shane Woolcock
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
smoogipoo
c9d4332846
size_x, size_y -> width, height
2018-07-31 16:44:20 +09:00
smoogipoo
c5a772bbc8
Completely reuse TriangleButton
2018-07-31 15:49:04 +09:00
AlFasGD
93cf063c97
Remove useless things
2018-07-27 12:52:33 +03:00
AlFasGD
1962797e20
Remove unnecessary using directive
2018-07-27 12:40:38 +03:00
AlFasGD
78cde95132
Privatise constants
2018-07-27 12:34:11 +03:00
AlFasGD
3ee1353976
Remove whitespace
2018-07-27 12:28:47 +03:00
AlFasGD
2a819a53c0
Prefer inheriting TriangleButton instead of Container
2018-07-27 12:26:37 +03:00
AlFasGD
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
smoogipoo
206e3686f2
Add back blue border
2018-07-25 18:38:50 +09:00
smoogipoo
b60e4b0728
Cleanup
2018-07-25 18:34:47 +09:00
AlFasGD
6675c455f3
Trim whitespace that magically appeared
2018-07-24 22:33:19 +03:00
AlFasGD
3ca112aef0
Clean code and apply requested changes
2018-07-24 22:04:02 +03:00
AlFasGD
ebf14c9c93
Update framework from current master
2018-07-24 11:32:24 +03:00
AlFasGD
d304aca08f
Merge branch 'master' into circular-button
2018-07-24 11:30:56 +03:00
AlFasGD
4d0d4523ca
Add test case, rename component
2018-07-24 11:23:38 +03:00
AlFasGD
0e50e4ee34
Clean code
2018-07-24 10:10:17 +03:00
AlFasGD
765c6e4ecc
Remove custom text box
2018-07-24 09:46:24 +03:00
AlFasGD
2f452c162c
Make text colour white
2018-07-24 09:21:01 +03:00
AlFasGD
a833fa3d92
Update framework and apply suggested changes
2018-07-24 09:19:45 +03:00
AlFasGD
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
AlFasGD
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03: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
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
AlFasGD
7b4616c6c1
Add circular button file
2018-07-20 14:02:02 +03:00
AlFasGD
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
smoogipoo
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
smoogipoo
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +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
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +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
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
smoogipoo
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
smoogipoo
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
...
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
smoogipoo
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
smoogipoo
54e60d8bc2
Fix test appveyor tests failing due to lack of audio manager
2018-06-18 19:27:22 +09:00
smoogipoo
6d318d35ee
Fix not being able to seek by other means during flick-scroll
2018-06-18 18:56:54 +09:00
smoogipoo
dbc50e35d5
Fix the timeline and editor fighting over track seeking
2018-06-18 18:02:26 +09:00
Dean Herbert
b1d059a67d
Add some colours to the compose-mode timeline
2018-06-18 04:31:47 +09:00
Dean Herbert
bec6e3083e
Remove scrollbar depth change as scrollbar is hidden now
2018-06-18 03:19:21 +09:00
Dean Herbert
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
Dean Herbert
31f9d0161d
Add a comment about precision scroll behaviour
2018-06-18 03:03:09 +09:00
smoogipoo
3b396e38ca
Hide the scrollbar
2018-06-12 15:51:48 +09:00
smoogipoo
aaf2f66594
Make scrolling only zoom the timeline
2018-06-12 15:51:36 +09:00
smoogipoo
6ceac8ab0a
Add a centre marker to the timeline
2018-06-12 14:34:28 +09:00
smoogipoo
30b7b7961f
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
2018-06-12 14:22:27 +09:00
Dean Herbert
8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +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
Dean Herbert
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
smoogipoo
d1b469c1a3
Better handling of nested playfields' hitobjects
2018-06-07 16:28: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
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
Dean Herbert
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
smoogipoo
b649025e86
beginUserDrag/endUserDrag
2018-05-24 14:36:48 +09:00
smoogipoo
d4f68e0b67
Fix possible NaN values due to trackvirtual infinite length
2018-05-24 14:31:31 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
smoogipoo
a5d2d74447
Remove whitespace
2018-05-23 19:01:27 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
a30f72b477
Add helper methods for seeking/scrolling
2018-05-23 14:32:00 +09:00
smoogipoo
6b0eeb3436
Rework seeking interactions to support smooth scrolling
2018-05-23 14:14:32 +09:00
smoogipoo
49f893d5e4
Couple the timeline to the audio
2018-05-23 12:00:11 +09:00
smoogipoo
1dfa3ff995
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
2018-05-22 18:30:29 +09:00
AlFasGD
2769f6c47b
Fix issues
2018-05-22 09:09:25 +03:00
AlFasGD
d504a44dfb
Implement mask layering (incomplete)
2018-05-21 23:08:04 +03:00
Aergwyn
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
AlFasGD
a54bda6ce1
Apply requested changes
2018-05-21 13:23:39 +03:00
Aergwyn
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
smoogipoo
82607b3eb3
Expose properties to control zoom
2018-05-18 17:53:09 +09:00
smoogipoo
bc3d195aa2
Fix line endings
2018-05-18 13:05:58 +09:00
smoogipoo
3f365c6621
Merge branch 'master' into editor-timeline-rework
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Compose.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
2018-05-16 18:04:24 +09:00
AlFasGD
2a90686da6
Simplify expression
2018-05-12 15:09:53 +03:00
AlFasGD
e44062b77a
Fix tests and implementation
2018-05-08 16:37:06 +03:00
AlFasGD
dd9b9a18ac
Prevent user from scrolling outside the timeline in the editor
2018-05-08 16:21:54 +03:00
smoogipoo
674e45d49b
Fix beatmap/ruleset being changeable while in the editor
2018-05-07 16:32:15 +09:00
Dean Herbert
93b77d9cfe
Remove annotation
2018-04-23 22:22:31 +09:00
Dean Herbert
ff3d3379f0
Merge remote-tracking branch 'upstream/master' into async-screens
2018-04-23 18:29:37 +09:00
Dean Herbert
194992936d
Use exceptions
2018-04-23 17:57:47 +09:00
Dean Herbert
6e16f2a3c3
Add assert to appease rider/r#
2018-04-23 15:03:41 +09:00
Dean Herbert
e9e97f31d6
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
2018-04-20 19:06:47 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
Dean Herbert
de85436534
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
2018-04-20 16:52:58 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
127f0d7b01
Fix smoogipoo's comments
2018-04-12 21:17:17 +09:00
Dean Herbert
0ca703beaa
Add some missing xmldoc
2018-04-12 21:04:45 +09:00
smoogipoo
a2484fbf56
Move back to DI-ing adjustable clock into SummaryTimeline
2018-04-12 13:37:02 +09:00
smoogipoo
fbc50d6030
Merge master into editor-clock
2018-04-12 13:35:53 +09:00
smoogipoo
e59124962c
Remove re-instantiation of clock in EditorClockTestCase
2018-04-06 18:38:44 +09:00
smoogipoo
9e8490735f
Fix Compose not binding to the editor's beat divisor
2018-04-06 18:22:24 +09:00
smoogipoo
c7abd56fc4
Give editor a custom clock to handle seeking
2018-04-06 18:11:37 +09:00
smoogipoo
f07928446d
Remove instances of "waveform"
2018-04-06 15:52:39 +09:00
smoogipoo
9b060b1bdf
Fix delay in value retrieval causing offsetting when zooming
2018-04-06 15:51:40 +09:00
smoogipoo
d9e795fb9f
TimelineContainer -> TimelineArea
2018-04-05 19:40:03 +09:00
smoogipoo
a84536d343
ScrollingTimelineContainer -> Timeline
2018-04-05 19:33:47 +09:00
smoogipoo
f41d31e1db
ScrollableTimeline -> TimelineContainer
2018-04-05 19:33:25 +09:00
smoogipoo
9a9ed1d630
Encapsulate zoom logic into a separate class
2018-04-05 19:30:54 +09:00
smoogipoo
0141cbebba
waveformContainer -> zoomedContent
2018-04-05 19:08:10 +09:00
smoogipoo
8da3c2c52a
Expose zoom publicly again, re-enable zoom buttons
2018-04-05 19:05:19 +09:00
smoogipoo
35e116cb12
Reduce ctor arguments
2018-04-05 19:04:07 +09:00
smoogipoo
eff5eddbe9
Make zoom an int again
2018-04-05 18:41:22 +09:00
smoogipoo
074dee3a83
Re-implement mousewheel zoom
2018-04-05 18:37:51 +09:00
smoogipoo
e3af32ad2f
A bit of cleanup
2018-04-05 17:07:41 +09:00
smoogipoo
9bb3e56bb3
Implement half-width overflows
2018-04-05 17:07:00 +09:00
smoogipoo
e7aa1d9c38
Temporarily remove zoom levels, simplify scrollingtimelinecontainer
2018-04-05 16:12:21 +09:00
smoogipoo
870ce8868c
Make scrollabletimeline use gridcontainer
2018-04-05 16:07:33 +09:00
Dean Herbert
31ade986a7
Scren async changes in line with framework changes
...
Makes editor not stutter on load, amongst other screens.
2018-03-30 14:58:11 +09:00
Dean Herbert
0e669c9a3f
Fix many warnings
2018-03-24 18:23:22 +09:00
smoogipoo
ffa712dccb
Fix post-merge issues
2018-03-24 15:19:45 +09:00
smoogipoo
2b7d22c4ea
Very slightly reduce size of slider bar to increase bottom padding
2018-03-22 20:11:55 +09:00
Dean Herbert
dade52d15d
Fix vertical padding
2018-03-22 16:15:14 +09:00
Dean Herbert
271c082606
Adjust colour assignment
2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea
Adjust text size to match design
2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a
Apply minor fixes
2018-03-21 15:40:43 +09:00
Dean Herbert
8ac660b0c6
Fixes for keyboard handling and general code quality
2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c
Adjust colours and spacing
2018-03-20 21:59:56 +09:00
Dean Herbert
dac1ba21db
Make keyboard control work
2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe
Adjust styling and colours
2018-03-20 21:31:17 +09:00
Dean Herbert
c2eb32c0e9
DrawableBeatDivisor -> BeatDivisorControl
2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c
Move value change logic to bindable
...
Also add drag support
2018-03-20 20:09:55 +09:00
smoogipoo
50192b21e3
Give DrawableBeatDivisor a ctor
2018-03-20 13:57:25 +09:00
smoogipoo
b1d09500f2
Integrate beat snap divisor into editor seeking
2018-03-19 20:42:06 +09:00
smoogipoo
c5eab7a227
Actually rename to DrawableBeatDivisor...
2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c
Integrate with dependency injection
2018-03-19 20:33:58 +09:00
smoogipoo
4c0ccffe08
Merge remote-tracking branch 'origin/master' into beat-snap-divisor
2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5
Rename + renamespace
2018-03-19 20:21:19 +09:00
smoogipoo
879dbc75b5
Nest TickContainer in BeatSnapVisualiser
2018-03-19 20:20:29 +09:00
smoogipoo
b25c564ecb
Integrate into editor's compose screen
2018-03-19 20:14:58 +09:00
smoogipoo
32fecc6ff4
Adjust icon scale + text
2018-03-19 20:14:34 +09:00
smoogipoo
e96dad441d
Offset the icon buttons a little bit to look a bit more centered
...
Maybe it's just me, but this is really triggering me.
2018-03-19 20:14:13 +09:00
smoogipoo
c86ddb7ee3
Add slight easing to marker movements
2018-03-19 19:57:02 +09:00
smoogipoo
fbc92bfa01
Add previous/next divisor button actions
2018-03-19 19:55:49 +09:00
smoogipoo
070db63157
Privatise tick to TickContainer
2018-03-19 19:52:22 +09:00
smoogipoo
7182442b21
Add divisor text
2018-03-19 19:49:57 +09:00
smoogipoo
6b035e8c53
Add basic structure/layout for the beat snap visualiser
2018-03-19 19:46:26 +09:00
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks
2018-03-19 19:06:38 +09:00
smoogipoo
8d4c9eda48
Fix attempting to add selection boxes with no selection
...
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
2018-03-19 18:00:11 +09:00
smoogipoo
e25d1f6982
Pass down editor clocks through DI
2018-03-19 16:27:52 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks
2018-03-16 23:32:54 +09:00
smoogipoo
d05947ef48
Pass adjustable clocks to components, rather than relying on the track
2018-03-15 18:19:28 +09:00
smoogipoo
c8f6a6980b
Move clock construction to Editor
2018-03-15 17:27:37 +09:00
smoogipoo
5e742eb466
Move editor constructions to BDL load
2018-03-15 17:10:08 +09:00
Dean Herbert
81f82d98a1
Rework a lot of naming and structure
2018-03-14 15:18:21 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays
2017-12-27 23:26:57 +09:00
Dean Herbert
ae9f08f387
Fix crash in editor when trying to seek on a virtual track
2017-12-27 11:47:04 +09:00
Dean Herbert
71a94d6b44
Add a bindable Enabled flag to NotificationManager
...
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
smoogipoo
2fb8895e66
Add spacer to menu
2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa
Remove migration setting in favour of export option in the editor
2017-12-21 19:56:12 +09:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +09:00
smoogipoo
2852337b04
Remove unused using
2017-12-02 20:35:47 +09:00
smoogipoo
cd20d6df16
Apply suggested changes
2017-12-02 20:31:15 +09:00
smoogipoo
c14d68e685
Use OsuColour for radio buttons
2017-12-02 20:30:18 +09:00
smoogipoo
5be00cb0ec
Add todo
2017-12-01 18:40:55 +09:00
smoogipoo
0b95e36675
Fix RelativeChildSize error temporarily
2017-12-01 18:00:20 +09:00
smoogipoo
89772f4efd
A few resharper fixes
2017-11-30 19:54:58 +09:00
smoogipoo
e9cbef88f1
Improve selection/deselection behaviour of RadioButtonCollections
2017-11-30 19:50:07 +09:00
smoogipoo
efa39f38ca
CI fixes
2017-11-30 18:49:08 +09:00
smoogipoo
e5353bb53e
Add border to playfield, add shadow to toolbox buttons
2017-11-30 17:38:55 +09:00
smoogipoo
456bbe25f3
Implement toolbox into HitObjectComposer
2017-11-30 16:58:14 +09:00
smoogipoo
73e41f9dde
Add constructors to RadioButton
2017-11-30 16:57:30 +09:00
smoogipoo
ead7456978
Add compose radio buttons + testcase
2017-11-30 15:43:19 +09:00
smoogipoo
abd6125691
Make sure that composerContainer is cleared for testing purposes
2017-11-30 14:00:17 +09:00
smoogipoo
a7a9569aee
Don't exit when we don't have composer for now
2017-11-30 13:53:57 +09:00
smoogipoo
ee35422efc
Handle rulesets that don't support composition a bit better
2017-11-29 18:38:12 +09:00
smoogipoo
309eb4edd7
Integrate HitObjectComposer into Compose
...
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
smoogipoo
f586cbac32
Restructure Compose to use grids and eventually support HitObjectContainer
2017-11-29 16:47:52 +09:00
Dean Herbert
36d45f633d
Reorder methods
2017-11-22 11:57:09 +09:00
Dean Herbert
e3c5a599b6
Tidy some regressions
2017-11-22 11:36:29 +09:00
Dean Herbert
27fb598352
Update colours to match design
2017-11-22 11:34:54 +09:00
Dean Herbert
0f8499c580
Rename to PlaybackControl and add a TestCase
2017-11-22 11:22:46 +09:00
Dean Herbert
ff5404e57f
Remove need for AlwaysPresent
...
Also self-contains the tab options inside the tab control.
2017-11-22 11:21:48 +09:00
Dean Herbert
855acc9401
Fix leading space before percent sign
2017-11-22 11:17:10 +09:00
Dean Herbert
c06d6d0bbb
Rename weird method
2017-11-22 10:59:31 +09:00
Dean Herbert
461c8e8be0
Clean up state change logic
2017-11-22 10:55:06 +09:00
Dean Herbert
63d366ea4b
Bindables should be readonly
2017-11-22 10:54:33 +09:00
EVAST9919
41498ffad3
Apply suggestions
2017-11-21 12:22:19 +03:00
smoogipoo
0d1b5ae44f
Adjust bottom bar sizing as suggested
2017-11-21 17:51:07 +09:00
smoogipoo
238756ec5d
Merge remote-tracking branch 'origin/master' into editor-playback-speed
2017-11-21 17:41:16 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
EVAST9919
ecc2877be6
Fix possible null and adjust timeline width
2017-11-20 09:29:26 +03:00
EVAST9919
4ee3a89c12
Remove using
2017-11-18 08:35:00 +03:00
EVAST9919
34d8f94f99
Add track timer
2017-11-18 08:24:09 +03:00
EVAST9919
58e7263108
CI fixes
2017-11-18 03:09:09 +03:00
EVAST9919
0b8fed4e5a
Remove useless Dimention params
2017-11-18 01:51:23 +03:00
EVAST9919
7492ab6495
Use GridContainer to place the bottom bar objects
2017-11-18 01:48:50 +03:00
EVAST9919
07e0aba01c
Remove using
2017-11-17 14:10:13 +03:00
EVAST9919
1680c0905f
Fix track tempo could be less than 1 on exiting the editor
2017-11-17 14:02:07 +03:00
EVAST9919
cc04d5bc61
Add all the objects to the PlaybackContainer
2017-11-17 13:35:41 +03:00
EVAST9919
d62da4334e
Add and place all the bottom bar objects
2017-11-17 12:26:13 +03:00
smoogipoo
cd8d7af9db
Clean up a few warnings in preparation for net-standard
2017-11-14 13:06:25 +09:00
Dean Herbert
6fa02ce9bb
Use internal less
...
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
smoogipoo
04b271cce9
Migrate osu.Game project to VS2017 project structure
2017-10-30 22:24:11 +09:00
Dean Herbert
dc9c474033
Move all TestCases to Testing project
...
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
c0d64bf409
Use Gray instead of FromHex for grays
2017-10-12 22:19:29 +09:00
Dean Herbert
37fc69b9f7
Set a default zoom level that isn't the whole track
2017-10-12 22:19:02 +09:00
Dean Herbert
37b88d834e
Adjust padding slightly
2017-10-12 22:10:37 +09:00
smoogipoo
ab62390336
Make TimelineButtons combined take up the full height of the timeline
2017-10-12 18:32:39 +09:00
smoogipoo
a6901c0a27
Change TimelineButton icon colour to white when hovered
2017-10-12 18:17:36 +09:00
smoogipoo
5ccfc1918e
Hook up more bindables for hitobjects/hitsounds
2017-10-12 17:51:01 +09:00
smoogipoo
db672becbc
Implement waveform checkbox
2017-10-12 17:50:51 +09:00
smoogipoo
3c35a7a6ae
graph -> waveform
2017-10-12 17:37:40 +09:00
smoogipoo
4586877239
Implement magnification buttons
2017-10-12 17:31:21 +09:00
smoogipoo
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
smoogipoo
2844764e3c
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
2017-10-12 15:37:45 +09:00
smoogipoo
e12fa49436
Integrate timeline into Compose
2017-10-12 15:37:00 +09:00
smoogipoo
6fbf52c3eb
Remove unused usings
2017-10-12 15:32:18 +09:00
smoogipoo
1cf8c0284a
Re-namespace a few classes
2017-10-10 15:22:39 +09:00
smoogipoo
166194e6b6
Further logic simplification
2017-10-10 15:09:26 +09:00
smoogipoo
074a1db4a1
Implement scrolling and better zoom
2017-10-10 12:45:27 +09:00
smoogipoo
cb58a1371e
Merge branch 'editor-waveform' into editor-waveform-timeline
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
smoogipoo
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df
Update in-line with framework
2017-10-09 17:18:11 +09:00
smoogipoo
10abaa866b
Put screens below the top and bottom bars of the editor
2017-10-07 01:56:11 +09:00
smoogipoo
c0b394811f
Make compose mode the default
...
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
smoogipoo
d432ab7510
Reorder screen tab control items
2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e
Fix bindable binding to make the editor load a screen by default again
2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e
Remove rounded corners on the editor menu bar
2017-10-07 01:38:13 +09:00
smoogipoo
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11
Remove scale effect on editor screen switches
2017-10-06 23:41:49 +08:00
smoogipoo
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
smoogipoo
dcd5cc6753
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 22:00:44 +09:00
smoogipoo
8427bb44d1
Implement basic layout for the compose screen ScrollableTimeline
2017-10-04 22:00:42 +09:00
smoogipoo
ea45452993
Allow resolution > 1
2017-10-04 21:57:46 +09:00
smoogipoo
1377f73b46
Multiply resolution before clamping
2017-10-04 21:57:29 +09:00
smoogipoo
8bc20a2545
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 19:49:23 +09:00
smoogipoo
8a52fdc8fa
Use a bindable for the current screen in EditorMenuBar
...
Replaces the current Action.
2017-10-04 19:37:17 +09:00
smoogipoo
34eede0d04
Re-namespace EditorScreenMode
2017-10-04 19:36:55 +09:00
smoogipoo
e2824d4732
Reduce harshness of scale for now
...
Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...
2017-10-04 19:26:26 +09:00
smoogipoo
357a467337
Implement design mode
2017-10-04 19:24:19 +09:00
smoogipoo
5ca4a2d2c8
Add some nullchecks to WaveformDisplay
2017-10-04 19:09:39 +09:00
smoogipoo
81960c7b48
CI fixes
2017-10-04 19:03:02 +09:00
smoogipoo
80e984f72d
Update in-line with framework
2017-10-04 18:55:38 +09:00
smoogipoo
01c839eda7
Move WaveformDisplay into separate class and add some commenting
2017-10-04 17:51:28 +09:00
smoogipoo
cf44868bcd
Give EditorScreen a Beatmap
2017-10-04 15:02:11 +09:00
smoogipoo
7211dd2015
Remove unnecessary usings
2017-10-02 10:11:43 +09:00
smoogipoo
69b61a62a5
Implement base Compose screen
2017-10-02 10:09:21 +09:00
smoogipoo
af4c6276e4
Adjust transforms of EditorScreen
2017-10-02 10:09:10 +09:00
smoogipoo
91cede79c2
Mask the editor screens
2017-10-02 10:07:34 +09:00
smoogipoo
6018b4e5e4
Make EditorScreen a Container
2017-10-02 09:34:51 +09:00
smoogipoo
2a310f02bc
modeContainer -> screenContainer
2017-10-02 09:27:27 +09:00
smoogipoo
c2d63eb0bd
Add EditorScreen + screen changing functionality
2017-10-02 09:26:52 +09:00
smoogipoo
221902f4fe
Restructure Editor construction
2017-10-02 09:26:16 +09:00
smoogipoo
7b1ef53f36
Expose a mode change event from EditorMenuBar
2017-10-02 09:24:25 +09:00
smoogipoo
8ed23a60e9
Remove items from the editor menu bar
2017-10-02 09:10:40 +09:00
smoogipoo
21c6a63fa1
Use using for Description
2017-09-29 20:03:09 +09:00
smoogipoo
7b4348254c
Don't use new
2017-09-29 20:02:55 +09:00
smoogipoo
775e8bada5
Make the background bottom corners look nice with the new hover functionality
2017-09-29 15:13:38 +09:00
smoogipoo
b2eab1f435
Set the hover background colour as dictated by flyte
2017-09-29 15:09:56 +09:00
smoogipoo
6bb5210c7c
Remove the parentSizedBox
2017-09-29 15:09:28 +09:00
smoogipoo
95364d0173
No more box background
2017-09-27 22:15:11 +09:00
smoogipoo
ba8bf6cbd5
Add ScreenSelectionTabControl to EditorMenuBar
2017-09-27 22:01:53 +09:00
smoogipoo
545c375199
Update design of EditorMenuBar to match flyte's design more closely
2017-09-27 22:01:03 +09:00
Dean Herbert
e64860ad45
Fix test case not working as expected
2017-09-27 12:46:34 +08:00
Dean Herbert
faad3fc7d3
Arbitrarily move colour assignment
2017-09-27 12:40:32 +08:00
Dean Herbert
d5ed218488
Fix timeline sizes being updated potentially before the track has a length
2017-09-27 11:07:43 +08:00
Dean Herbert
7ad21d9a6d
Simplify marker part construction
2017-09-27 11:07:23 +08:00
Dean Herbert
eae29820c0
Fix marker being cleared each beatmap change
2017-09-27 11:07:17 +08:00
Dean Herbert
708632bca8
Remove second unnecessary colour set
2017-09-27 10:06:36 +08:00
smoogipoo
10dbd68c1e
Simplify null check
2017-09-26 20:11:45 +09:00
smoogipoo
c578509a20
Bind to the screen Beatmap instead of the game-wide Beatmap
2017-09-26 17:58:40 +09:00
smoogipoo
3937ebdc3d
Add missing license headers
2017-09-26 15:58:30 +09:00
smoogipoo
10e5fe40b2
A bit of cleanup
2017-09-26 15:51:45 +09:00
smoogipoo
5953c1084e
Re-namespace SummaryTimeline
2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef
Implement MarkerPart for the marker
2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1
Re-namespace and split out timeline parts from the SummaryTimeline
2017-09-26 15:44:40 +09:00
smoogipoo
d787c740fa
Fix bookmarks not working
...
We should be dealing with the array in every situation, with the exception of the database.
2017-09-25 17:46:51 +09:00
smoogipooo
e65a17ad96
Remove redundant usings
2017-09-20 18:40:41 +09:00
smoogipooo
7168e8fd99
Improve layout of bottom bar in the Editor
2017-09-20 18:16:03 +09:00
smoogipooo
7588f1b6ca
Add SummaryTimeline to Editor
2017-09-20 17:09:38 +09:00
smoogipooo
f9568619e7
Move SummaryTimeline into /Edit/Components/SummaryTimeline
2017-09-20 16:59:03 +09:00
Dean Herbert
b9bec6a983
CI fixes
2017-09-07 23:06:35 +09:00
Dean Herbert
41398f57d6
Changes in line with framework
2017-09-07 20:36:32 +09:00
smoogipooo
06fac913bf
Re-implement EditorMenuBar.
2017-09-06 21:14:29 +09:00
smoogipooo
b17d9ac06e
Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.
2017-08-28 17:55:50 +09:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
64682a741c
Update framework
2017-06-08 17:05:25 +09:00
Huo Yaoyuan
8c991eae01
Fix CI issues.
2017-03-14 22:27:24 +08:00
Huo Yaoyuan
b2dd9afcf3
Update editor workflow and make edit button works.
2017-03-14 22:18:40 +08:00
Huo Yaoyuan
259d39c6ad
Stop playing the track in editor
...
to avoid unused member warning
2017-03-14 21:28:33 +08:00
Huo Yaoyuan
f97e8ae97f
Fix typo and warnings.
2017-03-14 21:20:38 +08:00
Huo Yaoyuan
618e8e822b
Implement EditSongSelect and MatchSongSelect.
2017-03-14 19:53:20 +08:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Thomas Müller
c6d688898f
Initial implementation of a beatmap carousell and various minor improvements to song select.
...
No big optimizations yet, but groundwork is laid out.
2016-11-20 20:34:16 +01:00
Dean Herbert
0f4538f69f
Rename GameModes namespace to Screens.
2016-11-14 17:23:33 +09:00