1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 07:52:55 +08:00
Commit Graph

22934 Commits

Author SHA1 Message Date
Ganendra Afrasya
224a887773 Merge remote-tracking branch 'origin/master' into prev-button-revamp 2019-10-24 07:44:18 +07:00
Dean Herbert
fa9690d16c
Merge pull request #6582 from smoogipoo/grid-centre
Show centre point of distance snap grid
2019-10-23 18:28:05 +09:00
Dean Herbert
8250e94ad8
Merge pull request #6581 from smoogipoo/fix-grid-update
Fix distance snapping grid not updating on scroll
2019-10-23 18:20:15 +09:00
Dean Herbert
f61d7e4fbe Add smoothing and tidy code a touch 2019-10-23 17:56:09 +09:00
smoogipoo
c03fa01fd9 Remove unnecessary set 2019-10-23 17:51:16 +09:00
smoogipoo
2c9b11cdfd Move variable outside of if block 2019-10-23 17:49:21 +09:00
Dean Herbert
02efd0e943
Merge pull request #6556 from smoogipoo/fix-slider-stack-change
Fix sliders not moving with stacking changes
2019-10-23 17:48:06 +09:00
smoogipoo
c9fec50f63 Remove unnecessary whitespace 2019-10-23 17:00:17 +09:00
smoogipoo
97383b4a37 Show centre point of distance snap grid 2019-10-23 16:58:56 +09:00
smoogipoo
64682611bb Fix distance snapping grid not updating on scroll 2019-10-23 16:39:14 +09:00
smoogipoo
54f23cbd0d Update stacking test case values 2019-10-23 15:49:36 +09:00
Dean Herbert
1c6a775338
Merge pull request #6575 from smoogipoo/apply-framework-fixes
Apply adjustments for framework changes
2019-10-23 15:33:41 +09:00
Dean Herbert
e836364add Update framework 2019-10-23 15:13:52 +09:00
Dean Herbert
21e0bd2a5a Merge branch 'fix-wave-container' into apply-framework-fixes 2019-10-23 15:13:41 +09:00
smoogipoo
851773a842 Apply adjustments for framework changes 2019-10-23 14:04:06 +09:00
Dean Herbert
75beba66d5
Merge pull request #6574 from Joehuu/fix-registration-textbox-focus
Fix registration textboxes always focusing after pressing escape
2019-10-23 12:18:08 +09:00
Joehu
7b7a87afa8 Put back mobile conditional 2019-10-22 19:51:29 -07:00
Joehu
8154cc1b16 Fix registration textboxes always focusing after pressing escape 2019-10-22 14:40:56 -07:00
Dean Herbert
e7290c433b
Implement day divider for chat (#6569)
Implement day divider for chat

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-23 01:06:46 +09:00
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
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