1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 17:37:46 +08:00
Commit Graph

22832 Commits

Author SHA1 Message Date
smoogipoo
fc7e4680a7 Split on multiple lines 2019-10-21 14:08:28 +09:00
smoogipoo
190a83da6e Refresh the grid after a placement 2019-10-18 19:04:08 +09:00
smoogipoo
5dd5a070e0 Show placement grid from hitobjects at the current time 2019-10-18 19:03:19 +09:00
smoogipoo
31313ec9e1 Fix potential nullref 2019-10-18 17:56:31 +09:00
smoogipoo
f1d7e7e7f6 Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration 2019-10-18 13:49:09 +09:00
smoogipoo
463079e148 Implement placement snapping 2019-10-18 13:48:59 +09:00
smoogipoo
cb301a4661 Improve performance of intra-frame updates/deletions 2019-10-18 13:18:57 +09:00
smoogipoo
9a896d52bf Fix nested hitobjects not updating 2019-10-18 13:18:41 +09:00
smoogipoo
b047e05d86 Fix bad variable names 2019-10-18 13:18:16 +09:00
smoogipoo
ba4402207a Implement selection time snapping 2019-10-18 12:53:38 +09:00
smoogipoo
1dc7c59853 Implement selection position snapping 2019-10-18 12:53:27 +09:00
smoogipoo
c4704f6a29 Add beat snap grid to the composer 2019-10-18 12:47:52 +09:00
smoogipoo
d3e38f5e5a Make the editor beatmap protected 2019-10-18 12:40:31 +09:00
smoogipoo
bc76a9cb8c Expose selection changed event from BlueprintContainer 2019-10-18 12:40:27 +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
smoogipoo
4ae465d782 Merge remote-tracking branch 'smoogipoo/osu-beatsnapping-grid' into beatsnap-grid-integration 2019-10-18 12:38:24 +09:00
Dean Herbert
f3ed71d336 Move scoring distance constant to a central/shared location 2019-10-17 16:36:47 +09:00
smoogipoo
510ce9345f Fix potential blueprint nullrefs with the new structure 2019-10-17 16:14:28 +09:00
Dean Herbert
a1bb061405
Make RulesetStore initialise at construction time (#6515)
Make RulesetStore initialise at construction time

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-17 16:10:32 +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
Dean Herbert
3a6a25ffe8
Merge branch 'master' into non-static-rulesetstore 2019-10-17 14:25:06 +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
8a284bacba Make mania use the new nested hitobject structure 2019-10-17 12:37:20 +09:00
smoogipoo
1a0dfcdd46 Make catch use the new nested hitobject structure 2019-10-17 12:37:09 +09:00
smoogipoo
d49ef6a36b Make taiko use the new nested hitobject structure 2019-10-17 11:57:00 +09:00
smoogipoo
9b9138253c Remove finalizer 2019-10-17 11:27:23 +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
Dan Balasescu
05c6d1a66d
Merge branch 'master' into osu-beatsnapping-grid 2019-10-16 20:12:31 +09:00
smoogipoo
79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
smoogipoo
b6b8098b98 Add an arbitrary offset to prevent div-by-0 2019-10-16 19:44:53 +09:00
smoogipoo
2d4b7dc361 Remove redundant code 2019-10-16 19:33:18 +09:00
smoogipoo
5ac5e34f85 Use a cleaner distance function 2019-10-16 19:32:45 +09:00
Dan Balasescu
388b71cf64
Merge pull request #6504 from EVAST9919/comments_api
Implement CommentsContainer component
2019-10-16 17:52:53 +09:00
smoogipoo
350d139cbf Make chevron icon colour protected 2019-10-16 15:54:00 +09:00
Andrei Zavatski
2543de22bd Simplify DeletedChildrenPlaceholder behavior 2019-10-15 12:47:35 +03:00
Andrei Zavatski
7ba15df0c0 Convert to method group 2019-10-15 12:27:32 +03:00
Andrei Zavatski
d321794ef5 Make loadedTopLevelComments a local filed 2019-10-15 12:26:16 +03:00
Andrei Zavatski
96e31b9cca Add support for deleted comments with message 2019-10-15 12:07:01 +03:00
Andrei Zavatski
213f00556d Remove onShowDeletedChanged function 2019-10-15 11:30:50 +03:00
Andrei Zavatski
b2885e7b13 Move load() under the ctor 2019-10-15 11:26:58 +03:00
Andrei Zavatski
eb5dad08aa Remove initial filed 2019-10-15 11:25:58 +03:00
Andrei Zavatski
3c714dc013 APICommentsController -> CommentBundle 2019-10-15 11:20:06 +03:00
Andrei Zavatski
75a2e383f2 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-15 11:19:45 +03:00
Dan Balasescu
8bba6288a8
Merge pull request #6501 from peppy/map-pool-autochange-fix
Don't automatically return to gameplay from map pool if no picks are made
2019-10-15 17:03:16 +09:00
Dan Balasescu
96fc88e362
Merge branch 'master' into map-pool-autochange-fix 2019-10-15 16:24:29 +09:00