be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07: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
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +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
2a42418dbf
Tidy up ReadyButton
2018-06-21 10:21:54 +09:00
4c068097c8
Change required child to use same structure as other use cases
2018-06-21 10:12:12 +09:00
96100a2200
Remove schedule logic (seems unnecessary)
2018-06-20 17:41:48 +09:00
39649747aa
Simplify and synchronise multiplayer screen transitions
2018-06-20 17:25:22 +09:00
f0c72438a3
Group ValueChanged attachment with bindings
2018-06-20 17:06:02 +09:00
3f020a2802
Merge branch 'master' into multiplayer-match
2018-06-20 14:49:32 +09:00
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
b8f9caf418
Merge branch 'master' into multiplayer-match
2018-06-19 17:18:33 +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
ae160baa6e
Merge branch 'master' into timeline-input-adjustment
2018-06-18 02:54:25 +09:00
48613ea1f6
Merge branch 'master' into timeline-markers
2018-06-18 02:09:20 +09:00
e0ee5e2085
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:16 +09:00
a7ed3ea80b
Rename alwaysVisible to explain where it comes from
2018-06-13 11:38:15 +09:00
d9e7a324c0
Revert HudOverlay to private field
2018-06-13 11:30:22 +09:00
67aa52fb1d
Use bindable binding
2018-06-12 19:34:49 +09:00
c70c7a476b
Always display the key counter during replay/autoplay
2018-06-12 17:59:59 +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
37ea4c273b
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:41 +09:00
8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +09:00
b9391b3c6b
Fix bindable not working under non-debug due to weak references
2018-06-11 18:18:24 +09:00
0b4f5af52e
Add setting to toggle standardised or exponential scoring display
...
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
ef287eaa7f
Merge branch 'master' into fix-menu-notifications
2018-06-07 15:35:30 +09:00
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
18fc63bac2
Add back removed using
2018-06-06 20:32:37 +09:00
