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
