1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 12:47:24 +08:00
Commit Graph

14546 Commits

Author SHA1 Message Date
Dean Herbert
c3375071ad Fix formatting issue 2019-10-23 00:26:47 +09:00
Dean Herbert
e9aa7f3218 Subclass and use yellow for stand-alone chat display 2019-10-23 00:24:19 +09:00
Dean Herbert
3b4823abe7 Use foreach 2019-10-23 00:17:37 +09:00
Dean Herbert
0ba287a7fd Rename variable 2019-10-23 00:14:22 +09:00
Dean Herbert
7084aa7b81
Merge branch 'master' into chat-day-separator 2019-10-22 15:48:42 +09:00
Dean Herbert
001eae2c02 Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable 2019-10-22 15:04:16 +09:00
Dean Herbert
5d0d83b6bf Add basic xmldoc 2019-10-22 15:04:10 +09:00
Andrei Zavatski
09b2f11bd5 Remove unused variable 2019-10-22 03:14:20 +03:00
Andrei Zavatski
b1eac6b400 Apply suggested changes 2019-10-22 03:11:19 +03:00
Andrei Zavatski
e9ae838f46 CI fixes 2019-10-22 02:16:52 +03:00
Joehu
f7924d3bad Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox" 2019-10-21 16:00:09 -07:00
Andrei Zavatski
2896ed90e2 Fix incorrect date comparison 2019-10-22 01:55:26 +03:00
Andrei Zavatski
bb7af1e39c Fix some margin/padding issues 2019-10-22 01:45:04 +03:00
Andrei Zavatski
d19041fa53 Implement DaySeparator class 2019-10-22 01:30:37 +03:00
Andrei Zavatski
75f444e431 Basic implementation 2019-10-22 00:44:58 +03:00
Dean Herbert
0bf35faae8 Update incorrect reference 2019-10-21 19:25:56 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration 2019-10-21 18:44:34 +09:00
Dean Herbert
ed8b8e3ad0
Merge pull request #6557 from smoogipoo/fix-hitcircle-selection-size
Fix hitcircle selection area being too large
2019-10-21 18:43:48 +09:00
Dean Herbert
9f004186d5 Ensure DrawableHitObject's HitObject is not null 2019-10-21 17:56:39 +09:00
Dean Herbert
fa95422755 Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration 2019-10-21 17:53:25 +09:00
Dean Herbert
c8f4e8b52c Update framework 2019-10-21 17:24:32 +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
fc7e4680a7 Split on multiple lines 2019-10-21 14:08:28 +09:00
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
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply 2019-10-18 19:45:10 +09:00
smoogipoo
190a83da6e Refresh the grid after a placement 2019-10-18 19:04:08 +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
Dean Herbert
6b0976ff1e Remove a weird unicode charcter from file 2019-10-18 16:55:42 +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
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
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
Joehu
e5b50b5e1f Fix slider bar regression when using arrows 2019-10-17 13:54:36 -07:00
Dan Balasescu
bd57c0b58e
Merge branch 'master' into fix-incorrect-beatmap-set-info-equality 2019-10-17 19:51:03 +09:00