1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 20:22:55 +08:00
Commit Graph

23091 Commits

Author SHA1 Message Date
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
Salman Ahmed
eed6f708a2
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-19 04:06:43 +03:00
Andrei Zavatski
266f9a065f Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill 2019-10-18 19:25:05 +03: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
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
Dean Herbert
07286c0cfc Fix editor's clock not being processed unless composer is loaded 2019-10-18 18:21:53 +09:00
smoogipoo
31313ec9e1 Fix potential nullref 2019-10-18 17:56:31 +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
Dean Herbert
b30c84778f Update WaveContainer to support framework changes 2019-10-18 16:13:01 +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
5d3d25d3b6 Make method private for now 2019-10-18 13:24:28 +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
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
Andrei Zavatski
9daafb4636 Simplify hover/unhover logic 2019-10-18 03:06:01 +03:00
Joehu
e5b50b5e1f Fix slider bar regression when using arrows 2019-10-17 13:54:36 -07:00
Andrei Zavatski
22511e41e2 Use received data to set isVoted bindable 2019-10-17 23:20:01 +03:00
Andrei Zavatski
9ee63a8c1a Apply suggested changes 2019-10-17 16:28:32 +03:00
Andrei Zavatski
a858e713f8 Fix multiple spaces 2019-10-17 15:40:09 +03:00
Andrei Zavatski
6b196a6ce7 CI fixes 2019-10-17 15:24:51 +03:00
Andrei Zavatski
42cd4107a0 Implement CommentVoteRequest and adjust UI 2019-10-17 15:04:30 +03:00
Andrei Zavatski
a437ff74cc Move VotePill to it's own file 2019-10-17 14:18:31 +03:00
Andrei Zavatski
d3a8dfd5ff Implement LoadingButton component 2019-10-17 13:57:17 +03:00
Dan Balasescu
bd57c0b58e
Merge branch 'master' into fix-incorrect-beatmap-set-info-equality 2019-10-17 19:51:03 +09:00
Andrei Zavatski
1f28c00594 UI implementation 2019-10-17 13:10:28 +03:00
Andrei Zavatski
38dcd42d08 Parse voted comments 2019-10-17 12:35:12 +03:00