RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,766 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

4726 Commits

Author SHA1 Message Date
Dean Herbert 00f0957cc3
Merge branch 'master' into editor-grids-2 2019-10-12 23:28:51 +09:00
Dan Balasescu bb7de50697
Merge pull request #6451 from peppy/fix-resume-from-player-audio 
Fix audio playback position being reset after resuming to song select
 2019-10-11 19:44:00 +09:00
Dean Herbert 00d4d976b7
Move editor selections relative to hitobject start positions (#6431) 
Move editor selections relative to hitobject start positions
 2019-10-11 19:35:11 +09:00
Dan Balasescu 26a33bfa4e
Merge branch 'master' into fix-resume-from-player-audio 2019-10-11 19:21:14 +09:00
smoogipoo 050d86a741 Always use the local coordinate space 2019-10-11 18:24:33 +09:00
smoogipoo 9ecec806c2 Rename grid creation method + parameter 2019-10-11 18:24:33 +09:00
smoogipoo 5f0cd356d7 Rename startPosition to centrePosition 2019-10-11 18:24:33 +09:00
smoogipoo 8fb2628f9e Improve xmldocs 2019-10-11 18:24:33 +09:00
smoogipoo 66e0fef85b Expose StartPosition for derived grids to use 2019-10-11 18:24:33 +09:00
smoogipoo 97d4a8e59e Remove unnecessary dependency 2019-10-11 18:24:33 +09:00
smoogipoo 2df519ddfa Simplify colour retrieval function 2019-10-11 18:24:33 +09:00
smoogipoo 2aa3d0bb39 Implement base class for beat snapping grids 2019-10-11 18:24:33 +09:00
Dan Balasescu d4282473c6
Merge branch 'master' into fix-background-disposal 2019-10-11 17:15:30 +09:00
Dean Herbert 8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio 2019-10-10 22:08:20 +09:00
Dan Balasescu 356c0fdca0
Merge branch 'master' into cleanup-intros 2019-10-10 21:58:54 +09:00
Dean Herbert 5eba33e876 Simplify logic and add test coverage for remaining case 2019-10-10 20:12:47 +09:00
Dean Herbert e66f9adb86 Fix user pause not being cancelled when playing audio 2019-10-10 16:53:03 +09:00
smoogipoo 2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +09:00
Dan Balasescu 5497d210b6
Merge branch 'master' into fix-editor-slider-display 2019-10-10 16:22:30 +09:00
Dean Herbert f74c79c2b8 Fix audio playback position being reset after resuming to song select 2019-10-10 11:58:43 +09:00
Dean Herbert 51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Dean Herbert 0681bb9a2b Fix potential nullref 2019-10-09 16:49:10 +09:00
Dean Herbert 2d8e5615e4 Extract timeline and layout logic from ComposeScreen 2019-10-09 16:05:55 +09:00
Dean Herbert 3dd2b18ff0 Make EditorScreen abstract 2019-10-09 16:04:58 +09:00
Dan Balasescu 69b9e359bf
Merge branch 'master' into fix-ss-track-playback 2019-10-09 12:26:07 +09:00
smoogipoo 179656788d Remove unnecessary method 2019-10-08 19:27:59 +09:00
smoogipoo c1db11fa06 More removal of "drag" 2019-10-08 19:24:58 +09:00
smoogipoo 8b661e624d Remove drag from class/method namings + refactor 2019-10-08 19:08:31 +09:00
smoogipoo 08d043f447 Move selection relative to the hitobject start positions 2019-10-08 18:57:03 +09:00
Dean Herbert 4e026b163c Don't resume playback when user has paused and track hasn't changed 2019-10-08 15:04:38 +09:00
Dean Herbert 3e904b4838 Fix naming of file 2019-10-08 14:37:56 +09:00
Dean Herbert 63bf8ff832 Better signify under construction screens in editor 2019-10-08 14:32:48 +09:00
Dan Balasescu 73e3dac64b
Merge branch 'master' into fix-editor-skinning 2019-10-08 13:28:10 +09:00
Dean Herbert 24269c0384 Fix skins not being displayed correctly in the editor 2019-10-08 12:52:34 +09:00
Dean Herbert 5472029ffe Fix editor defaulting to 0.5x playback speed 2019-10-08 12:27:51 +09:00
Dean Herbert 52770f803d Fix incorrect beatmap usage 2019-10-08 12:15:32 +09:00
Dean Herbert cbb120cd38 Switch beatmap to private 2019-10-08 12:09:42 +09:00
Dean Herbert c280bee894 Protect configuration bindables 2019-10-08 12:08:47 +09:00
Dean Herbert b8b2ff2674 Move welcome to local usages 2019-10-08 12:07:59 +09:00
Dean Herbert 4ba2dccde3 Reorder file contents 2019-10-08 12:05:52 +09:00
Dean Herbert a0bb193342 Remove unnecessary beatmap storage 2019-10-08 12:04:13 +09:00
Dean Herbert 449e53ee6d Centralise track handling 2019-10-08 12:03:42 +09:00
Dean Herbert c3d56088d8 Make constant private 2019-10-08 11:54:39 +09:00
Dean Herbert 3c0b1be7f4 Add xmldoc where applicable 2019-10-08 11:52:16 +09:00
Dean Herbert 393683f8f1
Merge branch 'master' into cleanup-intros 2019-10-08 11:29:13 +09:00
Dean Herbert e7fc5e556c Fix song select not correctly playing tracks in some cases 2019-10-08 11:06:07 +09:00
Dean Herbert bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing 2019-10-08 10:12:03 +09:00
Joehu 9fdbe58326 Fix dropdown header padding when selected mod filter is hidden 2019-10-07 16:17:58 -07:00
Joehu 8e6e90eaec Use fixed numbers for padding instead 2019-10-07 16:11:40 -07:00
Dean Herbert f15953d65c Fix carousel including filtered difficulties in sort comparisons 2019-10-07 15:17:03 +09:00