Commit Graph

35644 Commits

Author SHA1 Message Date
c17d67bc7d Merge branch 'master' into editor-beat-snap-always 2020-11-30 18:34:38 +09:00
4bbeb9ebd4 Merge branch 'master' into hit-sample-pooling 2020-11-30 18:31:58 +09:00
b56e832e83 Merge pull request #10950 from ekrctb/pool-scrolling
Support hit object pooling in ScrollingPlayfield
2020-11-30 18:29:34 +09:00
fdef6e479c Remove 1000ms offset and adjust comment 2020-11-30 18:28:04 +09:00
731e689f2d Add summary tags to the doc comments 2020-11-30 18:07:37 +09:00
8f48389f89 Merge branch 'master' into improve-dho-time-offsets 2020-11-30 18:01:48 +09:00
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
965cc1f511 Remove unnecessary usings #2 2020-11-30 17:57:25 +09:00
46cab04929 Merge branch 'settings-remove-transparency' into settings-reduce-visual-clutter 2020-11-30 17:57:10 +09:00
a3ef858f3a Remove unnecessary multiplication 2020-11-30 17:56:04 +09:00
fe48b2279c Adjust various paddings and spacings in settings to make them easier to visually parse 2020-11-30 17:50:35 +09:00
a3dd22f5c2 Merge branch 'master' into settings-remove-transparency 2020-11-30 17:50:26 +09:00
bf2c6dc241 Remove unused usings rider couldn't see 2020-11-30 17:49:55 +09:00
7ac2fba127 More reordering of public vs private methods 2020-11-30 17:44:58 +09:00
b0637cebd1 Merge branch 'master' into song-select-track-selected-better-2 2020-11-30 17:26:15 +09:00
52cb30dff2 Merge pull request #10999 from bdach/user-interface-settings-section
Create "User Interface" settings section
2020-11-30 17:25:04 +09:00
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
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
11d1450c76 Merge branch 'master' into fruit-bindables 2020-11-30 16:48:22 +09:00
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
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
4e1e45f3e7 Move hold-to-confirm back to UI section 2020-11-30 16:15:35 +09:00
55c8aa5d5f Move menu cursor size to UI section 2020-11-30 16:14:15 +09:00
e14db45374 Reorder settings to (probably) feel more correct 2020-11-30 16:09:38 +09:00
2745659986 Reword and xmldoc some comments 2020-11-30 15:54:20 +09:00
31cfaefdeb Move private functions in line with others 2020-11-30 15:39:43 +09:00
809caaa44c Use standard switch syntax (preferred for now) 2020-11-30 15:39:08 +09:00
9fbfb1aa9f Add comment explaining requirement 2020-11-30 15:22:55 +09:00
73990a6674 Fix osu!catch combo counter not showing after 1 combo 2020-11-30 15:20:52 +09:00
8528b2687f Fix possible null reference. 2020-11-30 14:24:50 +09:00
69c2a18220 Merge branch 'master' into fix-drawable-judgement-animation-loss 2020-11-30 14:05:03 +09:00
0c36a3c263 Merge branch 'master' into pool-scrolling 2020-11-30 14:04:54 +09:00
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
4228977c86 Store a DHO in FruitPiece to animate itself. 2020-11-30 13:46:02 +09:00
5a276f8577 Merge branch 'master' into fix-editor-reapply-same-state-change 2020-11-30 13:34:03 +09:00
6bea78619a Update comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-11-30 13:33:29 +09:00
9145557522 Revert "Revert "forgot to remove something... sorry""
This reverts commit 6478bed431.
2020-11-29 23:15:12 -05:00
6478bed431 Revert "forgot to remove something... sorry"
This reverts commit a780a8bbd8.
2020-11-29 23:14:43 -05:00
5e0e4e9db7 Use private access modifier for Border field. 2020-11-30 13:07:55 +09:00
30dc0bc019 Merge pull request #10993 from LittleEndu/star-scale
Scale stars from 0.4 to 1
2020-11-30 13:05:44 +09:00
09b7ba41d6 Consistently use readonly field for bindables. 2020-11-30 13:00:01 +09:00
7986d7802d Use ApplyDefaults in TestSceneFruitObjects. 2020-11-30 12:58:14 +09:00
5d3a5081a0 Remove use of HitObject in DHO constructors. 2020-11-30 12:52:58 +09:00
a780a8bbd8 forgot to remove something... sorry 2020-11-29 21:52:58 -05:00
3994cf082d add keybind for in game overlay 2020-11-29 20:59:02 -05:00
2bbb387208 Merge pull request #10980 from peppy/fix-taiko-barlines-selectable
Move taiko barlines to their own ScrollingHitObjectContainer to avoid being considered as a selectable object
2020-11-30 10:40:47 +09:00
aea964965d Merge branch 'master' into fix-taiko-barlines-selectable 2020-11-29 23:17:24 +01:00
e0a84ff1dc Move hold-to-confirm setting back to gameplay section 2020-11-29 22:07:34 +01:00
a5c4a8d2e9 Create "User Interface" settings section 2020-11-29 22:07:33 +01:00
3e5a6981b9 Merge pull request #10984 from peppy/fix-editor-unnecessary-object-updates
Avoid updating hitobjects unnecessarily for start time changes
2020-11-29 22:06:26 +01:00