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

1679 Commits

Author SHA1 Message Date
Dean Herbert 194e501f86
Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
smoogipoo da6ee05dd6 Fix not being able to drag non-snaked sliders 2019-10-25 18:37:44 +09:00
smoogipoo 607b4d874a Refactor flow of snapping through HitObjectComposer 2019-10-25 16:40:30 +09:00
smoogipoo a6458fdeab Re-use slider type 2019-10-24 19:04:24 +09:00
smoogipoo b7af4acdbf Allow not having a composer 2019-10-24 19:04:00 +09:00
smoogipoo 0af5706db6 Snap path during control point movement 2019-10-24 19:02:59 +09:00
smoogipoo f45f17339c Implement slider path distance snapping 2019-10-24 18:17:30 +09:00
Dean Herbert ef4dd3e028
Merge pull request #6580 from smoogipoo/remove-controlpoint-snap 
Don't snap slider control point placement
 2019-10-24 10:27:16 +09:00
smoogipoo 436941cda3 Add comment 2019-10-23 17:58:44 +09:00
Dean Herbert 02efd0e943
Merge pull request #6556 from smoogipoo/fix-slider-stack-change 
Fix sliders not moving with stacking changes
 2019-10-23 17:48:06 +09:00
smoogipoo b903edca45 Don't snap slider control point placement 2019-10-23 16:03:16 +09:00
smoogipoo 54f23cbd0d Update stacking test case values 2019-10-23 15:49:36 +09:00
Dean Herbert e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration 2019-10-21 18:44:34 +09:00
smoogipoo c34d3362df Fix hit circles selection area being too large 2019-10-21 17:14:08 +09:00
Dean Herbert b157aaead1 Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration 2019-10-21 17:09:43 +09:00
smoogipoo 38c2c328ff Rename HitObject -> DrawableObject in selection blueprints 2019-10-21 17:04:56 +09:00
smoogipoo 5f8d46f666 Fix sliders not moving with stacking change 2019-10-21 16:24:06 +09:00
Dean Herbert 11e5e0decc
Merge branch 'master' into dho-apply 2019-10-21 16:05:11 +09:00
smoogipoo 96649e0a6a Fix selection blueprints not respecting stacking 2019-10-21 15:03:49 +09:00
smoogipoo 6afc27b1bd Merge remote-tracking branch 'origin/master' into dho-apply 2019-10-21 13:47:44 +09:00
Dan Balasescu c1c803caf4
Merge branch 'master' into cursor-size-trail 2019-10-21 13:26:13 +09:00
HoLLy 68837d47df Use local bindable instead of using BindValueChanged of external one 2019-10-19 12:15:31 +02:00
HoLLy ca957f0994 Hide gameplay cursor when resume overlay is shown 2019-10-19 11:52:07 +02:00
Dean Herbert d0eaf629af
Merge branch 'master' into dho-apply 2019-10-18 19:45:10 +09:00
smoogipoo 5dd5a070e0 Show placement grid from hitobjects at the current time 2019-10-18 19:03:19 +09:00
Dean Herbert 99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid 
Implement osu!'s beat snapping grid
 2019-10-18 16:27:03 +09:00
smoogipoo f1d7e7e7f6 Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration 2019-10-18 13:49:09 +09:00
smoogipoo c4704f6a29 Add beat snap grid to the composer 2019-10-18 12:47:52 +09:00
smoogipoo 5ccdd2b203 Mask the osu! beatsnap grid 2019-10-18 12:38:43 +09:00
smoogipoo c5ee533524 Merge branch 'dho-apply' into beatsnap-grid-integration 2019-10-18 12:38:29 +09:00
Dean Herbert f3ed71d336 Move scoring distance constant to a central/shared location 2019-10-17 16:36:47 +09:00
Dean Herbert f92331531c Rename grid to DistanceSnap to be more in line with its purpose 2019-10-17 15:32:02 +09:00
smoogipoo bc41eb176e Clean up head/tail setting in various DHOs 2019-10-17 14:02:23 +09:00
smoogipoo f429a8f7c2 Add back/obsolete old AddNested() method 2019-10-17 14:02:08 +09:00
smoogipoo d8f3678c3c Rename parameter 2019-10-17 12:53:54 +09:00
smoogipoo 3a1acf7b0a Fix slider approach circle proxies 2019-10-17 12:50:26 +09:00
smoogipoo 8d7453c251 Rework construction of nested hitobjects 2019-10-16 22:10:50 +09:00
smoogipoo 4ac2e1c58e Move load() to below ctor() 2019-10-16 21:41:18 +09:00
smoogipoo 79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
HoLLy 13e1199229 Move click to resume cursor scaling responsibility to container 2019-10-15 22:44:04 +02:00
HoLLy 8c671d7fde Rename cursorScale and calculatedCursorScale 2019-10-15 20:12:08 +02:00
Dean Herbert ae2fe62fd9 Use BindValueChanged 2019-10-14 17:13:36 +09:00
Dean Herbert 64a6ca28e6
Merge branch 'master' into cursor-size-trail 2019-10-14 16:35:37 +09:00
Dean Herbert f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid 2019-10-13 18:38:57 +09:00
HoLLy-HaCKeR 7931510d7b Ensure OsuResumeCursor can change scale when it is being shown 2019-10-12 11:59:22 +02:00
HoLLy-HaCKeR fdc17d2adb Scale OsuResumeCursor with gameplay cursor 2019-10-12 11:51:14 +02:00
HoLLy-HaCKeR 13924174c4 Fix PopIn and PopOut resetting cursor scale 2019-10-12 10:04:14 +02: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
smoogipoo 45835f97a1 Split out grids into separate files 2019-10-11 18:41:17 +09:00
smoogipoo 2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +09:00