|
|
783a463772
|
Merge branch 'master' into colourise-control-point-table
|
2020-10-05 20:47:06 +09:00 |
|
|
|
54f1bcf2ce
|
Merge pull request #10313 from peppy/control-point-timeline-representation
Display all control point information on the main editor timeline
|
2020-10-05 20:46:52 +09:00 |
|
|
|
6bc0afdafb
|
Fix remaining conflicts
|
2020-10-05 20:09:18 +09:00 |
|
|
|
051ea7eda9
|
Merge pull request #10329 from peppy/editor-file-drop-support
Add drag-drop support in editor setup screen for audio and background images
|
2020-10-05 20:05:41 +09:00 |
|
|
|
ef8e6b3d96
|
Merge pull request #10310 from peppy/osu-selection-flip-rotate-buttons
Add buttons to flip/rotate the current selection by known amounts
|
2020-10-05 20:02:09 +09:00 |
|
|
|
e20c28f166
|
Merge pull request #10306 from smoogipoo/dynamic-difficulty-icon
|
2020-10-05 19:40:18 +09:00 |
|
|
|
a920342a09
|
Merge branch 'master' into editor-file-drop-support
|
2020-10-05 19:28:44 +09:00 |
|
|
|
2b824787c1
|
Guard against potential nullref
|
2020-10-05 19:28:13 +09:00 |
|
|
|
ba55256fb4
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-05 19:24:28 +09:00 |
|
|
|
6d50a1ed7d
|
Merge branch 'master' into osu-selection-flip-rotate-buttons
|
2020-10-05 19:17:33 +09:00 |
|
|
|
08f7b18dbe
|
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
|
2020-10-05 19:17:19 +09:00 |
|
|
|
2df5ea8ba8
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-05 18:47:17 +09:00 |
|
|
|
2ed43c14f8
|
Merge branch 'master' into editor-file-drop-support
|
2020-10-05 17:48:06 +09:00 |
|
|
|
365a38e92f
|
Merge branch 'master' into dynamic-difficulty-icon
|
2020-10-05 17:37:01 +09:00 |
|
|
|
16a599850c
|
Merge branch 'master' into more-timeline-toggles
|
2020-10-05 17:33:18 +09:00 |
|
|
|
12c84df208
|
Merge pull request #10371 from peppy/fix-gameplay-seek-sample-pausing
Fix seeking in replays not correctly pausing samples
|
2020-10-05 17:13:43 +09:00 |
|
|
|
0c93de858e
|
Merge pull request #10373 from peppy/fix-hitobject-samples-cut-off
Don't stop non-looping samples immediately when pausing
|
2020-10-05 17:13:11 +09:00 |
|
|
|
c622adde7a
|
Rename method back and add xmldoc
|
2020-10-05 16:24:02 +09:00 |
|
|
|
d43ea68709
|
Merge branch 'master' into fix-gameplay-seek-sample-pausing
|
2020-10-05 16:21:28 +09:00 |
|
|
|
0605bb9b8d
|
Fix incorrect parent state transfer
|
2020-10-05 16:20:29 +09:00 |
|
|
|
d3e1da5922
|
Merge branch 'master' into editor-timing-screen-change-handling
|
2020-10-05 15:40:43 +09:00 |
|
|
|
9f43dedf59
|
Fix missing line
|
2020-10-05 15:12:34 +09:00 |
|
|
|
758088672c
|
Don't stop non-looping samples immediately when pausing
|
2020-10-05 15:07:46 +09:00 |
|
|
|
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 |
|
|
|
ae8bf8cdd4
|
Fix StabilityGameClock not being updated
|
2020-10-05 14:27:51 +09:00 |
|
|
|
e4710f82ec
|
Fix sample disabled status not being updated correctly from seek state
|
2020-10-05 14:27:51 +09:00 |
|
|
|
af7d10afe0
|
Fix FrameStabilityContainer not re-caching its GameplayClock correctly
|
2020-10-05 14:27:51 +09:00 |
|
|
|
e41085dbb5
|
Merge pull request #10349 from bdach/health-adjustments
|
2020-10-05 11:02:13 +09:00 |
|
|
|
e56b2ad06b
|
Merge pull request #10365 from peppy/update-framework
Update framework
|
2020-10-05 00:21:01 +09:00 |
|
|
|
9ca0e48acc
|
Change exit logic to be more test-friendly
|
2020-10-04 23:57:28 +09:00 |
|
|
|
1b02c814d6
|
Update framework
|
2020-10-04 23:47:47 +09:00 |
|
|
|
02e4f3ddaf
|
Fix the editor saving new beatmaps even when the user chooses not to
|
2020-10-04 23:47:16 +09:00 |
|
|
|
6f2b991b32
|
Ensure true gameplay rate is finite when paused externally
|
2020-10-04 14:54:51 +02:00 |
|
|
|
5dea37792c
|
Merge branch 'master' into health-adjustments
|
2020-10-04 21:38:40 +09:00 |
|
|
|
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 |
|
|
|
a366591d6d
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-04 13:28:59 +02:00 |
|
|
|
7957773d58
|
Merge branch 'master' into more-timeline-toggles
|
2020-10-04 12:53:10 +02:00 |
|
|
|
a864f2906f
|
Merge branch 'master' into health-adjustments
|
2020-10-03 22:50:19 +09:00 |
|
|
|
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 |
|
|
|
601675db07
|
Adjust health increase values to match old ones better
|
2020-10-03 12:16:22 +02:00 |
|
|
|
309714081f
|
Make new health increase values mania-specific
|
2020-10-03 12:16:22 +02:00 |
|
|
|
2ddfd79923
|
Replace object pattern match with simple conditional
|
2020-10-03 08:09:10 +02:00 |
|
|
|
1f0620ffd4
|
Replace assignment references to HitResult.Miss with Judgement.MinResult
|
2020-10-02 23:31:24 +02:00 |
|
|
|
2b1ef16f89
|
Replace comparison references to HitResult.Miss with IsHit
|
2020-10-02 23:31:24 +02:00 |
|
|
|
dab50bff6f
|
Protect "use current time" button against crash when no timing point is selected
|
2020-10-03 01:27:42 +09:00 |
|
|
|
0d3a95d8fc
|
Remove unnecessary string interpolation
|
2020-10-02 19:54:13 +09:00 |
|
|
|
2f15d558a3
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-02 19:53:25 +09:00 |
|
|
|
fcc6cb36e4
|
Change text colour to black
|
2020-10-02 18:50:47 +09:00 |
|
|
|
b14b16071c
|
Merge branch 'master' into editor-timing-screen-change-handling
|
2020-10-02 18:36:06 +09:00 |
|
|
|
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 |
|
