1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00
Commit Graph

22855 Commits

Author SHA1 Message Date
smoogipoo
74b6e691d8 Remove unnecessary schedule 2019-10-21 14:01:52 +09:00
smoogipoo
dc222b5e4d Add common path for duplicated code 2019-10-21 13:52:55 +09:00
smoogipoo
6afc27b1bd Merge remote-tracking branch 'origin/master' into dho-apply 2019-10-21 13:47:44 +09:00
Dan Balasescu
50b674249b
Merge pull request #6435 from HoLLy-HaCKeR/cursor-size-trail
Fix cursor size trail scaling
2019-10-21 13:46:05 +09:00
Dan Balasescu
c1c803caf4
Merge branch 'master' into cursor-size-trail 2019-10-21 13:26:13 +09:00
Dan Balasescu
44d854cdc8
Merge pull request #6510 from miterosan/fix_incorrect_current_directory_android
Fix incorrect current directory on Android
2019-10-21 11:09:54 +09:00
miterosan
6e32557be3 Fix spelling error 2019-10-20 22:29:29 +02:00
miterosan
fafbbeef82 Merge remote-tracking branch 'origin/master' into fix_incorrect_current_directory_android 2019-10-20 21:12:05 +02:00
miterosan
aa910fb519 Revert "Load the rulesets lasily"
This reverts commit 42d1379848.
2019-10-20 21:11:16 +02: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
Dan Balasescu
2f4f1c6d99
Merge pull request #6538 from peppy/fix-editor-clock-stopping
Fix editor's clock not being processed unless composer is loaded
2019-10-18 19:15:43 +09:00
Dean Herbert
07286c0cfc Fix editor's clock not being processed unless composer is loaded 2019-10-18 18:21:53 +09:00
Dean Herbert
b391b8542d
Merge pull request #6537 from smoogipoo/fix-hitcircle-accent
Fix hitobject combo colour potentially not getting adjusted
2019-10-18 17:55:59 +09:00
smoogipoo
89f50b26f7 Fix hitobject combo colour potentially not getting adjusted 2019-10-18 17:32:11 +09:00
Dan Balasescu
62f2a852ec
Merge pull request #6536 from peppy/remove-weird-character
Remove a weird unicode charcter from file
2019-10-18 17:27:15 +09:00
Dean Herbert
6b0976ff1e Remove a weird unicode charcter from file 2019-10-18 16:55:42 +09:00
Dean Herbert
e3740fbc77
Merge pull request #6528 from smoogipoo/fix-mania-selection-movement
Fix mania hitobject selections not moving correctly
2019-10-18 16:28:04 +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
Dean Herbert
50d4a9d726
Merge pull request #6534 from smoogipoo/placement-blueprint-starttime
Make BeginPlacement() set the hitobject start time
2019-10-18 16:25:38 +09:00
smoogipoo
5d3d25d3b6 Make method private for now 2019-10-18 13:24:28 +09:00
Dan Balasescu
c37d38d3c7
Merge pull request #6522 from iiSaLMaN/fix-incorrect-beatmap-set-info-equality
Fix incorrect beatmap set info equality check for local beatmapsets
2019-10-18 12:20:33 +09:00
Dan Balasescu
bd57c0b58e
Merge branch 'master' into fix-incorrect-beatmap-set-info-equality 2019-10-17 19:51:03 +09:00
smoogipoo
c4cc960e15 Fix mania hitobject selections not moving correctly 2019-10-17 18:00:15 +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
iiSaLMaN
40fc655b50 Add equality check test to ensure correct values 2019-10-17 01:19:50 +03:00
iiSaLMaN
405ab07800 Check equality by ID -> OnlineBeatmapSetID -> Hash -> ReferenceEquals 2019-10-17 01:18:29 +03: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
HoLLy
13e1199229 Move click to resume cursor scaling responsibility to container 2019-10-15 22:44:04 +02:00