Bartłomiej Dach
|
9eeac759b8
|
Re-enable and fix gameplay sample playback test
|
2020-10-05 21:22:32 +02:00 |
|
Dean Herbert
|
3630aa30d4
|
Merge pull request #10315 from peppy/colourise-control-point-table
Colourise control point table
|
2020-10-05 21:29:59 +09:00 |
|
Dan Balasescu
|
783a463772
|
Merge branch 'master' into colourise-control-point-table
|
2020-10-05 20:47:06 +09:00 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
141b8eb766
|
Merge pull request #10374 from peppy/ignore-failing-test
Temporarily ignore failing gameplay samples test
|
2020-10-05 20:46:21 +09:00 |
|
Dean Herbert
|
6bc0afdafb
|
Fix remaining conflicts
|
2020-10-05 20:09:18 +09:00 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
606a08c6ad
|
Temporarily ignore failing gameplay samples test
|
2020-10-05 20:01:12 +09:00 |
|
Dean Herbert
|
e20c28f166
|
Merge pull request #10306 from smoogipoo/dynamic-difficulty-icon
|
2020-10-05 19:40:18 +09:00 |
|
Dan Balasescu
|
a920342a09
|
Merge branch 'master' into editor-file-drop-support
|
2020-10-05 19:28:44 +09:00 |
|
Dan Balasescu
|
2b824787c1
|
Guard against potential nullref
|
2020-10-05 19:28:13 +09:00 |
|
Dean Herbert
|
ba55256fb4
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-05 19:24:28 +09:00 |
|
Dan Balasescu
|
6d50a1ed7d
|
Merge branch 'master' into osu-selection-flip-rotate-buttons
|
2020-10-05 19:17:33 +09:00 |
|
Dan Balasescu
|
08f7b18dbe
|
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
|
2020-10-05 19:17:19 +09:00 |
|
Dan Balasescu
|
cbf697336f
|
Merge pull request #10323 from peppy/skin-slider-end-circle-support
Add legacy skin "sliderendcircle" support
|
2020-10-05 19:02:38 +09:00 |
|
Dan Balasescu
|
b20dc793cc
|
Merge pull request #10321 from LittleEndu/trail-density
Try to match stable's cursor trail density
|
2020-10-05 19:02:28 +09:00 |
|
Dan Balasescu
|
b8ee9c3793
|
Merge pull request #10312 from peppy/more-timeline-toggles
Move control points display to base timeline class (and add toggles)
|
2020-10-05 18:57:27 +09:00 |
|
Dan Balasescu
|
2df5ea8ba8
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-05 18:47:17 +09:00 |
|
Dean Herbert
|
2ed43c14f8
|
Merge branch 'master' into editor-file-drop-support
|
2020-10-05 17:48:06 +09:00 |
|
Dean Herbert
|
f0b5ba9534
|
Merge branch 'master' into skin-slider-end-circle-support
|
2020-10-05 17:45:51 +09:00 |
|
Dean Herbert
|
365a38e92f
|
Merge branch 'master' into dynamic-difficulty-icon
|
2020-10-05 17:37:01 +09:00 |
|
Dan Balasescu
|
16a599850c
|
Merge branch 'master' into more-timeline-toggles
|
2020-10-05 17:33:18 +09:00 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
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 |
|
Dan Balasescu
|
38b99a5f42
|
Merge pull request #10352 from peppy/fix-spinner-rewind-crash
Fix spinner crashing on rewind
|
2020-10-05 16:26:22 +09:00 |
|
Dean Herbert
|
c622adde7a
|
Rename method back and add xmldoc
|
2020-10-05 16:24:02 +09:00 |
|
Dean Herbert
|
d43ea68709
|
Merge branch 'master' into fix-gameplay-seek-sample-pausing
|
2020-10-05 16:21:28 +09:00 |
|
Dean Herbert
|
0605bb9b8d
|
Fix incorrect parent state transfer
|
2020-10-05 16:20:29 +09:00 |
|
Dan Balasescu
|
421e061fd1
|
Merge pull request #10330 from peppy/editor-timing-screen-change-handling
Add change handler callbacks from timing screen / components
|
2020-10-05 16:10:46 +09:00 |
|
Dan Balasescu
|
d3e1da5922
|
Merge branch 'master' into editor-timing-screen-change-handling
|
2020-10-05 15:40:43 +09:00 |
|
Dan Balasescu
|
692ca87bec
|
Merge branch 'master' into fix-spinner-rewind-crash
|
2020-10-05 15:32:52 +09:00 |
|
Dean Herbert
|
a69b1636be
|
Update tests
|
2020-10-05 15:18:28 +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
|
2a46f905ff
|
Remove unnecessary IsSeeking checks from taiko drum implementation
|
2020-10-05 14:27:51 +09:00 |
|
Dean Herbert
|
e1c4c8f3d5
|
Add failing test coverage of gameplay sample pausing (during seek)
|
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
|
e3d9687be4
|
Merge pull request #10363 from bdach/fix-spinners-crashing-on-unpause
Fix spinners crashing on unpause
|
2020-10-05 00:06:31 +09:00 |
|
Dean Herbert
|
432ba7cdf9
|
Add test coverage of exit-without-save
|
2020-10-04 23:57:35 +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 |
|