6ee06602b8
Merge branch 'master' into mania-mask-container
2018-08-02 20:41:27 +09:00
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
206e3686f2
Add back blue border
2018-07-25 18:38:50 +09:00
b60e4b0728
Cleanup
2018-07-25 18:34:47 +09:00
6675c455f3
Trim whitespace that magically appeared
2018-07-24 22:33:19 +03:00
3ca112aef0
Clean code and apply requested changes
2018-07-24 22:04:02 +03:00
0e50e4ee34
Clean code
2018-07-24 10:10:17 +03:00
765c6e4ecc
Remove custom text box
2018-07-24 09:46:24 +03:00
2f452c162c
Make text colour white
2018-07-24 09:21:01 +03:00
a833fa3d92
Update framework and apply suggested changes
2018-07-24 09:19:45 +03:00
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
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
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +09:00
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
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
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
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
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
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
54e60d8bc2
Fix test appveyor tests failing due to lack of audio manager
2018-06-18 19:27:22 +09:00
6d318d35ee
Fix not being able to seek by other means during flick-scroll
2018-06-18 18:56:54 +09:00
dbc50e35d5
Fix the timeline and editor fighting over track seeking
2018-06-18 18:02:26 +09:00
b1d059a67d
Add some colours to the compose-mode timeline
2018-06-18 04:31:47 +09:00
bec6e3083e
Remove scrollbar depth change as scrollbar is hidden now
2018-06-18 03:19:21 +09:00
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
31f9d0161d
Add a comment about precision scroll behaviour
2018-06-18 03:03:09 +09:00
3b396e38ca
Hide the scrollbar
2018-06-12 15:51:48 +09:00
aaf2f66594
Make scrolling only zoom the timeline
2018-06-12 15:51:36 +09:00
6ceac8ab0a
Add a centre marker to the timeline
2018-06-12 14:34:28 +09:00
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
8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +09:00
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
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
d1b469c1a3
Better handling of nested playfields' hitobjects
2018-06-07 16:28:21 +09:00
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
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
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
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
