Shane Woolcock
|
4b6f893408
|
Merge branch 'master' into confine-during-gameplay
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/OsuGame.cs
# osu.Game/Screens/Play/Player.cs
|
2020-10-05 10:23:37 +10:30 |
|
Bartłomiej Dach
|
6f2b991b32
|
Ensure true gameplay rate is finite when paused externally
|
2020-10-04 14:54:51 +02:00 |
|
Dean Herbert
|
ec30ca24c5
|
Merge pull request #10343 from bdach/hitresult-miss-fixes
Replace direct references to HitResult.Miss wherever applicable
|
2020-10-04 21:36:26 +09:00 |
|
Dan Balasescu
|
06b55c6aba
|
Merge pull request #10326 from peppy/editor-less-autoplay-regeneration
Only regenerate autoplay on editor state change
|
2020-10-03 20:10:29 +09:00 |
|
Bartłomiej Dach
|
1f0620ffd4
|
Replace assignment references to HitResult.Miss with Judgement.MinResult
|
2020-10-02 23:31:24 +02:00 |
|
Bartłomiej Dach
|
2b1ef16f89
|
Replace comparison references to HitResult.Miss with IsHit
|
2020-10-02 23:31:24 +02:00 |
|
Dean Herbert
|
dab50bff6f
|
Protect "use current time" button against crash when no timing point is selected
|
2020-10-03 01:27:42 +09:00 |
|
Dean Herbert
|
66f5187e6a
|
Remove redundant access permission
|
2020-10-02 18:20:59 +09:00 |
|
Dean Herbert
|
00eed29527
|
Don't update time if it hasn't changed
|
2020-10-02 17:35:41 +09:00 |
|
Dean Herbert
|
fc920a8899
|
Add change handler logic
|
2020-10-02 17:32:34 +09:00 |
|
Dean Herbert
|
0cb3926e1d
|
Add event on EditorChangeHandler state change
|
2020-10-02 15:44:34 +09:00 |
|
Dean Herbert
|
2698dc513f
|
Add basic textbox error handling
|
2020-10-02 15:33:33 +09:00 |
|
Dean Herbert
|
959c8730f6
|
Add settings section from TimingPointGroups on timing screen
|
2020-10-02 15:30:32 +09:00 |
|
Dan Balasescu
|
73edb87363
|
Merge pull request #10303 from peppy/more-textbox-entry
Add textbox entry for speed multiplier and volume
|
2020-10-01 20:42:14 +09:00 |
|
Dean Herbert
|
e0a0902a15
|
Ensure textbox always reverts to sane state on out-of-range failures
|
2020-10-01 13:06:24 +09:00 |
|
Dean Herbert
|
9d07dce5e4
|
Merge pull request #10251 from smoogipoo/additional-hit-results
|
2020-10-01 12:19:48 +09:00 |
|
Bartłomiej Dach
|
10ae93cc2e
|
Merge branch 'master' into more-textbox-entry
|
2020-09-30 23:54:00 +02:00 |
|
Dan Balasescu
|
148e2769c8
|
Merge pull request #10304 from peppy/fix-control-point-bindable-updates
Fix control point timeline display not updating with changes
|
2020-09-30 23:30:35 +09:00 |
|
Dean Herbert
|
367b35bb10
|
Merge branch 'master' into fix-storyboard-sample-pausing
|
2020-09-30 22:42:26 +09:00 |
|
Dan Balasescu
|
6def54548b
|
Merge branch 'master' into fix-control-point-bindable-updates
|
2020-09-30 21:35:36 +09:00 |
|
Dan Balasescu
|
6dab5c2ceb
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 21:33:15 +09:00 |
|
Dan Balasescu
|
7eb45990a4
|
Merge pull request #10302 from peppy/timing-screen-clean-up
Fix timing screen tests and add simple view of control points to timeline
|
2020-09-30 21:33:07 +09:00 |
|
Dan Balasescu
|
3af7e59103
|
Merge pull request #10289 from peppy/timeline-ux-improvements
Improve the usability of the editor timeline with combo colour and indices
|
2020-09-30 20:32:55 +09:00 |
|
Dean Herbert
|
fa742a2ef1
|
Update to consume framework fixes
|
2020-09-30 20:28:02 +09:00 |
|
Dean Herbert
|
df9d4bc2f0
|
Merge branch 'master' into fix-control-point-bindable-updates
|
2020-09-30 20:27:25 +09:00 |
|
Dean Herbert
|
a11c74d600
|
Update to consume framework fixes
|
2020-09-30 20:27:02 +09:00 |
|
Dean Herbert
|
f9d6aed2df
|
Merge branch 'master' into timing-screen-clean-up
|
2020-09-30 20:26:02 +09:00 |
|
Dean Herbert
|
5242f5648d
|
Fix timeline control point display not updating with changes
|
2020-09-30 18:34:13 +09:00 |
|
Dean Herbert
|
44fc0c6723
|
Fix default value of bpm being too high
|
2020-09-30 18:08:55 +09:00 |
|
Dean Herbert
|
bc943dee53
|
Add textbox entry for speed multiplier and volume
|
2020-09-30 17:52:12 +09:00 |
|
Dean Herbert
|
b0f8e11bd4
|
Fix incorrect caching
|
2020-09-30 17:34:14 +09:00 |
|
Dean Herbert
|
3422db1bb2
|
Use top-left colour for deciding the text colour (gradient was added in some cases)
|
2020-09-30 17:10:22 +09:00 |
|
Dean Herbert
|
7f579850dd
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 17:03:23 +09:00 |
|
Dean Herbert
|
698042268f
|
Show control points in timing screen timeline
|
2020-09-30 17:00:42 +09:00 |
|
Dean Herbert
|
5b200a8ca4
|
Change default zoom of timing screen timeline to most zoomed out
|
2020-09-30 16:39:27 +09:00 |
|
Dean Herbert
|
a40c2ea5ee
|
Simplify control point group binding/update logic
|
2020-09-30 16:02:22 +09:00 |
|
Dean Herbert
|
414c40d298
|
Reverse inheritance order of SkinnableSound's pause logic
|
2020-09-30 15:45:14 +09:00 |
|
Dan Balasescu
|
466d37a450
|
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
|
2020-09-30 15:43:56 +09:00 |
|
Dean Herbert
|
59ce9fcab9
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 15:35:55 +09:00 |
|
Dean Herbert
|
1386c9fe66
|
Standardise time display formats across the editor
|
2020-09-30 12:45:43 +09:00 |
|
Dean Herbert
|
6e1ea00443
|
Don't apply gradient to non-duration objects
|
2020-09-29 17:34:50 +09:00 |
|
Dean Herbert
|
c47652c97a
|
Add gradient to hide subtractive colour issues
Good thing is looks better than without.
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
8d8d45a0c0
|
Add combo index display support
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
f16fc29071
|
Add combo colour display support
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
53b3d23842
|
Expose HitObjectComposer for other components in the Compose csreen to use
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
136843c8e4
|
Make DrawableStoryboardSample a SkinnableSound
Allows sharing pause logic with gameplay samples.
|
2020-09-29 14:25:39 +09:00 |
|
Dean Herbert
|
74e74e1c31
|
Fix pause loop sound not working because paused
|
2020-09-29 14:20:41 +09:00 |
|
Dean Herbert
|
c5f6b77bba
|
Add missing cached type
|
2020-09-29 13:42:17 +09:00 |
|
Dean Herbert
|
d6f3beffb6
|
Use existing bindable flow instead
|
2020-09-29 12:50:17 +09:00 |
|
Dean Herbert
|
585b857a0c
|
Handle paused state correctly
|
2020-09-29 12:17:38 +09:00 |
|