Ryan Zmuda
8f6607ffec
Merge branch 'master' into master
2020-11-30 21:42:15 -05:00
Ryan Zmuda
e102f2e8fa
Moved enum to bottom, change defualt bind to Shift-Tab, Fixed Notification
2020-11-30 21:38:16 -05:00
Bartłomiej Dach
76919a5772
Merge pull request #10974 from peppy/editor-beat-snap-always
...
Fix editor not beat snapping when positional snap is unavailable
2020-11-30 19:13:06 +01:00
Bartłomiej Dach
5fbe1823a0
Merge branch 'master' into editor-beat-snap-always
2020-11-30 18:39:22 +01:00
Bartłomiej Dach
ff8f030cf1
Merge pull request #11009 from peppy/settings-reduce-visual-clutter
...
Attempt to reduce settings visual clutter with better paddings
2020-11-30 17:25:43 +01:00
Dan Balasescu
c0a9d88a14
Merge branch 'master' into settings-reduce-visual-clutter
2020-11-30 19:30:39 +09:00
Dan Balasescu
6c6540addf
Merge pull request #11008 from peppy/settings-remove-transparency
...
Remove semi-transparent backgrounds from settings and notifications overlays
2020-11-30 19:29:53 +09:00
Dean Herbert
7f34e11467
Merge pull request #10962 from smoogipoo/improve-dho-time-offsets
...
Fix judgement offsets in non-framestable contexts
2020-11-30 19:13:25 +09:00
Dean Herbert
3ad2eeaff5
Fix outdated xmldoc
2020-11-30 18:35:30 +09:00
Dean Herbert
c17d67bc7d
Merge branch 'master' into editor-beat-snap-always
2020-11-30 18:34:38 +09:00
Dan Balasescu
b56e832e83
Merge pull request #10950 from ekrctb/pool-scrolling
...
Support hit object pooling in ScrollingPlayfield
2020-11-30 18:29:34 +09:00
smoogipoo
fdef6e479c
Remove 1000ms offset and adjust comment
2020-11-30 18:28:04 +09:00
smoogipoo
8f48389f89
Merge branch 'master' into improve-dho-time-offsets
2020-11-30 18:01:48 +09:00
Dan Balasescu
3ddba8e5b3
Merge pull request #10973 from peppy/song-select-track-selected-better-2
...
Improve scroll tracking of selected item
2020-11-30 17:59:42 +09:00
Dean Herbert
965cc1f511
Remove unnecessary usings #2
2020-11-30 17:57:25 +09:00
Dean Herbert
46cab04929
Merge branch 'settings-remove-transparency' into settings-reduce-visual-clutter
2020-11-30 17:57:10 +09:00
Dan Balasescu
a3ef858f3a
Remove unnecessary multiplication
2020-11-30 17:56:04 +09:00
Dean Herbert
fe48b2279c
Adjust various paddings and spacings in settings to make them easier to visually parse
2020-11-30 17:50:35 +09:00
Dean Herbert
a3dd22f5c2
Merge branch 'master' into settings-remove-transparency
2020-11-30 17:50:26 +09:00
Dean Herbert
bf2c6dc241
Remove unused usings rider couldn't see
2020-11-30 17:49:55 +09:00
smoogipoo
7ac2fba127
More reordering of public vs private methods
2020-11-30 17:44:58 +09:00
Dan Balasescu
b0637cebd1
Merge branch 'master' into song-select-track-selected-better-2
2020-11-30 17:26:15 +09:00
Dan Balasescu
52cb30dff2
Merge pull request #10999 from bdach/user-interface-settings-section
...
Create "User Interface" settings section
2020-11-30 17:25:04 +09:00
Dan Balasescu
8b5733c9aa
Merge pull request #10979 from ekrctb/fruit-bindables
...
Add bindables for osu!catch hit object states
2020-11-30 17:24:56 +09:00
Dean Herbert
a4e061cb11
Remove semi-transparent backgrounds from settings and notifications overlays
...
I tried also updating the colours to the "new" versions from designs but
they don't match due to colour profile differences (so I'm not yet sure
if they are correct or not) and also don't look great without all the UI
elements also being updated.
2020-11-30 17:19:55 +09:00
Dan Balasescu
11d1450c76
Merge branch 'master' into fruit-bindables
2020-11-30 16:48:22 +09:00
Dan Balasescu
d9edd4e7de
Merge pull request #10951 from peppy/fix-drawable-judgement-animation-loss
...
Fix DrawableJudgement not always animating correctly on skin change
2020-11-30 16:36:09 +09:00
Dan Balasescu
27471e5219
Merge pull request #11006 from peppy/fix-catch-combo-counter
...
Fix osu!catch combo counter not showing after 1 combo
2020-11-30 16:31:47 +09:00
Dean Herbert
4e1e45f3e7
Move hold-to-confirm back to UI section
2020-11-30 16:15:35 +09:00
Dean Herbert
55c8aa5d5f
Move menu cursor size to UI section
2020-11-30 16:14:15 +09:00
Dean Herbert
e14db45374
Reorder settings to (probably) feel more correct
2020-11-30 16:09:38 +09:00
Dean Herbert
2745659986
Reword and xmldoc some comments
2020-11-30 15:54:20 +09:00
Dean Herbert
31cfaefdeb
Move private functions in line with others
2020-11-30 15:39:43 +09:00
Dean Herbert
809caaa44c
Use standard switch syntax (preferred for now)
2020-11-30 15:39:08 +09:00
Dean Herbert
9fbfb1aa9f
Add comment explaining requirement
2020-11-30 15:22:55 +09:00
Dean Herbert
73990a6674
Fix osu!catch combo counter not showing after 1 combo
2020-11-30 15:20:52 +09:00
ekrctb
8528b2687f
Fix possible null reference.
2020-11-30 14:24:50 +09:00
Dan Balasescu
69c2a18220
Merge branch 'master' into fix-drawable-judgement-animation-loss
2020-11-30 14:05:03 +09:00
Dan Balasescu
0c36a3c263
Merge branch 'master' into pool-scrolling
2020-11-30 14:04:54 +09:00
Dan Balasescu
5053a7baf9
Merge pull request #10986 from peppy/fix-editor-reapply-same-state-change
...
Fix state application always checking newest state for early abort, rather than current
2020-11-30 14:04:44 +09:00
ekrctb
4228977c86
Store a DHO in FruitPiece to animate itself.
2020-11-30 13:46:02 +09:00
Dan Balasescu
5a276f8577
Merge branch 'master' into fix-editor-reapply-same-state-change
2020-11-30 13:34:03 +09:00
Dan Balasescu
6bea78619a
Update comment
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-11-30 13:33:29 +09:00
Ryan Zmuda
9145557522
Revert "Revert "forgot to remove something... sorry""
...
This reverts commit 6478bed431
2020-11-29 23:15:12 -05:00
Ryan Zmuda
6478bed431
Revert "forgot to remove something... sorry"
...
This reverts commit a780a8bbd8
2020-11-29 23:14:43 -05:00
ekrctb
5e0e4e9db7
Use private access modifier for Border field.
2020-11-30 13:07:55 +09:00
Dan Balasescu
30dc0bc019
Merge pull request #10993 from LittleEndu/star-scale
...
Scale stars from 0.4 to 1
2020-11-30 13:05:44 +09:00
ekrctb
09b7ba41d6
Consistently use readonly field for bindables.
2020-11-30 13:00:01 +09:00
ekrctb
7986d7802d
Use ApplyDefaults in TestSceneFruitObjects.
2020-11-30 12:58:14 +09:00
ekrctb
5d3a5081a0
Remove use of HitObject in DHO constructors.
2020-11-30 12:52:58 +09:00
