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

23070 Commits

Author SHA1 Message Date
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
f43e4bfd70
Merge pull request #6523 from Joehuu/make-most-textbox-carets-movable
Make most textbox carets movable
2019-10-22 15:33:22 +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
a3ab6d33c1 Add test 2019-10-22 01:37:30 +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
6b50d2194a
Integrate osu! distance snapping grid (#6539)
Integrate osu! distance snapping grid

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-21 19:54:49 +09: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
Dan Balasescu
8210759039
Merge pull request #6560 from peppy/dho-ho-not-null
Ensure DrawableHitObject's HitObject is not null
2019-10-21 18:42:17 +09:00
Dean Herbert
1bf5f9313f Fix failing test 2019-10-21 18:10:00 +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
b5997f2231
Merge pull request #6558 from peppy/update-framework
Update framework
2019-10-21 17:52:10 +09:00
Dean Herbert
c8f4e8b52c Update framework 2019-10-21 17:24:32 +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
Dean Herbert
7967c73f03
Merge pull request #6527 from smoogipoo/dho-apply
Implement nested drawable hitobject reconstruction
2019-10-21 16:28:37 +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
Dean Herbert
17132c3b80
Merge pull request #6554 from smoogipoo/fix-selection-stack-position
Fix selection blueprints not respecting stacking
2019-10-21 16:00:25 +09:00
smoogipoo
96649e0a6a Fix selection blueprints not respecting stacking 2019-10-21 15:03:49 +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
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
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