ekrctb
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +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
|
2a42418dbf
|
Tidy up ReadyButton
|
2018-06-21 10:21:54 +09:00 |
|
Dean Herbert
|
4c068097c8
|
Change required child to use same structure as other use cases
|
2018-06-21 10:12:12 +09:00 |
|
Dean Herbert
|
96100a2200
|
Remove schedule logic (seems unnecessary)
|
2018-06-20 17:41:48 +09:00 |
|
Dean Herbert
|
39649747aa
|
Simplify and synchronise multiplayer screen transitions
|
2018-06-20 17:25:22 +09:00 |
|
Dean Herbert
|
f0c72438a3
|
Group ValueChanged attachment with bindings
|
2018-06-20 17:06:02 +09:00 |
|
Dean Herbert
|
3f020a2802
|
Merge branch 'master' into multiplayer-match
|
2018-06-20 14:49:32 +09:00 |
|
Dean Herbert
|
3819ecb2be
|
Update framework
|
2018-06-19 20:19:52 +09:00 |
|
Dean Herbert
|
b8f9caf418
|
Merge branch 'master' into multiplayer-match
|
2018-06-19 17:18:33 +09:00 |
|
smoogipoo
|
8c671f93fc
|
Always perform non-seeked scroll in the editor while audio is playing
|
2018-06-18 19:32:04 +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 |
|
Dean Herbert
|
ae160baa6e
|
Merge branch 'master' into timeline-input-adjustment
|
2018-06-18 02:54:25 +09:00 |
|
Dean Herbert
|
48613ea1f6
|
Merge branch 'master' into timeline-markers
|
2018-06-18 02:09:20 +09:00 |
|
Dean Herbert
|
e0ee5e2085
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:16 +09:00 |
|
Dean Herbert
|
a7ed3ea80b
|
Rename alwaysVisible to explain where it comes from
|
2018-06-13 11:38:15 +09:00 |
|
Dean Herbert
|
d9e7a324c0
|
Revert HudOverlay to private field
|
2018-06-13 11:30:22 +09:00 |
|
smoogipoo
|
67aa52fb1d
|
Use bindable binding
|
2018-06-12 19:34:49 +09:00 |
|
smoogipoo
|
c70c7a476b
|
Always display the key counter during replay/autoplay
|
2018-06-12 17:59:59 +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
|
37ea4c273b
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
|
2018-06-11 20:17:41 +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
|
b9391b3c6b
|
Fix bindable not working under non-debug due to weak references
|
2018-06-11 18:18:24 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
475fb06559
|
Use new bind method
|
2018-06-07 16:46:54 +09:00 |
|
Dean Herbert
|
e6158bc348
|
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
|
2018-06-07 16:35:07 +09:00 |
|
Dan Balasescu
|
ef287eaa7f
|
Merge branch 'master' into fix-menu-notifications
|
2018-06-07 15:35:30 +09:00 |
|
Dean Herbert
|
f3c9049660
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-07 15:34:19 +09:00 |
|
smoogipoo
|
d516a0a05c
|
Store platform offset clock in variable for visibility
|
2018-06-07 13:42:31 +09:00 |
|
smoogipoo
|
3745f9000b
|
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
|
2018-06-07 13:37:19 +09:00 |
|
Dean Herbert
|
f491a18d40
|
Fix notifications not showing at main osu! logo on menu
|
2018-06-07 01:49:34 +09:00 |
|
smoogipoo
|
18fc63bac2
|
Add back removed using
|
2018-06-06 20:32:37 +09:00 |
|
Dan Balasescu
|
c30861186b
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-06 20:26:17 +09:00 |
|
smoogipoo
|
e77084bec4
|
Give OsuScreen a mutable BindableBeatmap
|
2018-06-06 20:19:53 +09:00 |
|
smoogipoo
|
ff60f69f47
|
Explicitly construct local beatmaps rather than using GetBoundCopy
|
2018-06-06 20:19:30 +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
|
9306fec498
|
Fix missing null checks
|
2018-06-06 18:21:03 +09:00 |
|
Dean Herbert
|
55921efffb
|
Rewrite much state logic
|
2018-06-06 16:17:51 +09:00 |
|
Dean Herbert
|
d1fd09ed47
|
Rename variables
|
2018-06-06 15:49:27 +09:00 |
|
Dean Herbert
|
86be1bef6b
|
Use UserTriggered in Player
|
2018-06-06 15:10:15 +09:00 |
|
Dean Herbert
|
6be382aab6
|
Merge branch 'master' into overlay-activation
|
2018-06-06 10:07:22 +09:00 |
|
Dean Herbert
|
d2633a706d
|
Merge branch 'master' into score-component-tooltips
|
2018-06-06 09:06:22 +09:00 |
|
Dean Herbert
|
00c8d2ff11
|
Merge branch 'master' into source-link-colour
|
2018-06-06 08:27:28 +09:00 |
|