Dean Herbert
|
0605bb9b8d
|
Fix incorrect parent state transfer
|
2020-10-05 16:20:29 +09:00 |
|
Dan Balasescu
|
d3e1da5922
|
Merge branch 'master' into editor-timing-screen-change-handling
|
2020-10-05 15:40:43 +09:00 |
|
Dean Herbert
|
9f43dedf59
|
Fix missing line
|
2020-10-05 15:12:34 +09:00 |
|
Dean Herbert
|
758088672c
|
Don't stop non-looping samples immediately when pausing
|
2020-10-05 15:07:46 +09:00 |
|
Dan Balasescu
|
39f1ceb2ad
|
Merge pull request #10366 from peppy/fix-editor-save-new-beatmap
Fix editor persisting new beatmap even when user chooses not to
|
2020-10-05 14:38:43 +09:00 |
|
Dean Herbert
|
ae8bf8cdd4
|
Fix StabilityGameClock not being updated
|
2020-10-05 14:27:51 +09:00 |
|
Dean Herbert
|
e4710f82ec
|
Fix sample disabled status not being updated correctly from seek state
|
2020-10-05 14:27:51 +09:00 |
|
Dean Herbert
|
af7d10afe0
|
Fix FrameStabilityContainer not re-caching its GameplayClock correctly
|
2020-10-05 14:27:51 +09:00 |
|
Dean Herbert
|
e41085dbb5
|
Merge pull request #10349 from bdach/health-adjustments
|
2020-10-05 11:02:13 +09:00 |
|
Shane Woolcock
|
a483dfd2d7
|
Allow confineMouseTracker to be null
|
2020-10-05 11:54:39 +10:30 |
|
Shane Woolcock
|
5859755886
|
Use current OverlayActivationMode to determine confine logic
|
2020-10-05 11:11:46 +10:30 |
|
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 |
|
Dean Herbert
|
e56b2ad06b
|
Merge pull request #10365 from peppy/update-framework
Update framework
|
2020-10-05 00:21:01 +09:00 |
|
Dean Herbert
|
9ca0e48acc
|
Change exit logic to be more test-friendly
|
2020-10-04 23:57:28 +09:00 |
|
Dean Herbert
|
1b02c814d6
|
Update framework
|
2020-10-04 23:47:47 +09:00 |
|
Dean Herbert
|
02e4f3ddaf
|
Fix the editor saving new beatmaps even when the user chooses not to
|
2020-10-04 23:47:16 +09:00 |
|
Bartłomiej Dach
|
6f2b991b32
|
Ensure true gameplay rate is finite when paused externally
|
2020-10-04 14:54:51 +02:00 |
|
Dean Herbert
|
5dea37792c
|
Merge branch 'master' into health-adjustments
|
2020-10-04 21:38:40 +09: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 |
|
Bartłomiej Dach
|
a366591d6d
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-04 13:28:59 +02:00 |
|
Bartłomiej Dach
|
7957773d58
|
Merge branch 'master' into more-timeline-toggles
|
2020-10-04 12:53:10 +02:00 |
|
Dean Herbert
|
a864f2906f
|
Merge branch 'master' into health-adjustments
|
2020-10-03 22:50:19 +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
|
601675db07
|
Adjust health increase values to match old ones better
|
2020-10-03 12:16:22 +02:00 |
|
Bartłomiej Dach
|
309714081f
|
Make new health increase values mania-specific
|
2020-10-03 12:16:22 +02:00 |
|
Bartłomiej Dach
|
2ddfd79923
|
Replace object pattern match with simple conditional
|
2020-10-03 08:09:10 +02: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
|
0d3a95d8fc
|
Remove unnecessary string interpolation
|
2020-10-02 19:54:13 +09:00 |
|
Dean Herbert
|
2f15d558a3
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-02 19:53:25 +09:00 |
|
Dean Herbert
|
fcc6cb36e4
|
Change text colour to black
|
2020-10-02 18:50:47 +09:00 |
|
Dan Balasescu
|
b14b16071c
|
Merge branch 'master' into editor-timing-screen-change-handling
|
2020-10-02 18:36:06 +09:00 |
|
Dan Balasescu
|
7dc0b4d97e
|
Merge pull request #10327 from peppy/osu-slider-stable-triangle-seed
Avoid rapid triangle repositioning during editor slider placement
|
2020-10-02 18:23:19 +09:00 |
|
Dean Herbert
|
575046e5fd
|
Don't update reply on add/remove (will be automatically handled by change handler events)
|
2020-10-02 18:21:13 +09:00 |
|
Dean Herbert
|
66f5187e6a
|
Remove redundant access permission
|
2020-10-02 18:20:59 +09:00 |
|
Dean Herbert
|
519c3ac2bd
|
Change SliderWithTextBoxInput to transfer on commit
|
2020-10-02 17:59:57 +09:00 |
|
Dean Herbert
|
9fc9009dbe
|
Add change handling for sample section
|
2020-10-02 17:59:47 +09:00 |
|
Dean Herbert
|
08faef694b
|
Add change handling for difficulty section
|
2020-10-02 17:58:27 +09:00 |
|
Dean Herbert
|
693a4ff474
|
Add change handling for effects section
|
2020-10-02 17:58:23 +09:00 |
|
Dean Herbert
|
98fd661b23
|
Add change handling for timing section
|
2020-10-02 17:55:47 +09:00 |
|
Dean Herbert
|
c1c5b5da8e
|
Push state change on control point group addition / removal
|
2020-10-02 17:49:38 +09:00 |
|
Dean Herbert
|
436cc572d3
|
Expose ChangeHandler.SaveState via interface
|
2020-10-02 17:37:29 +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
|
faeb9910e5
|
Revert "Exit import process after first handler is run"
This reverts commit 4139301afa.
|
2020-10-02 17:06:55 +09:00 |
|
Dean Herbert
|
2a02f8f3f3
|
Add support for background changing
|
2020-10-02 16:52:45 +09:00 |
|
Dean Herbert
|
4139301afa
|
Exit import process after first handler is run
|
2020-10-02 16:52:45 +09:00 |
|
Dean Herbert
|
b7aba19441
|
Add audio file drag-drop support at editor setup screen
|
2020-10-02 16:31:11 +09:00 |
|
Dean Herbert
|
b7c276093d
|
Add fallback case when EditorChangeHandler is not present (for tests)
|
2020-10-02 16:21:51 +09:00 |
|
Dean Herbert
|
50eca202f4
|
User IEnumerable for HandledExtensions
|
2020-10-02 16:17:10 +09:00 |
|
Dean Herbert
|
f3c8cd91f4
|
Remove unused method
|
2020-10-02 16:14:27 +09:00 |
|
Dean Herbert
|
fc65cb4375
|
Ensure precedence is given to newer registered handlers
|
2020-10-02 16:14:21 +09:00 |
|
Dean Herbert
|
e49ec092c9
|
Expose ability to register a component as an import handler
|
2020-10-02 16:08:11 +09:00 |
|
Dean Herbert
|
dde7f706aa
|
Avoid rapid triangle repositioning during editor slider placement
|
2020-10-02 15:51:14 +09:00 |
|
Dean Herbert
|
501e02db09
|
Only regenerate autoplay on editor state change
|
2020-10-02 15:44:37 +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 |
|
Dean Herbert
|
f501c88b46
|
Fix individual control points not being removed from group when group is removed
|
2020-10-02 15:28:21 +09:00 |
|
Dean Herbert
|
3069428efe
|
Merge pull request #10316 from smoogipoo/fix-spinner-flicker
Fix default spinner flashing yellow glow before completion
|
2020-10-01 22:29:48 +09:00 |
|
Dean Herbert
|
89beea6658
|
Merge pull request #10317 from smoogipoo/protect-multiple-applyresult
Safeguard againts multiple ApplyResult() invocations
|
2020-10-01 22:22:26 +09:00 |
|
smoogipoo
|
ab33434a8a
|
Reword xmldocs to better describe nested events
|
2020-10-01 21:54:43 +09:00 |
|
smoogipoo
|
042c39ae1b
|
Remove redundant string interpolation
|
2020-10-01 21:48:45 +09:00 |
|
smoogipoo
|
40c153e705
|
Use component instead of drawable
|
2020-10-01 21:39:40 +09:00 |
|
smoogipoo
|
d7f9b8045c
|
Safeguard againts multiple ApplyResult() invocations
|
2020-10-01 21:33:54 +09:00 |
|
Dan Balasescu
|
c93d1631d4
|
Merge pull request #10257 from hbnrmx/legacy-SpinnerNoBlink
Add support for SpinnerNoBlink to LegacyOldStyleSpinner
|
2020-10-01 21:25:48 +09:00 |
|
Dean Herbert
|
94996f2cc0
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-01 21:09:52 +09:00 |
|
smoogipoo
|
62b55c4c9c
|
Use static method, add xmldoc + link to wiki
|
2020-10-01 20:50:47 +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 |
|
Dan Balasescu
|
df07ca445f
|
Merge branch 'master' into legacy-SpinnerNoBlink
|
2020-10-01 20:34:23 +09:00 |
|
Dean Herbert
|
5ad2944e26
|
Fix ticks displaying higher than control point info
|
2020-10-01 19:31:41 +09:00 |
|
Dean Herbert
|
e96e30a19d
|
Move control point colour specifications to common location and use for formatting timing screen table
|
2020-10-01 19:29:34 +09:00 |
|
Dean Herbert
|
fcccce8b4e
|
Use pink for sample control points to avoid clash with waveform blue
|
2020-10-01 19:03:17 +09:00 |
|
Dean Herbert
|
589a26a149
|
Ensure stable display order for control points in the same group
|
2020-10-01 18:59:35 +09:00 |
|
Dean Herbert
|
b75c202a7e
|
Add sample control point display in timeline
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
0bced34272
|
Add visualisation of bpm (timing) changes to timeline
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
70931abcb0
|
Separate out timeline control point display from summary timeline display
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
70d475be1f
|
Fix elements appearing in front of hitobjects
|
2020-10-01 18:54:59 +09:00 |
|
Dean Herbert
|
a9f76e859f
|
Merge pull request #10292 from smoogipoo/fix-score-recalc
|
2020-10-01 18:50:13 +09:00 |
|
Dean Herbert
|
ffc1e9c358
|
Update framework
|
2020-10-01 18:23:38 +09:00 |
|
Dean Herbert
|
00a19b4879
|
Also add toggle for ticks display
|
2020-10-01 18:16:49 +09:00 |
|
Dean Herbert
|
b654396a4c
|
Move ticks display to timeline
|
2020-10-01 18:16:30 +09:00 |
|
Dean Herbert
|
0d03084cdc
|
Move control point display to the base timeline class
We want them to display on all screens with a timeline as they are quite
useful in all cases.
|
2020-10-01 18:16:12 +09:00 |
|
Dan Balasescu
|
3a81602d0c
|
Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek
Fix HitObject samples getting stuck in a playing state on seeking far into the future
|
2020-10-01 18:08:17 +09:00 |
|
Dean Herbert
|
a1b8ced46d
|
Merge branch 'master' into fix-score-recalc
|
2020-10-01 17:00:20 +09:00 |
|
Dean Herbert
|
1ec96e1bb1
|
Merge branch 'master' into adjust-hp-increases
|
2020-10-01 16:58:29 +09:00 |
|
Dean Herbert
|
482c23901b
|
Check RequestedPlaying state before allowing scheduled resume of looped sample
|
2020-10-01 16:54:58 +09:00 |
|
Dean Herbert
|
b7ac779760
|
Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek
|
2020-10-01 16:46:14 +09:00 |
|
Dean Herbert
|
60e6cfa45c
|
Avoid recreating child hierarchy when unnecessary
|
2020-10-01 16:36:03 +09:00 |
|
Dean Herbert
|
1aff263419
|
Split out classes and simplify construction of buttons
|
2020-10-01 16:34:34 +09:00 |
|
Dean Herbert
|
db1ad4243e
|
Remove need for ScaleDragHandle class
|
2020-10-01 16:27:42 +09:00 |
|
Dean Herbert
|
4e6a505a99
|
Add new icons and tooltips
|
2020-10-01 16:25:40 +09:00 |
|
Dean Herbert
|
78c5d57074
|
Add flip event flow and stop passing raw input events to handle methods
|
2020-10-01 16:25:29 +09:00 |
|
Dean Herbert
|
02f14ab4b0
|
Rename operation start/end to be more encompassing
|
2020-10-01 16:24:09 +09:00 |
|
smoogipoo
|
7890319802
|
Merge branch 'master' into adjust-hit-result-types
|
2020-10-01 16:19:07 +09:00 |
|
Dean Herbert
|
b1f2bdd579
|
Add missing xmldoc
|
2020-10-01 13:47:49 +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
|
61e62929ee
|
Apply changes in line with framework event logic update
|
2020-10-01 13:06:01 +09:00 |
|
smoogipoo
|
cb6b35116a
|
Merge branch 'master' into scoring-standardisation
|
2020-10-01 12:28:51 +09:00 |
|